feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/creator/mainline into make_install/master

Browse Source
This commit is contained in:
Daniel Molkentin
2009-01-22 10:28:15 +01:00
parent aec1e26228 592560b578
commit 5ed76b9621
77 changed files with 513 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
doc/coding-style.qdoc
View File

@@ -265,6 +265,7 @@ Whitespace
Always use only one blank line Always use only one blank line
Always use a single space after a keyword, and before a curly brace. Always use a single space after a keyword, and before a curly brace.
\code
// Wrong // Wrong
if(foo){ if(foo){
} }
@@ -272,18 +273,24 @@ Whitespace
// Correct // Correct
if (foo) { if (foo) {
} }
\endcode
For pointers or references, always use a single space before '*' or '&', but never after. For pointers or references, always use a single space before '*' or '&', but never after.
Avoid C-style casts when possible. Avoid C-style casts when possible.
\code
// Wrong // Wrong
char* blockOfMemory = (char* ) malloc(data.size()); char* blockOfMemory = (char* ) malloc(data.size());
// Correct // Correct
char *blockOfMemory = (char *)malloc(data.size()); char *blockOfMemory = (char *)malloc(data.size());
char *blockOfMemory = reinterpret_cast<char *>(malloc(data.size())); char *blockOfMemory = reinterpret_cast<char *>(malloc(data.size()));
\endcode
Of course, in this particulare case, using \c new might be an even better
option.
Braces Braces
As a base rule, the left curly brace goes on the same line as the start of the statement: As a base rule, the left curly brace goes on the same line as the start of the statement:
\code
// Wrong // Wrong
if (codec) if (codec)
{ {
@@ -292,8 +299,10 @@ Braces
// Correct // Correct
if (codec) { if (codec) {
} }
\endcode
Exception: Function implementations and class declarations always have the left brace on the start of a line: Exception: Function implementations and class declarations always have the left brace on the start of a line:
\code
static void foo(int g) static void foo(int g)
{ {
qDebug("foo: %i", g); qDebug("foo: %i", g);
@@ -302,8 +311,10 @@ Braces
class Moo class Moo
{ {
}; };
\endcode
Use curly braces when the body of a conditional statement contains more than one line, and also if a single line statement is somewhat complex. Use curly braces when the body of a conditional statement contains more than one line, and also if a single line statement is somewhat complex.
\code
// Wrong // Wrong
if (address.isEmpty()) { if (address.isEmpty()) {
return false; return false;
@@ -319,15 +330,19 @@ Braces
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
qDebug("%i", i); qDebug("%i", i);
\endcode
Exception 1: Use braces also if the parent statement covers several lines / wraps Exception 1: Use braces also if the parent statement covers several lines / wraps
\code
// Correct // Correct
if (address.isEmpty() || !isValid() if (address.isEmpty() || !isValid()
|| !codec) { || !codec) {
return false; return false;
} }
\endcode
Exception 2: Use braces also in if-then-else blocks where either the if-code or the else-code covers several lines Exception 2: Use braces also in if-then-else blocks where either the if-code or the else-code covers several lines
\code
// Wrong // Wrong
if (address.isEmpty()) if (address.isEmpty())
--it; --it;
@@ -358,16 +373,20 @@ Braces
else else
... ...
} }
\endcode
Use curly braces when the body of a conditional statement is empty Use curly braces when the body of a conditional statement is empty
\code
// Wrong // Wrong
while (a); while (a);
// Correct // Correct
while (a) {} while (a) {}
\endcode
Parentheses Parentheses
Use parentheses to group expressions: Use parentheses to group expressions:
\code
// Wrong // Wrong
if (a && b || c) if (a && b || c)
@@ -379,10 +398,12 @@ Parentheses
// Correct // Correct
(a + b) & c (a + b) & c
\endcode
Line breaks Line breaks
Keep lines shorter than 100 characters; insert line breaks if necessary. Keep lines shorter than 100 characters; insert line breaks if necessary.
Commas go at the end of a broken line; operators start at the beginning of the new line. The operator is at the end of the line to avoid having to scroll if your editor is too narrow. Commas go at the end of a broken line; operators start at the beginning of the new line. The operator is at the end of the line to avoid having to scroll if your editor is too narrow.
\code
// Wrong // Wrong
if (longExpression + if (longExpression +
otherLongExpression + otherLongExpression +
@@ -394,10 +415,7 @@ Line breaks
+ otherLongExpression + otherLongExpression
+ otherOtherLongExpression) { + otherOtherLongExpression) {
} }
\endcode
\section2 Declarations \section2 Declarations
@@ -424,6 +442,32 @@ Line breaks
If you create a new file, the top of the file should include a If you create a new file, the top of the file should include a
header comment equal to the one found in other source files of Qt Creator. header comment equal to the one found in other source files of Qt Creator.
\section2 Include order
Always go from less general to more general. In a typical implementation
file that would look like
\code
#include "myownheader.h"
...
#include "other_headers_from_my_own_plugin.h"
...
#include <other_plugin/headers_from_other_plugin.h>
...
#include <QtCore/QSomeCoreClass>
...
#include <QtGui/QSomeGuiClass>
...
#include <some_system_C++_header>
...
#include <some_system_C_header>
\endcode
This order ensures that the headers are self-contained.
Using <...> instead of "..." for headers from other plugins helps
spotting plugin-external dependencies in the sources.
Using empty lines between blocks of "peer" headers are encouraged.
\section2 Documentation \section2 Documentation
The documentation is generated from source and header files. The documentation is generated from source and header files.

240
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

@@ -36,24 +36,42 @@
// this relies on contents copied from qobject_p.h // this relies on contents copied from qobject_p.h
#define PRIVATE_OBJECT_ALLOWED 1 #define PRIVATE_OBJECT_ALLOWED 1
#include <QDateTime> #include <QtCore/QDateTime>
#include <QDebug> #include <QtCore/QDebug>
#include <QDir> #include <QtCore/QDir>
#include <QFile> #include <QtCore/QFile>
#include <QFileInfo> #include <QtCore/QFileInfo>
#include <QHash> #include <QtCore/QHash>
#include <QLinkedList> #include <QtCore/QLinkedList>
#include <QLocale> #include <QtCore/QLocale>
#include <QMap> #include <QtCore/QMap>
#include <QMetaObject> #include <QtCore/QMetaObject>
#include <QMetaProperty> #include <QtCore/QMetaProperty>
#include <QModelIndex> #include <QtCore/QModelIndex>
#include <QObject> #include <QtCore/QObject>
#include <QPointer> #include <QtCore/QPointer>
#include <QString> #include <QtCore/QString>
#include <QTextCodec> #include <QtCore/QTextCodec>
#include <QVector> #include <QtCore/QVector>
int qtGhVersion = QT_VERSION;
#ifdef QT_GUI_LIB
# include <QtGui/QPixmap>
# include <QtGui/QImage>
#endif
#include <list>
#include <map>
#include <string>
#include <vector>
#include <ctype.h>
#include <stdio.h>
#ifdef Q_OS_WIN
# include <windows.h>
#endif
/*! /*!
\class QDumper \class QDumper
@@ -91,7 +109,7 @@
'P(d, name, value)' roughly expands to: 'P(d, name, value)' roughly expands to:
d << (name) << "=\"" << value << "\""; d << (name) << "='" << value << "'";
Useful (i.e. understood by the IDE) names include: Useful (i.e. understood by the IDE) names include:
@@ -117,25 +135,6 @@
*/ */
int qtGhVersion = QT_VERSION;
#ifdef QT_GUI_LIB
# include <QPixmap>
# include <QImage>
#endif
#include <list>
#include <map>
#include <string>
#include <vector>
#include <ctype.h>
#include <stdio.h>
#ifdef Q_OS_WIN
# include <windows.h>
#endif
#undef NS #undef NS
#ifdef QT_NAMESPACE #ifdef QT_NAMESPACE
# define STRINGIFY0(s) #s # define STRINGIFY0(s) #s
@@ -216,7 +215,8 @@ QT_END_NAMESPACE
// this can be mangled typenames of nested templates, each char-by-char // this can be mangled typenames of nested templates, each char-by-char
// comma-separated integer list // comma-separated integer list
static char qDumpInBuffer[10000]; static char qDumpInBuffer[10000];
static char qDumpBuffer[1000]; static char qDumpOutBuffer[100000];
static char qDumpSize[20];
namespace { namespace {
@@ -385,7 +385,6 @@ struct QDumper
{ {
explicit QDumper(); explicit QDumper();
~QDumper(); ~QDumper();
void flush();
void checkFill(); void checkFill();
QDumper &operator<<(long c); QDumper &operator<<(long c);
QDumper &operator<<(int i); QDumper &operator<<(int i);
@@ -407,8 +406,6 @@ struct QDumper
void beginHash(); // start of data hash output void beginHash(); // start of data hash output
void endHash(); // start of data hash output void endHash(); // start of data hash output
void write(const void *buf, int len); // raw write to stdout
// the dumper arguments // the dumper arguments
int protocolVersion; // dumper protocol version int protocolVersion; // dumper protocol version
int token; // some token to show on success int token; // some token to show on success
@@ -427,6 +424,7 @@ struct QDumper
// internal state // internal state
bool success; // are we finished? bool success; // are we finished?
bool full;
int pos; int pos;
int extraInt[4]; int extraInt[4];
@@ -436,34 +434,16 @@ struct QDumper
QDumper::QDumper() QDumper::QDumper()
{ {
success = false; success = false;
pos = 0; full = false;
qDumpOutBuffer[0] = 'f'; // marks output as 'wrong'
pos = 1;
} }
QDumper::~QDumper() QDumper::~QDumper()
{ {
flush(); qDumpOutBuffer[pos++] = '\0';
if (success)
char buf[30]; qDumpOutBuffer[0] = (full ? '+' : 't');
int len = qsnprintf(buf, sizeof(buf) - 1, "%d^done\n", token);
write(buf, len);
}
void QDumper::write(const void *buf, int len)
{
::fwrite(buf, len, 1, stdout);
::fflush(stdout);
}
void QDumper::flush()
{
if (pos != 0) {
char buf[30];
int len = qsnprintf(buf, sizeof(buf) - 1, "%d#%d,", token, pos);
write(buf, len);
write(qDumpBuffer, pos);
write("\n", 1);
pos = 0;
}
} }
void QDumper::setupTemplateParameters() void QDumper::setupTemplateParameters()
@@ -489,49 +469,49 @@ void QDumper::setupTemplateParameters()
QDumper &QDumper::operator<<(unsigned long long c) QDumper &QDumper::operator<<(unsigned long long c)
{ {
checkFill(); checkFill();
pos += sprintf(qDumpBuffer + pos, "%llu", c); pos += sprintf(qDumpOutBuffer + pos, "%llu", c);
return *this; return *this;
} }
QDumper &QDumper::operator<<(unsigned long c) QDumper &QDumper::operator<<(unsigned long c)
{ {
checkFill(); checkFill();
pos += sprintf(qDumpBuffer + pos, "%lu", c); pos += sprintf(qDumpOutBuffer + pos, "%lu", c);
return *this; return *this;
} }
QDumper &QDumper::operator<<(float d) QDumper &QDumper::operator<<(float d)
{ {
checkFill(); checkFill();
pos += sprintf(qDumpBuffer + pos, "%f", d); pos += sprintf(qDumpOutBuffer + pos, "%f", d);
return *this; return *this;
} }
QDumper &QDumper::operator<<(double d) QDumper &QDumper::operator<<(double d)
{ {
checkFill(); checkFill();
pos += sprintf(qDumpBuffer + pos, "%f", d); pos += sprintf(qDumpOutBuffer + pos, "%f", d);
return *this; return *this;
} }
QDumper &QDumper::operator<<(unsigned int i) QDumper &QDumper::operator<<(unsigned int i)
{ {
checkFill(); checkFill();
pos += sprintf(qDumpBuffer + pos, "%u", i); pos += sprintf(qDumpOutBuffer + pos, "%u", i);
return *this; return *this;
} }
QDumper &QDumper::operator<<(long c) QDumper &QDumper::operator<<(long c)
{ {
checkFill(); checkFill();
pos += sprintf(qDumpBuffer + pos, "%ld", c); pos += sprintf(qDumpOutBuffer + pos, "%ld", c);
return *this; return *this;
} }
QDumper &QDumper::operator<<(int i) QDumper &QDumper::operator<<(int i)
{ {
checkFill(); checkFill();
pos += sprintf(qDumpBuffer + pos, "%d", i); pos += sprintf(qDumpOutBuffer + pos, "%d", i);
return *this; return *this;
} }
@@ -555,22 +535,23 @@ QDumper &QDumper::operator<<(const void *p)
void QDumper::checkFill() void QDumper::checkFill()
{ {
if (pos >= int(sizeof(qDumpBuffer)) - 100) if (pos >= int(sizeof(qDumpOutBuffer)) - 100)
flush(); full = true;
} }
void QDumper::put(char c) void QDumper::put(char c)
{ {
checkFill(); checkFill();
qDumpBuffer[pos++] = c; if (!full)
qDumpOutBuffer[pos++] = c;
} }
void QDumper::addCommaIfNeeded() void QDumper::addCommaIfNeeded()
{ {
if (pos == 0) if (pos == 0)
return; return;
char c = qDumpBuffer[pos - 1]; char c = qDumpOutBuffer[pos - 1];
if (c == '}' || c == '"' || c == ']') if (c == '}' || c == '\'' || c == ']')
put(','); put(',');
} }
@@ -632,7 +613,6 @@ QDumper &QDumper::operator<<(const QString &str)
void QDumper::disarm() void QDumper::disarm()
{ {
flush();
success = true; success = true;
} }
@@ -650,7 +630,7 @@ void QDumper::endHash()
void QDumper::putEllipsis() void QDumper::putEllipsis()
{ {
addCommaIfNeeded(); addCommaIfNeeded();
*this << "{name=\"<incomplete>\",value=\"\",type=\"" << innertype << "\"}"; *this << "{name='<incomplete>',value='',type='" << innertype << "'}";
} }
// //
@@ -662,7 +642,7 @@ void QDumper::putEllipsis()
#define P(dumper,name,value) \ #define P(dumper,name,value) \
do { \ do { \
dumper.addCommaIfNeeded(); \ dumper.addCommaIfNeeded(); \
dumper << (name) << "=\"" << value << "\""; \ dumper << (name) << "='" << value << "'"; \
} while (0) } while (0)
// simple string property // simple string property
@@ -760,7 +740,7 @@ static void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr
return; return;
case 'B': case 'B':
if (isEqual(type, "QByteArray")) { if (isEqual(type, "QByteArray")) {
d << key << "encoded=\"1\","; d << key << "encoded='1',";
P(d, key, *(QByteArray*)addr); P(d, key, *(QByteArray*)addr);
} }
return; return;
@@ -789,7 +769,7 @@ static void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr
return; return;
case 'S': case 'S':
if (isEqual(type, "QString")) { if (isEqual(type, "QString")) {
d << key << "encoded=\"1\","; d << key << "encoded='1',";
P(d, key, *(QString*)addr); P(d, key, *(QString*)addr);
} }
return; return;
@@ -856,7 +836,7 @@ static void qDumpQByteArray(QDumper &d)
char buf[20]; char buf[20];
for (int i = 0; i != ba.size(); ++i) { for (int i = 0; i != ba.size(); ++i) {
unsigned char c = ba.at(i); unsigned char c = ba.at(i);
unsigned char u = isprint(c) && c != '"' ? c : '?'; unsigned char u = (isprint(c) && c != '\'' && c != '"') ? c : '?';
sprintf(buf, "%02x (%u '%c')", c, c, u); sprintf(buf, "%02x (%u '%c')", c, c, u);
d.beginHash(); d.beginHash();
P(d, "name", "[" << i << "]"); P(d, "name", "[" << i << "]");
@@ -2028,7 +2008,7 @@ static void qDumpQVariantHelper(const void *data, QString *value,
*numchild = 0; *numchild = 0;
break; break;
case QVariant::String: case QVariant::String:
*value = QLatin1Char('"') + v.toString() + QLatin1Char('"'); *value = QLatin1Char('\'') + v.toString() + QLatin1Char('\'');
*numchild = 0; *numchild = 0;
break; break;
case QVariant::StringList: case QVariant::StringList:
@@ -2260,9 +2240,9 @@ static void qDumpStdString(QDumper &d)
qCheckAccess(str.c_str() + str.size() - 1); qCheckAccess(str.c_str() + str.size() - 1);
} }
d << ",value=\""; d << ",value='";
d.putBase64Encoded(str.c_str(), str.size()); d.putBase64Encoded(str.c_str(), str.size());
d << "\""; d << "'";
P(d, "valueencoded", "1"); P(d, "valueencoded", "1");
P(d, "type", "std::string"); P(d, "type", "std::string");
P(d, "numchild", "0"); P(d, "numchild", "0");
@@ -2279,9 +2259,9 @@ static void qDumpStdWString(QDumper &d)
qCheckAccess(str.c_str() + str.size() - 1); qCheckAccess(str.c_str() + str.size() - 1);
} }
d << "value=\""; d << "value='";
d.putBase64Encoded((const char *)str.c_str(), str.size() * sizeof(wchar_t)); d.putBase64Encoded((const char *)str.c_str(), str.size() * sizeof(wchar_t));
d << "\""; d << "'";
P(d, "valueencoded", (sizeof(wchar_t) == 2 ? "2" : "3")); P(d, "valueencoded", (sizeof(wchar_t) == 2 ? "2" : "3"));
P(d, "type", "std::wstring"); P(d, "type", "std::wstring");
P(d, "numchild", "0"); P(d, "numchild", "0");
@@ -2502,54 +2482,54 @@ void qDumpObjectData440(
// They are mentioned here nevertheless. For types that not listed // They are mentioned here nevertheless. For types that not listed
// here, dumpers won't be used. // here, dumpers won't be used.
d << "dumpers=[" d << "dumpers=["
"\""NS"QByteArray\"," "'"NS"QByteArray',"
"\""NS"QDateTime\"," "'"NS"QDateTime',"
"\""NS"QDir\"," "'"NS"QDir',"
"\""NS"QFile\"," "'"NS"QFile',"
"\""NS"QFileInfo\"," "'"NS"QFileInfo',"
"\""NS"QHash\"," "'"NS"QHash',"
"\""NS"QHashNode\"," "'"NS"QHashNode',"
"\""NS"QImage\"," "'"NS"QImage',"
"\""NS"QLinkedList\"," "'"NS"QLinkedList',"
"\""NS"QList\"," "'"NS"QList',"
"\""NS"QLocale\"," "'"NS"QLocale',"
"\""NS"QMap\"," "'"NS"QMap',"
"\""NS"QMapNode\"," "'"NS"QMapNode',"
"\""NS"QModelIndex\"," "'"NS"QModelIndex',"
#if QT_VERSION >= 0x040500 #if QT_VERSION >= 0x040500
"\""NS"QMultiMap\"," "'"NS"QMultiMap',"
#endif #endif
"\""NS"QObject\"," "'"NS"QObject',"
"\""NS"QObjectMethodList\"," // hack to get nested properties display "'"NS"QObjectMethodList'," // hack to get nested properties display
"\""NS"QObjectPropertyList\"," "'"NS"QObjectPropertyList',"
#if PRIVATE_OBJECT_ALLOWED #if PRIVATE_OBJECT_ALLOWED
"\""NS"QObjectSignal\"," "'"NS"QObjectSignal',"
"\""NS"QObjectSignalList\"," "'"NS"QObjectSignalList',"
"\""NS"QObjectSlot\"," "'"NS"QObjectSlot',"
"\""NS"QObjectSlotList\"," "'"NS"QObjectSlotList',"
#endif // PRIVATE_OBJECT_ALLOWED #endif // PRIVATE_OBJECT_ALLOWED
// << "\""NS"QRegion\"," // << "'"NS"QRegion',"
"\""NS"QSet\"," "'"NS"QSet',"
"\""NS"QString\"," "'"NS"QString',"
"\""NS"QStringList\"," "'"NS"QStringList',"
"\""NS"QTextCodec\"," "'"NS"QTextCodec',"
"\""NS"QVariant\"," "'"NS"QVariant',"
"\""NS"QVector\"," "'"NS"QVector',"
"\""NS"QWidget\"," "'"NS"QWidget',"
"\"string\"," "'string',"
"\"wstring\"," "'wstring',"
"\"std::basic_string\"," "'std::basic_string',"
"\"std::list\"," "'std::list',"
"\"std::map\"," "'std::map',"
"\"std::string\"," "'std::string',"
"\"std::vector\"," "'std::vector',"
"\"std::wstring\"," "'std::wstring',"
"]"; "]";
d << ",qtversion=[" d << ",qtversion=["
"\"" << ((QT_VERSION >> 16) & 255) << "\"," "'" << ((QT_VERSION >> 16) & 255) << "',"
"\"" << ((QT_VERSION >> 8) & 255) << "\"," "'" << ((QT_VERSION >> 8) & 255) << "',"
"\"" << ((QT_VERSION) & 255) << "\"]"; "'" << ((QT_VERSION) & 255) << "']";
d << ",namespace=\""NS"\""; d << ",namespace='"NS"'";
d.disarm(); d.disarm();
} }

25
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -234,12 +234,11 @@ public:
BinEditorInterface(BinEditor *parent) BinEditorInterface(BinEditor *parent)
: Core::IEditor(parent) : Core::IEditor(parent)
{ {
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_editor = parent; m_editor = parent;
m_file = new BinEditorFile(parent); m_file = new BinEditorFile(parent);
m_context << core->uniqueIDManager()-> m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_BINARY_EDITOR);
uniqueIdentifier(Core::Constants::K_DEFAULT_BINARY_EDITOR); m_context << uidm->uniqueIdentifier(Constants::C_BINEDITOR);
m_context << core->uniqueIDManager()->uniqueIdentifier(Constants::C_BINEDITOR);
m_cursorPositionLabel = new Core::Utils::LineColumnLabel; m_cursorPositionLabel = new Core::Utils::LineColumnLabel;
QHBoxLayout *l = new QHBoxLayout; QHBoxLayout *l = new QHBoxLayout;
@@ -320,8 +319,8 @@ QString BinEditorFactory::kind() const
Core::IFile *BinEditorFactory::open(const QString &fileName) Core::IFile *BinEditorFactory::open(const QString &fileName)
{ {
Core::ICore *core = Core::ICore::instance(); Core::EditorManager *em = Core::EditorManager::instance();
Core::IEditor *iface = core->editorManager()->openEditor(fileName, kind()); Core::IEditor *iface = em->openEditor(fileName, kind());
return iface ? iface->file() : 0; return iface ? iface->file() : 0;
} }
@@ -339,27 +338,17 @@ QStringList BinEditorFactory::mimeTypes() const
///////////////////////////////// BinEditorPlugin ////////////////////////////////// ///////////////////////////////// BinEditorPlugin //////////////////////////////////
BinEditorPlugin *BinEditorPlugin::m_instance = 0;
BinEditorPlugin::BinEditorPlugin() BinEditorPlugin::BinEditorPlugin()
{ {
m_undoAction = m_redoAction = m_copyAction = m_selectAllAction = 0; m_undoAction = m_redoAction = m_copyAction = m_selectAllAction = 0;
m_instance = this;
} }
BinEditorPlugin::~BinEditorPlugin() BinEditorPlugin::~BinEditorPlugin()
{ {
m_instance = 0;
}
BinEditorPlugin *BinEditorPlugin::instance()
{
return m_instance;
} }
QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title) QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title)
{ {
QAction *result = new QAction(title, this); QAction *result = new QAction(title, this);
Core::ICore::instance()->actionManager()->registerAction(result, id, m_context); Core::ICore::instance()->actionManager()->registerAction(result, id, m_context);
return result; return result;
@@ -384,8 +373,8 @@ void BinEditorPlugin::initializeEditor(BinEditor *editor)
QObject::connect(editor, SIGNAL(modificationChanged(bool)), editorInterface, SIGNAL(changed())); QObject::connect(editor, SIGNAL(modificationChanged(bool)), editorInterface, SIGNAL(changed()));
editor->setEditorInterface(editorInterface); editor->setEditorInterface(editorInterface);
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << core->uniqueIDManager()->uniqueIdentifier(Constants::C_BINEDITOR); m_context << uidm->uniqueIdentifier(Constants::C_BINEDITOR);
if (!m_undoAction) { if (!m_undoAction) {
m_undoAction = registerNewAction(QLatin1String(Core::Constants::UNDO), m_undoAction = registerNewAction(QLatin1String(Core::Constants::UNDO),
this, SLOT(undoAction()), this, SLOT(undoAction()),

7
src/plugins/bineditor/bineditorplugin.h
View File

@@ -43,7 +43,6 @@
#include <QtGui/QAction> #include <QtGui/QAction>
namespace Core { namespace Core {
class ICore;
class IWizard; class IWizard;
} }
@@ -61,8 +60,6 @@ public:
BinEditorPlugin(); BinEditorPlugin();
~BinEditorPlugin(); ~BinEditorPlugin();
static BinEditorPlugin *instance();
bool initialize(const QStringList &arguments, QString *error_message = 0); bool initialize(const QStringList &arguments, QString *error_message = 0);
void extensionsInitialized(); void extensionsInitialized();
@@ -77,6 +74,7 @@ private slots:
void updateActions(); void updateActions();
void updateCurrentEditor(Core::IContext *object); void updateCurrentEditor(Core::IContext *object);
private: private:
QList<int> m_context; QList<int> m_context;
QAction *registerNewAction(const QString &id, const QString &title = QString()); QAction *registerNewAction(const QString &id, const QString &title = QString());
@@ -90,9 +88,6 @@ private:
friend class BinEditorFactory; friend class BinEditorFactory;
Core::IEditor *createEditor(QWidget *parent); Core::IEditor *createEditor(QWidget *parent);
static BinEditorPlugin *m_instance;
Core::ICore *m_core;
typedef QList<Core::IWizard *> WizardList; typedef QList<Core::IWizard *> WizardList;
WizardList m_wizards; WizardList m_wizards;
BinEditorFactory *m_factory; BinEditorFactory *m_factory;

7
src/plugins/bookmarks/bookmarkmanager.cpp
View File

@@ -293,8 +293,7 @@ void BookmarkView::gotoBookmark(const QModelIndex &index)
BookmarkContext::BookmarkContext(BookmarkView *widget) BookmarkContext::BookmarkContext(BookmarkView *widget)
: m_bookmarkView(widget) : m_bookmarkView(widget)
{ {
Core::ICore *core = ICore::instance(); m_context << UniqueIDManager::instance()->uniqueIdentifier(Constants::BOOKMARKS_CONTEXT);
m_context << core->uniqueIDManager()->uniqueIdentifier(Constants::BOOKMARKS_CONTEXT);
} }
QList<int> BookmarkContext::context() const QList<int> BookmarkContext::context() const
@@ -509,7 +508,7 @@ void BookmarkManager::documentPrevNext(bool next)
nextLine = markLine; nextLine = markLine;
} }
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
em->addCurrentPositionToNavigationHistory(true); em->addCurrentPositionToNavigationHistory(true);
if (next) { if (next) {
if (nextLine == -1) if (nextLine == -1)
@@ -554,7 +553,7 @@ void BookmarkManager::prev()
TextEditor::ITextEditor *BookmarkManager::currentTextEditor() const TextEditor::ITextEditor *BookmarkManager::currentTextEditor() const
{ {
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
Core::IEditor *currEditor = em->currentEditor(); Core::IEditor *currEditor = em->currentEditor();
if (!currEditor) if (!currEditor)
return 0; return 0;

7
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -36,7 +36,6 @@
#include "cmakeproject.h" #include "cmakeproject.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -44,9 +43,9 @@ using namespace CMakeProjectManager::Internal;
CMakeManager::CMakeManager() CMakeManager::CMakeManager()
{ {
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_projectContext = core->uniqueIDManager()->uniqueIdentifier(CMakeProjectManager::Constants::PROJECTCONTEXT); m_projectContext = uidm->uniqueIdentifier(CMakeProjectManager::Constants::PROJECTCONTEXT);
m_projectLanguage = core->uniqueIDManager()->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX); m_projectLanguage = uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
} }
int CMakeManager::projectContext() const int CMakeManager::projectContext() const

11
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View File

@@ -35,7 +35,6 @@
#include "actionmanager_p.h" #include "actionmanager_p.h"
#include "command_p.h" #include "command_p.h"
#include "coreimpl.h"
#include "coreconstants.h" #include "coreconstants.h"
#include "uniqueidmanager.h" #include "uniqueidmanager.h"
@@ -150,15 +149,13 @@ bool ActionContainerPrivate::hasState(ContainerState state) const
void ActionContainerPrivate::appendGroup(const QString &group) void ActionContainerPrivate::appendGroup(const QString &group)
{ {
UniqueIDManager *idmanager = CoreImpl::instance()->uniqueIDManager(); int gid = UniqueIDManager::instance()->uniqueIdentifier(group);
int gid = idmanager->uniqueIdentifier(group);
m_groups << gid; m_groups << gid;
} }
QAction *ActionContainerPrivate::insertLocation(const QString &group) const QAction *ActionContainerPrivate::insertLocation(const QString &group) const
{ {
UniqueIDManager *idmanager = CoreImpl::instance()->uniqueIDManager(); int grpid = UniqueIDManager::instance()->uniqueIdentifier(group);
int grpid = idmanager->uniqueIdentifier(group);
int prevKey = 0; int prevKey = 0;
int pos = ((grpid << 16) | 0xFFFF); int pos = ((grpid << 16) | 0xFFFF);
return beforeAction(pos, &prevKey); return beforeAction(pos, &prevKey);
@@ -181,7 +178,7 @@ void ActionContainerPrivate::addAction(Command *action, const QString &group)
} }
a->setStateFlags(a->stateFlags() | CommandPrivate::CS_Initialized); a->setStateFlags(a->stateFlags() | CommandPrivate::CS_Initialized);
} else { } else {
UniqueIDManager *idmanager = CoreImpl::instance()->uniqueIDManager(); UniqueIDManager *idmanager = UniqueIDManager::instance();
int grpid = idmanager->uniqueIdentifier(Constants::G_DEFAULT_TWO); int grpid = idmanager->uniqueIdentifier(Constants::G_DEFAULT_TWO);
if (!group.isEmpty()) if (!group.isEmpty())
grpid = idmanager->uniqueIdentifier(group); grpid = idmanager->uniqueIdentifier(group);
@@ -208,7 +205,7 @@ void ActionContainerPrivate::addMenu(ActionContainer *menu, const QString &group
} }
mc->setState(ActionContainerPrivate::CS_Initialized); mc->setState(ActionContainerPrivate::CS_Initialized);
} else { } else {
UniqueIDManager *idmanager = CoreImpl::instance()->uniqueIDManager(); UniqueIDManager *idmanager = UniqueIDManager::instance();
int grpid = idmanager->uniqueIdentifier(Constants::G_DEFAULT_TWO); int grpid = idmanager->uniqueIdentifier(Constants::G_DEFAULT_TWO);
if (!group.isEmpty()) if (!group.isEmpty())
grpid = idmanager->uniqueIdentifier(group); grpid = idmanager->uniqueIdentifier(group);

6
src/plugins/coreplugin/actionmanager/commandsfile.cpp
View File

@@ -31,7 +31,6 @@
** **
***************************************************************************/ ***************************************************************************/
#include "coreimpl.h"
#include "commandsfile.h" #include "commandsfile.h"
#include "shortcutsettings.h" #include "shortcutsettings.h"
#include "command_p.h" #include "command_p.h"
@@ -100,7 +99,7 @@ QMap<QString, QKeySequence> CommandsFile::importCommands() const
*/ */
bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items) bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items)
{ {
UniqueIDManager *idmanager = CoreImpl::instance()->uniqueIDManager(); UniqueIDManager *idmanager = UniqueIDManager::instance();
QFile file(m_filename); QFile file(m_filename);
if (!file.open(QIODevice::WriteOnly)) if (!file.open(QIODevice::WriteOnly))
@@ -110,8 +109,7 @@ bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items)
QDomElement root = doc.createElement("mapping"); QDomElement root = doc.createElement("mapping");
doc.appendChild(root); doc.appendChild(root);
for (int i=0; i<items.count(); ++i) { foreach (const ShortcutItem *item, items) {
ShortcutItem *item = items.at(i);
QDomElement ctag = doc.createElement("shortcut"); QDomElement ctag = doc.createElement("shortcut");
ctag.setAttribute(QLatin1String("id"), idmanager->stringForUniqueIdentifier(item->m_cmd->id())); ctag.setAttribute(QLatin1String("id"), idmanager->stringForUniqueIdentifier(item->m_cmd->id()));
root.appendChild(ctag); root.appendChild(ctag);

2
src/plugins/coreplugin/basefilewizard.cpp
View File

@@ -509,7 +509,7 @@ bool BaseFileWizard::postGenerateFiles(const GeneratedFiles &l, QString *errorMe
{ {
// File mode: open the editors in file mode and ensure editor pane // File mode: open the editors in file mode and ensure editor pane
const Core::GeneratedFiles::const_iterator cend = l.constEnd(); const Core::GeneratedFiles::const_iterator cend = l.constEnd();
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
for (Core::GeneratedFiles::const_iterator it = l.constBegin(); it != cend; ++it) { for (Core::GeneratedFiles::const_iterator it = l.constBegin(); it != cend; ++it) {
if (!em->openEditor(it->path(), it->editorKind())) { if (!em->openEditor(it->path(), it->editorKind())) {
*errorMessage = tr("Failed to open an editor for %1").arg(it->path()); *errorMessage = tr("Failed to open an editor for %1").arg(it->path());

2
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -85,7 +85,7 @@ bool CorePlugin::initialize(const QStringList & /*arguments*/, QString *error_me
m_welcomeMode = new WelcomeMode; m_welcomeMode = new WelcomeMode;
addObject(m_welcomeMode); addObject(m_welcomeMode);
EditorManager *editorManager = qobject_cast<EditorManager*>(m_mainWindow->editorManager()); EditorManager *editorManager = m_mainWindow->editorManager();
m_editMode = new EditMode(editorManager); m_editMode = new EditMode(editorManager);
addObject(m_editMode); addObject(m_editMode);
} }

1
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -32,7 +32,6 @@
***************************************************************************/ ***************************************************************************/
#include "settingsdialog.h" #include "settingsdialog.h"
#include "coreimpl.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>

42
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -34,14 +34,13 @@
#include "shortcutsettings.h" #include "shortcutsettings.h"
#include "ui_shortcutsettings.h" #include "ui_shortcutsettings.h"
#include "actionmanager_p.h" #include "actionmanager_p.h"
#include "actionmanager/command.h"
#include "command_p.h" #include "command_p.h"
#include "coreconstants.h"
#include "coreimpl.h"
#include "commandsfile.h" #include "commandsfile.h"
#include "coreconstants.h"
#include "filemanager.h" #include "filemanager.h"
#include "icore.h"
#include <coreplugin/uniqueidmanager.h> #include "uniqueidmanager.h"
#include <coreplugin/actionmanager/command.h>
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
#include <QtGui/QShortcut> #include <QtGui/QShortcut>
@@ -232,11 +231,10 @@ void ShortcutSettings::removeKeySequence()
void ShortcutSettings::importAction() void ShortcutSettings::importAction()
{ {
UniqueIDManager *uidm = UniqueIDManager *uidm = UniqueIDManager::instance();
CoreImpl::instance()->uniqueIDManager();
QString fileName = QFileDialog::getOpenFileName(0, tr("Import Keyboard Mapping Scheme"), QString fileName = QFileDialog::getOpenFileName(0, tr("Import Keyboard Mapping Scheme"),
CoreImpl::instance()->resourcePath() + "/schemes/", ICore::instance()->resourcePath() + "/schemes/",
tr("Keyboard Mapping Scheme (*.kms)")); tr("Keyboard Mapping Scheme (*.kms)"));
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
CommandsFile cf(fileName); CommandsFile cf(fileName);
@@ -266,9 +264,9 @@ void ShortcutSettings::defaultAction()
void ShortcutSettings::exportAction() void ShortcutSettings::exportAction()
{ {
QString fileName = CoreImpl::instance()->fileManager()->getSaveFileNameWithExtension( QString fileName = ICore::instance()->fileManager()->getSaveFileNameWithExtension(
tr("Export Keyboard Mapping Scheme"), tr("Export Keyboard Mapping Scheme"),
CoreImpl::instance()->resourcePath() + "/schemes/", ICore::instance()->resourcePath() + "/schemes/",
tr("Keyboard Mapping Scheme (*.kms)"), tr("Keyboard Mapping Scheme (*.kms)"),
".kms"); ".kms");
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
@@ -279,16 +277,11 @@ void ShortcutSettings::exportAction()
void ShortcutSettings::initialize() void ShortcutSettings::initialize()
{ {
QMap<QString, QTreeWidgetItem *> categories;
m_am = ActionManagerPrivate::instance(); m_am = ActionManagerPrivate::instance();
UniqueIDManager *uidm = UniqueIDManager *uidm = UniqueIDManager::instance();
CoreImpl::instance()->uniqueIDManager();
QList<CommandPrivate *> cmds = m_am->commands(); foreach (Command *c, m_am->commands()) {
for (int i = 0; i < cmds.size(); ++i) { if (c->hasAttribute(Command::CA_NonConfigureable))
CommandPrivate *c = cmds.at(i);
if (c->hasAttribute(CommandPrivate::CA_NonConfigureable))
continue; continue;
if (c->action() && c->action()->isSeparator()) if (c->action() && c->action()->isSeparator())
continue; continue;
@@ -296,24 +289,15 @@ void ShortcutSettings::initialize()
QTreeWidgetItem *item = 0; QTreeWidgetItem *item = 0;
ShortcutItem *s = new ShortcutItem; ShortcutItem *s = new ShortcutItem;
m_scitems << s; m_scitems << s;
if (c->category().isEmpty()) {
item = new QTreeWidgetItem(m_page->commandList); item = new QTreeWidgetItem(m_page->commandList);
} else {
if (!categories.contains(c->category())) {
QTreeWidgetItem *cat = new QTreeWidgetItem(m_page->commandList);
cat->setText(0, c->category());
categories.insert(c->category(), cat);
cat->setExpanded(true);
}
item = new QTreeWidgetItem(categories.value(c->category()));
}
s->m_cmd = c; s->m_cmd = c;
s->m_item = item; s->m_item = item;
item->setText(0, uidm->stringForUniqueIdentifier(c->id())); item->setText(0, uidm->stringForUniqueIdentifier(c->id()));
if (c->action()) { if (c->action()) {
QString text = c->hasAttribute(CommandPrivate::CA_UpdateText) && !c->defaultText().isNull() ? c->defaultText() : c->action()->text(); QString text = c->hasAttribute(Command::CA_UpdateText) && !c->defaultText().isNull() ? c->defaultText() : c->action()->text();
text.remove(QRegExp("&(?!&)"));
s->m_key = c->action()->shortcut(); s->m_key = c->action()->shortcut();
item->setText(1, text); item->setText(1, text);
} else { } else {

3
src/plugins/coreplugin/dialogs/shortcutsettings.ui
View File

@@ -36,6 +36,9 @@
</item> </item>
<item> <item>
<widget class="QTreeWidget" name="commandList"> <widget class="QTreeWidget" name="commandList">
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="uniformRowHeights"> <property name="uniformRowHeights">
<bool>true</bool> <bool>true</bool>
</property> </property>

7
src/plugins/coreplugin/editmode.cpp
View File

@@ -34,7 +34,6 @@
#include "editmode.h" #include "editmode.h"
#include "editormanager.h" #include "editormanager.h"
#include "coreconstants.h" #include "coreconstants.h"
#include "coreimpl.h"
#include "modemanager.h" #include "modemanager.h"
#include "uniqueidmanager.h" #include "uniqueidmanager.h"
#include "minisplitter.h" #include "minisplitter.h"
@@ -122,9 +121,9 @@ const char* EditMode::uniqueModeName() const
QList<int> EditMode::context() const QList<int> EditMode::context() const
{ {
static QList<int> contexts = QList<int>() << static QList<int> contexts = QList<int>() <<
CoreImpl::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_EDIT_MODE) << UniqueIDManager::instance()->uniqueIdentifier(Constants::C_EDIT_MODE) <<
CoreImpl::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER) << UniqueIDManager::instance()->uniqueIdentifier(Constants::C_EDITORMANAGER) <<
CoreImpl::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_NAVIGATION_PANE); UniqueIDManager::instance()->uniqueIdentifier(Constants::C_NAVIGATION_PANE);
return contexts; return contexts;
} }

23
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -32,19 +32,19 @@
***************************************************************************/ ***************************************************************************/
#include "editormanager.h" #include "editormanager.h"
#include "editorgroup.h"
#include "editorsplitter.h" #include "editorsplitter.h"
#include "openeditorsview.h"
#include "openeditorswindow.h" #include "openeditorswindow.h"
#include "openwithdialog.h" #include "openwithdialog.h"
#include "filemanager.h" #include "filemanager.h"
#include "tabpositionindicator.h" #include "icore.h"
#include "saveitemsdialog.h"
#include "vcsmanager.h"
#include "iversioncontrol.h" #include "iversioncontrol.h"
#include "openeditorsview.h"
#include "editorgroup.h"
#include "mimedatabase.h" #include "mimedatabase.h"
#include "saveitemsdialog.h"
#include "tabpositionindicator.h"
#include "vcsmanager.h"
#include <coreplugin/coreimpl.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/modemanager.h> #include <coreplugin/modemanager.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
@@ -68,6 +68,7 @@
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
#include <QtGui/QLayout> #include <QtGui/QLayout>
#include <QtGui/QMainWindow>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
#include <QtGui/QPushButton> #include <QtGui/QPushButton>
@@ -598,8 +599,7 @@ QList<IEditor*>
return found.toList(); return found.toList();
} }
QList<IFile *> QList<IFile *> EditorManager::filesForEditors(QList<IEditor *> editors) const
EditorManager::filesForEditors(QList<IEditor *> editors) const
{ {
QSet<IEditor *> handledEditors; QSet<IEditor *> handledEditors;
QList<IFile *> files; QList<IFile *> files;
@@ -649,7 +649,7 @@ bool EditorManager::closeEditors(const QList<IEditor*> editorsToClose, bool askA
//ask whether to save modified files //ask whether to save modified files
if (askAboutModifiedEditors) { if (askAboutModifiedEditors) {
bool cancelled = false; bool cancelled = false;
QList<IFile*> list = CoreImpl::instance()->fileManager()-> QList<IFile*> list = ICore::instance()->fileManager()->
saveModifiedFiles(filesForEditors(acceptedEditors), &cancelled); saveModifiedFiles(filesForEditors(acceptedEditors), &cancelled);
if (cancelled) if (cancelled)
return false; return false;
@@ -924,10 +924,9 @@ QStringList EditorManager::getOpenFileNames() const
void EditorManager::ensureEditorManagerVisible() void EditorManager::ensureEditorManagerVisible()
{ {
if (!isVisible()) { if (!isVisible())
m_d->m_core->modeManager()->activateMode(Constants::MODE_EDIT); m_d->m_core->modeManager()->activateMode(Constants::MODE_EDIT);
} }
}
IEditor *EditorManager::newFile(const QString &editorKind, IEditor *EditorManager::newFile(const QString &editorKind,
QString *titlePattern, QString *titlePattern,
@@ -1549,7 +1548,7 @@ void EditorManager::openInExternalEditor()
return; return;
if (editor->file()->isModified()) { if (editor->file()->isModified()) {
bool cancelled = false; bool cancelled = false;
QList<IFile*> list = CoreImpl::instance()->fileManager()-> QList<IFile*> list = ICore::instance()->fileManager()->
saveModifiedFiles(QList<IFile*>() << editor->file(), &cancelled); saveModifiedFiles(QList<IFile*>() << editor->file(), &cancelled);
if (cancelled) if (cancelled)
return; return;

7
src/plugins/coreplugin/editormanager/openeditorsview.cpp
View File

@@ -34,7 +34,7 @@
#include "openeditorsview.h" #include "openeditorsview.h"
#include "editorgroup.h" #include "editorgroup.h"
#include "editormanager.h" #include "editormanager.h"
#include "coreimpl.h" #include "icore.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/filemanager.h> #include <coreplugin/filemanager.h>
@@ -218,13 +218,12 @@ void OpenEditorsWidget::closeEditors()
selectedEditors.append(item->data(0, Qt::UserRole).value<IEditor *>()); selectedEditors.append(item->data(0, Qt::UserRole).value<IEditor *>());
selectedFiles.append(item->data(0, Qt::UserRole).value<IEditor *>()->file()); selectedFiles.append(item->data(0, Qt::UserRole).value<IEditor *>()->file());
} }
ICore *core = CoreImpl::instance(); ICore *core = ICore::instance();
bool cancelled = false; bool cancelled = false;
core->fileManager()->saveModifiedFiles(selectedFiles, &cancelled); core->fileManager()->saveModifiedFiles(selectedFiles, &cancelled);
if (cancelled) if (cancelled)
return; return;
core->editorManager()-> core->editorManager()->closeEditors(selectedEditors);
closeEditors(selectedEditors);
updateEditorList(); updateEditorList();
} }

3
src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
View File

@@ -33,7 +33,6 @@
#include "stackededitorgroup.h" #include "stackededitorgroup.h"
#include "editormanager.h" #include "editormanager.h"
#include "coreimpl.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -355,7 +354,7 @@ QList<IEditor *> StackedEditorGroup::editorsInNaturalOrder() const
void StackedEditorGroup::makeEditorWritable() void StackedEditorGroup::makeEditorWritable()
{ {
CoreImpl::instance()->editorManager()->makeEditorWritable(currentEditor()); EditorManager::instance()->makeEditorWritable(currentEditor());
} }
void StackedEditorGroup::listSelectionChanged(int index) void StackedEditorGroup::listSelectionChanged(int index)

2
src/plugins/coreplugin/filemanager.cpp
View File

@@ -509,7 +509,7 @@ void FileManager::syncWithEditor(Core::IContext *context)
if (!context) if (!context)
return; return;
Core::IEditor *editor = Core::ICore::instance()->editorManager()->currentEditor(); Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
if (editor && (editor->widget() == context->widget())) if (editor && (editor->widget() == context->widget()))
setCurrentFile(editor->file()->fileName()); setCurrentFile(editor->file()->fileName());
} }

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -94,7 +94,7 @@
extern "C" void handleSigInt(int sig) extern "C" void handleSigInt(int sig)
{ {
Q_UNUSED(sig); Q_UNUSED(sig);
Core::Internal::CoreImpl::instance()->exit(); Core::ICore::instance()->exit();
qDebug() << "SIGINT caught. Shutting down."; qDebug() << "SIGINT caught. Shutting down.";
} }
#endif #endif

1
src/plugins/coreplugin/modemanager.cpp
View File

@@ -42,7 +42,6 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/coreimpl.h>
#include <coreplugin/imode.h> #include <coreplugin/imode.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>

5
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -33,10 +33,9 @@
#include "progressmanager_p.h" #include "progressmanager_p.h"
#include "progressview.h" #include "progressview.h"
#include "coreimpl.h"
#include "baseview.h" #include "baseview.h"
#include "coreconstants.h" #include "coreconstants.h"
#include "icore.h"
#include "uniqueidmanager.h" #include "uniqueidmanager.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -48,7 +47,7 @@ ProgressManagerPrivate::ProgressManagerPrivate(QObject *parent)
: ProgressManager(parent) : ProgressManager(parent)
{ {
m_progressView = new ProgressView; m_progressView = new ProgressView;
ICore *core = CoreImpl::instance(); ICore *core = ICore::instance();
connect(core, SIGNAL(coreAboutToClose()), this, SLOT(cancelAllRunningTasks())); connect(core, SIGNAL(coreAboutToClose()), this, SLOT(cancelAllRunningTasks()));
} }

4
src/plugins/coreplugin/versiondialog.cpp
View File

@@ -34,7 +34,7 @@
#include "versiondialog.h" #include "versiondialog.h"
#include "coreconstants.h" #include "coreconstants.h"
#include "coreimpl.h" #include "icore.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -121,7 +121,7 @@ void VersionDialog::popupLicense()
layout->addWidget(buttonBox); layout->addWidget(buttonBox);
// Read file into string // Read file into string
ICore * core = CoreImpl::instance(); ICore *core = ICore::instance();
QTC_ASSERT(core, return); QTC_ASSERT(core, return);
QString fileName = core->resourcePath() + "/license.txt"; QString fileName = core->resourcePath() + "/license.txt";
QFile file(fileName); QFile file(fileName);

5
src/plugins/coreplugin/welcomemode.cpp
View File

@@ -34,7 +34,6 @@
#include "welcomemode.h" #include "welcomemode.h"
#include "coreconstants.h" #include "coreconstants.h"
#include "uniqueidmanager.h" #include "uniqueidmanager.h"
#include "coreimpl.h"
#include "modemanager.h" #include "modemanager.h"
#if !defined(QT_NO_WEBKIT) #if !defined(QT_NO_WEBKIT)
@@ -193,7 +192,7 @@ const char* WelcomeMode::uniqueModeName() const
QList<int> WelcomeMode::context() const QList<int> WelcomeMode::context() const
{ {
static QList<int> contexts = QList<int>() static QList<int> contexts = QList<int>()
<< CoreImpl::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_WELCOME_MODE); << UniqueIDManager::instance()->uniqueIdentifier(Constants::C_WELCOME_MODE);
return contexts; return contexts;
} }
@@ -250,7 +249,7 @@ void WelcomeMode::updateWelcomePage(const WelcomePageData &welcomePageData)
void WelcomeMode::linkClicked(const QUrl &url) void WelcomeMode::linkClicked(const QUrl &url)
{ {
QString scheme = url.scheme(); QString scheme = url.scheme();
Core::ModeManager *modeManager = CoreImpl::instance()->modeManager(); Core::ModeManager *modeManager = ModeManager::instance();
if (scheme.startsWith(QLatin1String("gh"))) { if (scheme.startsWith(QLatin1String("gh"))) {
QString s = url.toString(QUrl::RemoveScheme); QString s = url.toString(QUrl::RemoveScheme);
if (scheme == QLatin1String("gh")) { if (scheme == QLatin1String("gh")) {

8
src/plugins/cpaster/cpasterplugin.cpp
View File

@@ -84,8 +84,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
// Create the globalcontext list to register actions accordingly // Create the globalcontext list to register actions accordingly
QList<int> globalcontext; QList<int> globalcontext;
globalcontext << ICore::instance()->uniqueIDManager()-> globalcontext << UniqueIDManager::instance()->uniqueIdentifier(Core::Constants::C_GLOBAL);
uniqueIdentifier(Core::Constants::C_GLOBAL);
// Create the settings Page // Create the settings Page
m_settingsPage = new SettingsPage(); m_settingsPage = new SettingsPage();
@@ -129,7 +128,7 @@ void CodepasterPlugin::post()
{ {
if (m_poster) if (m_poster)
delete m_poster; delete m_poster;
IEditor* editor = ICore::instance()->editorManager()->currentEditor(); IEditor* editor = EditorManager::instance()->currentEditor();
ITextEditor* textEditor = qobject_cast<ITextEditor*>(editor); ITextEditor* textEditor = qobject_cast<ITextEditor*>(editor);
if (!textEditor) if (!textEditor)
return; return;
@@ -240,8 +239,7 @@ void CustomFetcher::customRequestFinished(int, bool error)
QByteArray data = body(); QByteArray data = body();
if (!m_listWidget) { if (!m_listWidget) {
QString title = QString::fromLatin1("Code Paster: %1").arg(m_id); QString title = QString::fromLatin1("Code Paster: %1").arg(m_id);
ICore::instance()->editorManager()->newFile(Core::Constants::K_DEFAULT_TEXT_EDITOR EditorManager::instance()->newFile(Core::Constants::K_DEFAULT_TEXT_EDITOR, &title, data);
, &title, data);
} else { } else {
m_listWidget->clear(); m_listWidget->clear();
QStringList lines = QString(data).split(QLatin1Char('\n')); QStringList lines = QString(data).split(QLatin1Char('\n'));

12
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -139,10 +139,10 @@ QualifiedNameId *qualifiedNameIdForSymbol(Symbol *s, const LookupContext &contex
CPPEditorEditable::CPPEditorEditable(CPPEditor *editor) CPPEditorEditable::CPPEditorEditable(CPPEditor *editor)
: BaseTextEditorEditable(editor) : BaseTextEditorEditable(editor)
{ {
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR); m_context << uidm->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR);
m_context << core->uniqueIDManager()->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX); m_context << uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
m_context << core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR); m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
} }
CPPEditor::CPPEditor(QWidget *parent) CPPEditor::CPPEditor(QWidget *parent)
@@ -334,10 +334,10 @@ void CPPEditor::jumpToMethod(int)
if (! symbol) if (! symbol)
return; return;
Core::ICore::instance()->editorManager()->addCurrentPositionToNavigationHistory(true); Core::EditorManager::instance()->addCurrentPositionToNavigationHistory(true);
int line = symbol->line(); int line = symbol->line();
gotoLine(line); gotoLine(line);
Core::ICore::instance()->editorManager()->addCurrentPositionToNavigationHistory(); Core::EditorManager::instance()->addCurrentPositionToNavigationHistory();
setFocus(); setFocus();
} }

16
src/plugins/cppeditor/cppplugin.cpp
View File

@@ -88,7 +88,7 @@ QString CppPluginEditorFactory::kind() const
Core::IFile *CppPluginEditorFactory::open(const QString &fileName) Core::IFile *CppPluginEditorFactory::open(const QString &fileName)
{ {
Core::IEditor *iface = Core::ICore::instance()->editorManager()->openEditor(fileName, kind()); Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
return iface ? iface->file() : 0; return iface ? iface->file() : 0;
} }
@@ -238,20 +238,18 @@ void CppPlugin::extensionsInitialized()
void CppPlugin::switchDeclarationDefinition() void CppPlugin::switchDeclarationDefinition()
{ {
Core::ICore *core = Core::ICore::instance(); Core::EditorManager *em = Core::EditorManager::instance();
CPPEditor *editor = qobject_cast<CPPEditor*>(core->editorManager()->currentEditor()->widget()); CPPEditor *editor = qobject_cast<CPPEditor*>(em->currentEditor()->widget());
if (editor) { if (editor)
editor->switchDeclarationDefinition(); editor->switchDeclarationDefinition();
} }
}
void CppPlugin::jumpToDefinition() void CppPlugin::jumpToDefinition()
{ {
Core::ICore *core = Core::ICore::instance(); Core::EditorManager *em = Core::EditorManager::instance();
CPPEditor *editor = qobject_cast<CPPEditor*>(core->editorManager()->currentEditor()->widget()); CPPEditor *editor = qobject_cast<CPPEditor*>(em->currentEditor()->widget());
if (editor) { if (editor)
editor->jumpToDefinition(); editor->jumpToDefinition();
} }
}
Q_EXPORT_PLUGIN(CppPlugin) Q_EXPORT_PLUGIN(CppPlugin)

2
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -147,7 +147,7 @@ void CppToolsPlugin::shutdown()
void CppToolsPlugin::switchHeaderSource() void CppToolsPlugin::switchHeaderSource()
{ {
Core::EditorManager *editorManager = Core::ICore::instance()->editorManager(); Core::EditorManager *editorManager = Core::EditorManager::instance();
Core::IEditor *editor = editorManager->currentEditor(); Core::IEditor *editor = editorManager->currentEditor();
QString otherFile = correspondingHeaderOrSource(editor->file()->fileName()); QString otherFile = correspondingHeaderOrSource(editor->file()->fileName());
if (!otherFile.isEmpty()) { if (!otherFile.isEmpty()) {

11
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -723,18 +723,17 @@ void DebuggerPlugin::activatePreviousMode()
void DebuggerPlugin::activateDebugMode() void DebuggerPlugin::activateDebugMode()
{ {
ICore *core = ICore::instance(); ModeManager *modeManager = ModeManager::instance();
Core::ModeManager *modeManager = core->modeManager();
m_previousMode = QLatin1String(modeManager->currentMode()->uniqueModeName()); m_previousMode = QLatin1String(modeManager->currentMode()->uniqueModeName());
modeManager->activateMode(QLatin1String(MODE_DEBUG)); modeManager->activateMode(QLatin1String(MODE_DEBUG));
} }
void DebuggerPlugin::queryCurrentTextEditor(QString *fileName, int *lineNumber, QObject **object) void DebuggerPlugin::queryCurrentTextEditor(QString *fileName, int *lineNumber, QObject **object)
{ {
ICore *core = ICore::instance(); EditorManager *editorManager = EditorManager::instance();
if (!core || !core->editorManager()) if (!editorManager)
return; return;
Core::IEditor *editor = core->editorManager()->currentEditor(); Core::IEditor *editor = editorManager->currentEditor();
ITextEditor *textEditor = qobject_cast<ITextEditor*>(editor); ITextEditor *textEditor = qobject_cast<ITextEditor*>(editor);
if (!textEditor) if (!textEditor)
return; return;
@@ -928,7 +927,7 @@ void DebuggerPlugin::readSettings()
m->m_skipKnownFrames = s->value("SkipKnownFrames", false).toBool(); m->m_skipKnownFrames = s->value("SkipKnownFrames", false).toBool();
m->m_debugDumpers = s->value("DebugDumpers", false).toBool(); m->m_debugDumpers = s->value("DebugDumpers", false).toBool();
m->m_useCustomDumpers = s->value("UseCustomDupers", false).toBool(); m->m_useCustomDumpers = s->value("UseCustomDumpers", true).toBool();
m->m_useFastStart = s->value("UseFastStart", false).toBool(); m->m_useFastStart = s->value("UseFastStart", false).toBool();
m->m_useToolTips = s->value("UseToolTips", false).toBool(); m->m_useToolTips = s->value("UseToolTips", false).toBool();
m->m_useTerminal = s->value("UseTerminal", false).toBool(); m->m_useTerminal = s->value("UseTerminal", false).toBool();

69
src/plugins/debugger/gdbengine.cpp
View File

@@ -467,20 +467,6 @@ void GdbEngine::handleResponse()
break; break;
} }
case '#': {
//qDebug() << "CUSTOM OUTPUT, TOKEN" << token;
QString str;
for (; from != to && *from >= '0' && *from <= '9'; ++from)
str += QLatin1Char(*from);
++from; // skip the ' '
int len = str.toInt();
QByteArray ba(from, len);
from += len;
m_inbuffer = QByteArray(from, to - from);
m_customOutputForToken[token] += QString(ba);
break;
}
case '^': { case '^': {
GdbResultRecord record; GdbResultRecord record;
@@ -1562,6 +1548,7 @@ bool GdbEngine::startDebugger()
//sendCommand("set confirm off"); //sendCommand("set confirm off");
//sendCommand("set pagination off"); //sendCommand("set pagination off");
sendCommand("set breakpoint pending on", BreakEnablePending); sendCommand("set breakpoint pending on", BreakEnablePending);
sendCommand("set print elements 10000");
// one of the following is needed to prevent crashes in gdb on code like: // one of the following is needed to prevent crashes in gdb on code like:
// template <class T> T foo() { return T(0); } // template <class T> T foo() { return T(0); }
@@ -3078,14 +3065,11 @@ void GdbEngine::runCustomDumper(const WatchData & data0, bool dumpChildren)
q->showStatusMessage( q->showStatusMessage(
tr("Retrieving data for watch view (%1 requests pending)...") tr("Retrieving data for watch view (%1 requests pending)...")
.arg(m_pendingRequests + 1), 10000); .arg(m_pendingRequests + 1), 10000);
// create response slot for socket data
// retrieve response
QVariant var; QVariant var;
var.setValue(data); var.setValue(data);
sendSynchronizedCommand(QString(), WatchDumpCustomValue2, var); sendSynchronizedCommand("p (char*)qDumpOutBuffer", WatchDumpCustomValue2, var);
// this increases the probability that gdb spits out output it
// has collected so far
//sendCommand("p qDumpInBuffer");
} }
void GdbEngine::createGdbVariable(const WatchData &data) void GdbEngine::createGdbVariable(const WatchData &data)
@@ -3318,14 +3302,17 @@ void GdbEngine::handleQueryDataDumper1(const GdbResultRecord &record)
void GdbEngine::handleQueryDataDumper2(const GdbResultRecord &record) void GdbEngine::handleQueryDataDumper2(const GdbResultRecord &record)
{ {
// is this the official gdb response. However, it won't contain
// interesting data other than the information that 'real' data
// either already arrived or is still in the pipe. So we do
// _not_ register this result for counting purposes, this will
// be done by the 'real' result (with resultClass == GdbResultCustomDone)
//qDebug() << "DATA DUMPER TRIAL:" << record.toString(); //qDebug() << "DATA DUMPER TRIAL:" << record.toString();
GdbMi output = record.data.findChild("customvaluecontents"); GdbMi output = record.data.findChild("consolestreamoutput");
GdbMi contents(output.data()); QByteArray out = output.data();
out = out.mid(out.indexOf('"') + 2); // + 1 is success marker
out = out.left(out.lastIndexOf('"'));
out = out.replace('\'', '"');
out = "dummy={" + out + "}";
//qDebug() << "OUTPUT: " << out;
GdbMi contents;
contents.fromString(out);
GdbMi simple = contents.findChild("dumpers"); GdbMi simple = contents.findChild("dumpers");
m_namespace = contents.findChild("namespace").data(); m_namespace = contents.findChild("namespace").data();
GdbMi qtversion = contents.findChild("qtversion"); GdbMi qtversion = contents.findChild("qtversion");
@@ -3338,7 +3325,6 @@ void GdbEngine::handleQueryDataDumper2(const GdbResultRecord &record)
m_qtVersion = 0; m_qtVersion = 0;
} }
//qDebug() << "OUTPUT: " << output.toString();
//qDebug() << "CONTENTS: " << contents.toString(); //qDebug() << "CONTENTS: " << contents.toString();
//qDebug() << "SIMPLE DUMPERS: " << simple.toString(); //qDebug() << "SIMPLE DUMPERS: " << simple.toString();
m_availableSimpleDumpers.clear(); m_availableSimpleDumpers.clear();
@@ -3479,7 +3465,7 @@ void GdbEngine::handleDumpCustomValue1(const GdbResultRecord &record,
QString msg = record.data.findChild("msg").data(); QString msg = record.data.findChild("msg").data();
//qDebug() << "CUSTOM DUMPER ERROR MESSAGE: " << msg; //qDebug() << "CUSTOM DUMPER ERROR MESSAGE: " << msg;
#ifdef QT_DEBUG #ifdef QT_DEBUG
// Make debugging of dumers easier // Make debugging of dumpers easier
if (q->settings()->m_debugDumpers if (q->settings()->m_debugDumpers
&& msg.startsWith("The program being debugged stopped while") && msg.startsWith("The program being debugged stopped while")
&& msg.contains("qDumpObjectData440")) { && msg.contains("qDumpObjectData440")) {
@@ -3507,10 +3493,20 @@ void GdbEngine::handleDumpCustomValue2(const GdbResultRecord &record,
//qDebug() << "CUSTOM VALUE RESULT: " << record.toString(); //qDebug() << "CUSTOM VALUE RESULT: " << record.toString();
//qDebug() << "FOR DATA: " << data.toString() << record.resultClass; //qDebug() << "FOR DATA: " << data.toString() << record.resultClass;
if (record.resultClass == GdbResultDone) { if (record.resultClass == GdbResultDone) {
GdbMi output = record.data.findChild("customvaluecontents"); GdbMi output = record.data.findChild("consolestreamoutput");
//qDebug() << "HANDLE VALUE CONTENTS: " << output.toString(true); QByteArray out = output.data();
if (!output.isValid()) { out = out.mid(out.indexOf('"') + 2); // + 1 is the 'success marker'
//qDebug() << "INVALID"; out = out.left(out.lastIndexOf('"'));
out = out.replace('\'', '"');
out = "dummy={" + out + "}";
//qDebug() << "OUTPUT: " << out;
GdbMi contents;
contents.fromString(out);
//qDebug() << "CONTENTS" << contents.toString(true);
if (!contents.isValid()) {
qDebug() << "INVALID";
// custom dumper produced no output // custom dumper produced no output
if (data.isValueNeeded()) if (data.isValueNeeded())
data.setValue("<unknown>"); data.setValue("<unknown>");
@@ -3523,10 +3519,6 @@ void GdbEngine::handleDumpCustomValue2(const GdbResultRecord &record,
data.setValueToolTip("<custom dumper produced no output>"); data.setValueToolTip("<custom dumper produced no output>");
insertData(data); insertData(data);
} else { } else {
GdbMi contents;
//qDebug() << "OUTPUT" << output.toString(true);
contents.fromString(output.data());
//qDebug() << "CONTENTS" << contents.toString(true);
setWatchDataType(data, contents.findChild("type")); setWatchDataType(data, contents.findChild("type"));
setWatchDataValue(data, contents.findChild("value"), setWatchDataValue(data, contents.findChild("value"),
contents.findChild("valueencoded").data().toInt()); contents.findChild("valueencoded").data().toInt());
@@ -4020,8 +4012,7 @@ void GdbEngine::tryLoadCustomDumpers()
// retreive list of dumpable classes // retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)", sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)",
GdbQueryDataDumper1); GdbQueryDataDumper1);
// create response slot for socket data sendCommand("p (char*)qDumpOutBuffer", GdbQueryDataDumper2);
sendCommand(QString(), GdbQueryDataDumper2);
} }

30
src/plugins/debugger/gdbmi.cpp
View File

@@ -46,20 +46,20 @@ QTextStream & operator<<(QTextStream & os, const GdbMi & mi)
return os << mi.toString(); return os << mi.toString();
} }
//static void skipSpaces(const GdbMi::Char *&from, const GdbMi::Char *to) //static void skipSpaces(const char *&from, const char *to)
//{ //{
// while (from != to && QChar(*from).isSpace()) // while (from != to && QChar(*from).isSpace())
// ++from; // ++from;
//} //}
void GdbMi::parseResultOrValue(const Char *&from, const Char *to) void GdbMi::parseResultOrValue(const char *&from, const char *to)
{ {
//skipSpaces(from, to); //skipSpaces(from, to);
while (from != to && QChar(*from).isSpace()) while (from != to && QChar(*from).isSpace())
++from; ++from;
//qDebug() << "parseResultOrValue: " << QByteArray::fromLatin1(from, to - from); //qDebug() << "parseResultOrValue: " << QByteArray(from, to - from);
parseValue(from, to); parseValue(from, to);
if (isValid()) { if (isValid()) {
//qDebug() << "no valid result in " << QByteArray::fromLatin1(from, to - from); //qDebug() << "no valid result in " << QByteArray::fromLatin1(from, to - from);
@@ -67,7 +67,7 @@ void GdbMi::parseResultOrValue(const Char *&from, const Char *to)
} }
if (from == to || *from == '(') if (from == to || *from == '(')
return; return;
const Char *ptr = from; const char *ptr = from;
while (ptr < to && *ptr != '=') { while (ptr < to && *ptr != '=') {
//qDebug() << "adding" << QChar(*ptr) << "to name"; //qDebug() << "adding" << QChar(*ptr) << "to name";
++ptr; ++ptr;
@@ -80,7 +80,7 @@ void GdbMi::parseResultOrValue(const Char *&from, const Char *to)
} }
} }
QByteArray GdbMi::parseCString(const Char *&from, const Char *to) QByteArray GdbMi::parseCString(const char *&from, const char *to)
{ {
QByteArray result; QByteArray result;
//qDebug() << "parseCString: " << QByteArray::fromUtf16(from, to - from); //qDebug() << "parseCString: " << QByteArray::fromUtf16(from, to - from);
@@ -88,7 +88,7 @@ QByteArray GdbMi::parseCString(const Char *&from, const Char *to)
qDebug() << "MI Parse Error, double quote expected"; qDebug() << "MI Parse Error, double quote expected";
return QByteArray(); return QByteArray();
} }
const Char *ptr = from; const char *ptr = from;
++ptr; ++ptr;
while (ptr < to) { while (ptr < to) {
if (*ptr == '"') { if (*ptr == '"') {
@@ -115,7 +115,7 @@ QByteArray GdbMi::parseCString(const Char *&from, const Char *to)
return result; return result;
} }
void GdbMi::parseValue(const Char *&from, const Char *to) void GdbMi::parseValue(const char *&from, const char *to)
{ {
//qDebug() << "parseValue: " << QByteArray::fromUtf16(from, to - from); //qDebug() << "parseValue: " << QByteArray::fromUtf16(from, to - from);
switch (*from) { switch (*from) {
@@ -135,7 +135,7 @@ void GdbMi::parseValue(const Char *&from, const Char *to)
} }
void GdbMi::parseTuple(const Char *&from, const Char *to) void GdbMi::parseTuple(const char *&from, const char *to)
{ {
//qDebug() << "parseTuple: " << QByteArray::fromUtf16(from, to - from); //qDebug() << "parseTuple: " << QByteArray::fromUtf16(from, to - from);
QTC_ASSERT(*from == '{', /**/); QTC_ASSERT(*from == '{', /**/);
@@ -143,7 +143,7 @@ void GdbMi::parseTuple(const Char *&from, const Char *to)
parseTuple_helper(from, to); parseTuple_helper(from, to);
} }
void GdbMi::parseTuple_helper(const Char *&from, const Char *to) void GdbMi::parseTuple_helper(const char *&from, const char *to)
{ {
//qDebug() << "parseTuple_helper: " << QByteArray::fromUtf16(from, to - from); //qDebug() << "parseTuple_helper: " << QByteArray::fromUtf16(from, to - from);
m_type = Tuple; m_type = Tuple;
@@ -163,7 +163,7 @@ void GdbMi::parseTuple_helper(const Char *&from, const Char *to)
} }
} }
void GdbMi::parseList(const Char *&from, const Char *to) void GdbMi::parseList(const char *&from, const char *to)
{ {
//qDebug() << "parseList: " << QByteArray::fromUtf16(from, to - from); //qDebug() << "parseList: " << QByteArray::fromUtf16(from, to - from);
QTC_ASSERT(*from == '[', /**/); QTC_ASSERT(*from == '[', /**/);
@@ -267,8 +267,8 @@ QByteArray GdbMi::toString(bool multiline, int indent) const
void GdbMi::fromString(const QByteArray &ba) void GdbMi::fromString(const QByteArray &ba)
{ {
const Char *from = ba.constBegin(); const char *from = ba.constBegin();
const Char *to = ba.constEnd(); const char *to = ba.constEnd();
parseResultOrValue(from, to); parseResultOrValue(from, to);
} }
@@ -449,16 +449,16 @@ static struct Tester {
} }
for (int i = from; i < to; ++i) { for (int i = from; i < to; ++i) {
if (str[i] == '{') if (str[i] == '{')
result += "{\n" + QByteArray(2*++indent + 1, QChar(' ')); result += "{\n" + QByteArray(2*++indent + 1, ' ');
else if (str[i] == '}') { else if (str[i] == '}') {
if (!result.isEmpty() && result[result.size() - 1] != '\n') if (!result.isEmpty() && result[result.size() - 1] != '\n')
result += "\n"; result += "\n";
result += QByteArray(2*--indent + 1, QChar(' ')) + "}\n"; result += QByteArray(2*--indent + 1, ' ') + "}\n";
} }
else if (str[i] == ',') { else if (str[i] == ',') {
if (true || !result.isEmpty() && result[result.size() - 1] != '\n') if (true || !result.isEmpty() && result[result.size() - 1] != '\n')
result += "\n"; result += "\n";
result += QByteArray(2*indent, QChar(' ')); result += QByteArray(2*indent, ' ');
} }
else else
result += str[i]; result += str[i];

18
src/plugins/debugger/gdbmi.h
View File

@@ -34,8 +34,6 @@
#ifndef DEBUGGER_GDBMI_H #ifndef DEBUGGER_GDBMI_H
#define DEBUGGER_GDBMI_H #define DEBUGGER_GDBMI_H
#include <qglobal.h>
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QList> #include <QtCore/QList>
@@ -138,14 +136,12 @@ private:
friend class GdbResultRecord; friend class GdbResultRecord;
friend class GdbEngine; friend class GdbEngine;
//typedef ushort Char; static QByteArray parseCString(const char *&from, const char *to);
typedef char Char; void parseResultOrValue(const char *&from, const char *to);
static QByteArray parseCString(const Char *&from, const Char *to); void parseValue(const char *&from, const char *to);
void parseResultOrValue(const Char *&from, const Char *to); void parseTuple(const char *&from, const char *to);
void parseValue(const Char *&from, const Char *to); void parseTuple_helper(const char *&from, const char *to);
void parseTuple(const Char *&from, const Char *to); void parseList(const char *&from, const char *to);
void parseTuple_helper(const Char *&from, const Char *to);
void parseList(const Char *&from, const Char *to);
void dumpChildren(QByteArray *str, bool multiline, int indent) const; void dumpChildren(QByteArray *str, bool multiline, int indent) const;
}; };
@@ -171,8 +167,6 @@ public:
int token; int token;
GdbResultClass resultClass; GdbResultClass resultClass;
GdbMi data; GdbMi data;
private:
friend class GdbMi;
}; };
} // namespace Internal } // namespace Internal

4
src/plugins/designer/cpp/formclasswizard.cpp
View File

@@ -43,8 +43,6 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDebug> #include <QtCore/QDebug>
enum { debugFormClassWizard = 0 };
using namespace Designer; using namespace Designer;
using namespace Designer::Internal; using namespace Designer::Internal;
@@ -111,7 +109,7 @@ Core::GeneratedFiles FormClassWizard::generateFiles(const QWizard *w, QString *e
sourceFile.setContents(source); sourceFile.setContents(source);
headerFile.setContents(header); headerFile.setContents(header);
if (debugFormClassWizard) if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << '\n' << header << '\n' << source; qDebug() << Q_FUNC_INFO << '\n' << header << '\n' << source;
return Core::GeneratedFiles() << headerFile << sourceFile << uiFile; return Core::GeneratedFiles() << headerFile << sourceFile << uiFile;

3
src/plugins/designer/designerconstants.h
View File

@@ -67,6 +67,9 @@ enum EditModes
NumEditModes NumEditModes
}; };
namespace Internal {
enum { debug = 0 };
}
} // Constants } // Constants
} // Designer } // Designer

2
src/plugins/designer/formeditorfactory.cpp
View File

@@ -63,7 +63,7 @@ QString FormEditorFactory::kind() const
Core::IFile *FormEditorFactory::open(const QString &fileName) Core::IFile *FormEditorFactory::open(const QString &fileName)
{ {
Core::IEditor *iface = Core::ICore::instance()->editorManager()->openEditor(fileName, kind()); Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
return iface ? iface->file() : 0; return iface ? iface->file() : 0;
} }

23
src/plugins/designer/formeditorw.cpp
View File

@@ -83,7 +83,6 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QSettings> #include <QtCore/QSettings>
enum { debugFormEditor = 0 };
enum { wantCodeGenerationAction = 0 }; enum { wantCodeGenerationAction = 0 };
static const char *editorWidgetStateKeyC = "editorWidgetState"; static const char *editorWidgetStateKeyC = "editorWidgetState";
@@ -169,7 +168,7 @@ FormEditorW::FormEditorW() :
m_actionPrint(0), m_actionPrint(0),
m_actionGenerateCode(0) m_actionGenerateCode(0)
{ {
if (debugFormEditor) if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
QTC_ASSERT(!m_self, return); QTC_ASSERT(!m_self, return);
m_self = this; m_self = this;
@@ -220,7 +219,7 @@ void FormEditorW::fullInit()
{ {
QTC_ASSERT(m_initStage == RegisterPlugins, return); QTC_ASSERT(m_initStage == RegisterPlugins, return);
QTime *initTime = 0; QTime *initTime = 0;
if (debugFormEditor) { if (Designer::Constants::Internal::debug) {
initTime = new QTime; initTime = new QTime;
initTime->start(); initTime->start();
} }
@@ -244,7 +243,7 @@ void FormEditorW::fullInit()
} }
} }
if (debugFormEditor) { if (Designer::Constants::Internal::debug) {
qDebug() << Q_FUNC_INFO << initTime->elapsed() << "ms"; qDebug() << Q_FUNC_INFO << initTime->elapsed() << "ms";
delete initTime; delete initTime;
} }
@@ -282,7 +281,7 @@ void FormEditorW::initDesignerSubWindows()
void FormEditorW::ensureInitStage(InitializationStage s) void FormEditorW::ensureInitStage(InitializationStage s)
{ {
if (debugFormEditor) if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << s; qDebug() << Q_FUNC_INFO << s;
if (!m_self) if (!m_self)
m_self = new FormEditorW; m_self = new FormEditorW;
@@ -573,8 +572,8 @@ void FormEditorW::editorDestroyed()
{ {
QObject *source = sender(); QObject *source = sender();
if (debugFormEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormEditorW::editorDestroyed()" << source; qDebug() << Q_FUNC_INFO << source;
for (EditorList::iterator it = m_formWindows.begin(); it != m_formWindows.end(); ) { for (EditorList::iterator it = m_formWindows.begin(); it != m_formWindows.end(); ) {
if (*it == source) { if (*it == source) {
@@ -588,8 +587,8 @@ void FormEditorW::editorDestroyed()
void FormEditorW::currentEditorChanged(Core::IEditor *editor) void FormEditorW::currentEditorChanged(Core::IEditor *editor)
{ {
if (debugFormEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormEditorW::currentEditorChanged" << editor << " of " << m_fwm->formWindowCount(); qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
// Deactivate Designer if a non-form is being edited // Deactivate Designer if a non-form is being edited
if (editor && !qstrcmp(editor->kind(), Constants::C_FORMWINDOW)) { if (editor && !qstrcmp(editor->kind(), Constants::C_FORMWINDOW)) {
@@ -604,9 +603,8 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
void FormEditorW::activeFormWindowChanged(QDesignerFormWindowInterface *afw) void FormEditorW::activeFormWindowChanged(QDesignerFormWindowInterface *afw)
{ {
if (debugFormEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormEditorW::activeFormWindowChanged" << afw qDebug() << Q_FUNC_INFO << afw << " of " << m_fwm->formWindowCount() << m_formWindows;
<< " of " << m_fwm->formWindowCount() << m_formWindows;
m_fwm->closeAllPreviews(); m_fwm->closeAllPreviews();
@@ -718,7 +716,6 @@ void FormEditorW::print()
painter.drawPixmap(0, 0, pixmap); painter.drawPixmap(0, 0, pixmap);
m_core->mainWindow()->setCursor(oldCursor); m_core->mainWindow()->setCursor(oldCursor);
// m_core->statusBar()->showMessage(tr("Printed %1...").arg(QFileInfo(fw->fileName()).fileName()));
} while (false); } while (false);
m_core->printer()->setFullPage(oldFullPage); m_core->printer()->setFullPage(oldFullPage);
m_core->printer()->setOrientation(oldOrientation); m_core->printer()->setOrientation(oldOrientation);

26
src/plugins/designer/formwindoweditor.cpp
View File

@@ -64,8 +64,6 @@ using ProjectExplorer::ProjectNode;
using ProjectExplorer::FolderNode; using ProjectExplorer::FolderNode;
using ProjectExplorer::FileNode; using ProjectExplorer::FileNode;
enum { debugFormWindowEditor = 0 };
class QrcFilesVisitor : public NodesVisitor class QrcFilesVisitor : public NodesVisitor
{ {
public: public:
@@ -109,8 +107,8 @@ FormWindowEditor::FormWindowEditor(const QList<int> &context,
m_sessionNode(0), m_sessionNode(0),
m_sessionWatcher(0) m_sessionWatcher(0)
{ {
if (debugFormWindowEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowEditor::FormWindowEditor" << form << parent; qDebug() << Q_FUNC_INFO << form << parent;
connect(m_file, SIGNAL(reload(QString)), this, SLOT(slotOpen(QString))); connect(m_file, SIGNAL(reload(QString)), this, SLOT(slotOpen(QString)));
connect(m_file, SIGNAL(setDisplayName(QString)), this, SLOT(slotSetDisplayName(QString))); connect(m_file, SIGNAL(setDisplayName(QString)), this, SLOT(slotSetDisplayName(QString)));
@@ -130,8 +128,8 @@ FormWindowEditor::~FormWindowEditor()
delete m_toolBar; delete m_toolBar;
delete m_host; delete m_host;
delete m_editorWidget; delete m_editorWidget;
if (debugFormWindowEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowEditor::~FormWindowEditor" << m_displayName; qDebug() << Q_FUNC_INFO << m_displayName;
if (m_sessionNode && m_sessionWatcher) { if (m_sessionNode && m_sessionWatcher) {
m_sessionNode->unregisterWatcher(m_sessionWatcher); m_sessionNode->unregisterWatcher(m_sessionWatcher);
delete m_sessionWatcher; delete m_sessionWatcher;
@@ -140,8 +138,8 @@ FormWindowEditor::~FormWindowEditor()
bool FormWindowEditor::createNew(const QString &contents) bool FormWindowEditor::createNew(const QString &contents)
{ {
if (debugFormWindowEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowEditor::createNew()" << contents.size() << "chars"; qDebug() << Q_FUNC_INFO << contents.size() << "chars";
if (!m_formWindow) if (!m_formWindow)
return false; return false;
@@ -157,8 +155,8 @@ bool FormWindowEditor::createNew(const QString &contents)
bool FormWindowEditor::open(const QString &fileName /*= QString()*/) bool FormWindowEditor::open(const QString &fileName /*= QString()*/)
{ {
if (debugFormWindowEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowEditor::open" << fileName; qDebug() << Q_FUNC_INFO << fileName;
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
setDisplayName(tr("untitled")); setDisplayName(tr("untitled"));
@@ -240,8 +238,8 @@ void FormWindowEditor::slotOpen(const QString &fileName)
void FormWindowEditor::slotSetDisplayName(const QString &title) void FormWindowEditor::slotSetDisplayName(const QString &title)
{ {
if (debugFormWindowEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowEditor::slotSetDisplayName" << title; qDebug() << Q_FUNC_INFO << title;
setDisplayName(title); setDisplayName(title);
} }
@@ -304,8 +302,8 @@ QWidget *FormWindowEditor::widget()
bool FormWindowEditor::generateCode(QByteArray &header, QString &errorMessage) const bool FormWindowEditor::generateCode(QByteArray &header, QString &errorMessage) const
{ {
if (debugFormWindowEditor) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowEditor::generateCode"; qDebug() << Q_FUNC_INFO;
QString tempPattern = QDir::tempPath(); QString tempPattern = QDir::tempPath();
if (!tempPattern.endsWith(QDir::separator())) // platform-dependant if (!tempPattern.endsWith(QDir::separator())) // platform-dependant

19
src/plugins/designer/formwindowfile.cpp
View File

@@ -53,9 +53,6 @@ using namespace Designer::Internal;
using namespace Designer::Constants; using namespace Designer::Constants;
using namespace SharedTools; using namespace SharedTools;
enum { debugFormWindowFile = 0 };
FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent) FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent)
: Core::IFile(parent), : Core::IFile(parent),
m_mimeType(QLatin1String(FORM_MIMETYPE)), m_mimeType(QLatin1String(FORM_MIMETYPE)),
@@ -67,8 +64,8 @@ bool FormWindowFile::save(const QString &name /*= QString()*/)
{ {
const QString actualName = name.isEmpty() ? fileName() : name; const QString actualName = name.isEmpty() ? fileName() : name;
if (debugFormWindowFile) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowFile::save" << name << "->" << actualName; qDebug() << Q_FUNC_INFO << name << "->" << actualName;
if (actualName.isEmpty()) if (actualName.isEmpty())
return false; return false;
@@ -118,8 +115,8 @@ bool FormWindowFile::isSaveAsAllowed() const
void FormWindowFile::modified(Core::IFile::ReloadBehavior *behavior) void FormWindowFile::modified(Core::IFile::ReloadBehavior *behavior)
{ {
if (debugFormWindowFile) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowFile::modified" << m_fileName << *behavior; qDebug() << Q_FUNC_INFO << m_fileName << *behavior;
switch (*behavior) { switch (*behavior) {
case Core::IFile::ReloadNone: case Core::IFile::ReloadNone:
@@ -157,8 +154,8 @@ QString FormWindowFile::defaultPath() const
void FormWindowFile::setSuggestedFileName(const QString &fileName) void FormWindowFile::setSuggestedFileName(const QString &fileName)
{ {
if (debugFormWindowFile) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowFile:setSuggestedFileName" << m_fileName << fileName; qDebug() << Q_FUNC_INFO << m_fileName << fileName;
m_suggestedName = fileName; m_suggestedName = fileName;
} }
@@ -175,8 +172,8 @@ QString FormWindowFile::mimeType() const
bool FormWindowFile::writeFile(const QString &fileName, QString &errorString) const bool FormWindowFile::writeFile(const QString &fileName, QString &errorString) const
{ {
if (debugFormWindowFile) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowFile::writeFile" << m_fileName << fileName; qDebug() << Q_FUNC_INFO << m_fileName << fileName;
QFile file(fileName); QFile file(fileName);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {

10
src/plugins/designer/formwindowhost.cpp
View File

@@ -44,8 +44,6 @@
using namespace Designer::Internal; using namespace Designer::Internal;
using namespace SharedTools; using namespace SharedTools;
enum { debugFormWindowHost = 0 };
FormWindowHost::FormWindowHost(QDesignerFormWindowInterface *form, FormWindowHost::FormWindowHost(QDesignerFormWindowInterface *form,
QWidget *parent) : QWidget *parent) :
WidgetHost(parent, form) WidgetHost(parent, form)
@@ -57,14 +55,14 @@ FormWindowHost::FormWindowHost(QDesignerFormWindowInterface *form,
FormWindowHost::~FormWindowHost() FormWindowHost::~FormWindowHost()
{ {
if (debugFormWindowHost) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowHost::~FormWindowHost"; qDebug() << Q_FUNC_INFO;
} }
void FormWindowHost::formSizeChanged(int w, int h) void FormWindowHost::formSizeChanged(int w, int h)
{ {
if (debugFormWindowHost) if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowHost::formSizeChanged" << w << h; qDebug() << Q_FUNC_INFO << w << h;
formWindow()->setDirty(true); formWindow()->setDirty(true);
static const QString geometry = QLatin1String("geometry"); static const QString geometry = QLatin1String("geometry");

2
src/plugins/designer/formwizard.cpp
View File

@@ -39,8 +39,6 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QDebug> #include <QtCore/QDebug>
enum { debugFormWizard = 0 };
using namespace Designer; using namespace Designer;
using namespace Designer::Internal; using namespace Designer::Internal;

21
src/plugins/designer/settingsmanager.cpp
View File

@@ -32,26 +32,23 @@
***************************************************************************/ ***************************************************************************/
#include "settingsmanager.h" #include "settingsmanager.h"
#include "designerconstants.h"
#include <QtCore/QDebug> #include <QtCore/QDebug>
using namespace Designer::Internal; using namespace Designer::Internal;
namespace {
bool debug = false;
}
void SettingsManager::beginGroup(const QString &prefix) void SettingsManager::beginGroup(const QString &prefix)
{ {
if (debug) if (Designer::Constants::Internal::debug)
qDebug() << "Designer - beginning group " << addPrefix(prefix); qDebug() << Q_FUNC_INFO << addPrefix(prefix);
m_settings.beginGroup(addPrefix(prefix)); m_settings.beginGroup(addPrefix(prefix));
} }
void SettingsManager::endGroup() void SettingsManager::endGroup()
{ {
if (debug) if (Designer::Constants::Internal::debug)
qDebug() << "Designer - end group"; qDebug() << Q_FUNC_INFO;
m_settings.endGroup(); m_settings.endGroup();
} }
@@ -62,16 +59,16 @@ bool SettingsManager::contains(const QString &key) const
void SettingsManager::setValue(const QString &key, const QVariant &value) void SettingsManager::setValue(const QString &key, const QVariant &value)
{ {
if (debug) if (Designer::Constants::Internal::debug)
qDebug() << "Designer - storing " << addPrefix(key) << ": " << value; qDebug() << Q_FUNC_INFO << addPrefix(key) << ": " << value;
m_settings.setValue(addPrefix(key), value); m_settings.setValue(addPrefix(key), value);
} }
QVariant SettingsManager::value(const QString &key, const QVariant &defaultValue) const QVariant SettingsManager::value(const QString &key, const QVariant &defaultValue) const
{ {
QVariant result = m_settings.value(addPrefix(key), defaultValue); QVariant result = m_settings.value(addPrefix(key), defaultValue);
if (debug) if (Designer::Constants::Internal::debug)
qDebug() << "Designer - retrieving " << addPrefix(key) << ": " << result; qDebug() << Q_FUNC_INFO << addPrefix(key) << ": " << result;
return result; return result;
} }

15
src/plugins/designer/workbenchintegration.cpp
View File

@@ -59,7 +59,6 @@
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtCore/QDebug> #include <QtCore/QDebug>
enum { debugSlotNavigation = 0 };
enum { indentation = 4 }; enum { indentation = 4 };
using namespace Designer::Internal; using namespace Designer::Internal;
@@ -149,7 +148,7 @@ static bool matchMemberClassName(const QString &needle, const QString &hayStack)
// Find class definition in namespace // Find class definition in namespace
static const Class *findClass(const Namespace *parentNameSpace, const QString &className, QString *namespaceName) static const Class *findClass(const Namespace *parentNameSpace, const QString &className, QString *namespaceName)
{ {
if (debugSlotNavigation) if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << className; qDebug() << Q_FUNC_INFO << className;
const Overview o; const Overview o;
@@ -487,7 +486,7 @@ static ClassDocumentPtrPair
const Document::Ptr &doc, const QString &className, const Document::Ptr &doc, const QString &className,
unsigned maxIncludeDepth, QString *namespaceName) unsigned maxIncludeDepth, QString *namespaceName)
{ {
if (debugSlotNavigation) if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << doc->fileName() << maxIncludeDepth; qDebug() << Q_FUNC_INFO << doc->fileName() << maxIncludeDepth;
// Check document // Check document
if (const Class *cl = findClass(doc->globalNamespace(), className, namespaceName)) if (const Class *cl = findClass(doc->globalNamespace(), className, namespaceName))
@@ -548,8 +547,8 @@ bool WorkbenchIntegration::navigateToSlot(const QString &objectName,
const CPlusPlus::Snapshot docTable = cppModelManagerInstance()->snapshot(); const CPlusPlus::Snapshot docTable = cppModelManagerInstance()->snapshot();
QList<Document::Ptr> docList = findDocumentsIncluding(docTable, uicedName, true); // change to false when we know the absolute path to generated ui_<>.h file QList<Document::Ptr> docList = findDocumentsIncluding(docTable, uicedName, true); // change to false when we know the absolute path to generated ui_<>.h file
if (debugSlotNavigation) if (Designer::Constants::Internal::debug)
qDebug() << objectName << signalSignature << "Looking for " << uicedName << " returned " << docList.size(); qDebug() << Q_FUNC_INFO << objectName << signalSignature << "Looking for " << uicedName << " returned " << docList.size();
if (docList.isEmpty()) { if (docList.isEmpty()) {
*errorMessage = tr("No documents matching %1 could be found.").arg(uicedName); *errorMessage = tr("No documents matching %1 could be found.").arg(uicedName);
return false; return false;
@@ -559,7 +558,7 @@ bool WorkbenchIntegration::navigateToSlot(const QString &objectName,
const QString uiClass = uiClassName(fwi->mainContainer()->objectName()); const QString uiClass = uiClassName(fwi->mainContainer()->objectName());
if (debugSlotNavigation) if (Designer::Constants::Internal::debug)
qDebug() << "Checking docs for " << uiClass; qDebug() << "Checking docs for " << uiClass;
// Find the class definition in the file itself or in the directly // Find the class definition in the file itself or in the directly
@@ -587,8 +586,8 @@ bool WorkbenchIntegration::navigateToSlot(const QString &objectName,
const QString functionName = QLatin1String("on_") + objectName + QLatin1Char('_') + signalSignature; const QString functionName = QLatin1String("on_") + objectName + QLatin1Char('_') + signalSignature;
const QString functionNameWithParameterNames = addParameterNames(functionName, parameterNames); const QString functionNameWithParameterNames = addParameterNames(functionName, parameterNames);
if (debugSlotNavigation) if (Designer::Constants::Internal::debug)
qDebug() << "Found " << uiClass << doc->fileName() << " checking " << functionName << functionNameWithParameterNames; qDebug() << Q_FUNC_INFO << "Found " << uiClass << doc->fileName() << " checking " << functionName << functionNameWithParameterNames;
int line = 0; int line = 0;
Document::Ptr sourceDoc; Document::Ptr sourceDoc;

121
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -137,20 +137,20 @@ enum MoveType
struct EditOperation struct EditOperation
{ {
EditOperation() : m_position(-1), m_itemCount(0) {} EditOperation() : position(-1), itemCount(0) {}
int m_position; int position;
int m_itemCount; // used to combine several operations int itemCount; // used to combine several operations
QString m_from; QString from;
QString m_to; QString to;
}; };
QDebug &operator<<(QDebug &ts, const EditOperation &op) QDebug &operator<<(QDebug &ts, const EditOperation &op)
{ {
if (op.m_itemCount > 0) { if (op.itemCount > 0) {
ts << "\n EDIT BLOCK WITH " << op.m_itemCount << " ITEMS"; ts << "\n EDIT BLOCK WITH " << op.itemCount << " ITEMS";
} else { } else {
ts << "\n EDIT AT " << op.m_position ts << "\n EDIT AT " << op.position
<< "\n FROM " << op.m_from << "\n TO " << op.m_to; << "\n FROM " << op.from << "\n TO " << op.to;
} }
return ts; return ts;
} }
@@ -367,6 +367,7 @@ bool FakeVimHandler::Private::handleEvent(QKeyEvent *ev)
quit(); quit();
return true; return true;
} }
m_mode = CommandMode;
return false; return false;
} }
@@ -1356,9 +1357,9 @@ void FakeVimHandler::Private::handleExCommand(const QString &cmd0)
m_tc.setPosition(positionForLine(beginLine)); m_tc.setPosition(positionForLine(beginLine));
EditOperation op; EditOperation op;
// FIXME: broken for "upward selection" // FIXME: broken for "upward selection"
op.m_position = m_tc.position(); op.position = m_tc.position();
op.m_from = text; op.from = text;
op.m_to = result; op.to = result;
recordOperation(op); recordOperation(op);
enterCommandMode(); enterCommandMode();
@@ -1748,60 +1749,52 @@ QWidget *FakeVimHandler::Private::editor() const
void FakeVimHandler::Private::undo() void FakeVimHandler::Private::undo()
{ {
#if 0
EDITOR(undo());
#else
if (m_undoStack.isEmpty()) { if (m_undoStack.isEmpty()) {
showBlackMessage(tr("Already at oldest change")); showBlackMessage(tr("Already at oldest change"));
} else { } else {
EditOperation op = m_undoStack.pop(); EditOperation op = m_undoStack.pop();
//qDebug() << "UNDO " << op; //qDebug() << "UNDO " << op;
if (op.m_itemCount > 0) { if (op.itemCount > 0) {
for (int i = op.m_itemCount; --i >= 0; ) for (int i = op.itemCount; --i >= 0; )
undo(); undo();
} else { } else {
m_tc.setPosition(op.m_position, MoveAnchor); m_tc.setPosition(op.position, MoveAnchor);
if (!op.m_to.isEmpty()) { if (!op.to.isEmpty()) {
m_tc.setPosition(op.m_position + op.m_to.size(), KeepAnchor); m_tc.setPosition(op.position + op.to.size(), KeepAnchor);
m_tc.deleteChar(); m_tc.removeSelectedText();
} }
if (!op.m_from.isEmpty()) if (!op.from.isEmpty())
m_tc.insertText(op.m_from); m_tc.insertText(op.from);
m_tc.setPosition(op.m_position, MoveAnchor); m_tc.setPosition(op.position, MoveAnchor);
} }
m_redoStack.push(op); m_redoStack.push(op);
showBlackMessage(QString()); showBlackMessage(QString());
} }
#endif
} }
void FakeVimHandler::Private::redo() void FakeVimHandler::Private::redo()
{ {
#if 0
EDITOR(redo());
#else
if (m_redoStack.isEmpty()) { if (m_redoStack.isEmpty()) {
showBlackMessage(tr("Already at newest change")); showBlackMessage(tr("Already at newest change"));
} else { } else {
EditOperation op = m_redoStack.pop(); EditOperation op = m_redoStack.pop();
//qDebug() << "REDO " << op; //qDebug() << "REDO " << op;
if (op.m_itemCount > 0) { if (op.itemCount > 0) {
for (int i = op.m_itemCount; --i >= 0; ) for (int i = op.itemCount; --i >= 0; )
redo(); redo();
} else { } else {
m_tc.setPosition(op.m_position, MoveAnchor); m_tc.setPosition(op.position, MoveAnchor);
if (!op.m_from.isEmpty()) { if (!op.from.isEmpty()) {
m_tc.setPosition(op.m_position + op.m_from.size(), KeepAnchor); m_tc.setPosition(op.position + op.from.size(), KeepAnchor);
m_tc.deleteChar(); m_tc.removeSelectedText();
} }
if (!op.m_to.isEmpty()) if (!op.to.isEmpty())
m_tc.insertText(op.m_to); m_tc.insertText(op.to);
m_tc.setPosition(op.m_position, MoveAnchor); m_tc.setPosition(op.position, MoveAnchor);
} }
m_undoStack.push(op); m_undoStack.push(op);
showBlackMessage(QString()); showBlackMessage(QString());
} }
#endif
} }
void FakeVimHandler::Private::recordBeginGroup() void FakeVimHandler::Private::recordBeginGroup()
@@ -1809,29 +1802,37 @@ void FakeVimHandler::Private::recordBeginGroup()
//qDebug() << "PUSH"; //qDebug() << "PUSH";
m_undoGroupStack.push(m_undoStack.size()); m_undoGroupStack.push(m_undoStack.size());
EditOperation op; EditOperation op;
op.m_position = m_tc.position(); op.position = m_tc.position();
recordOperation(op); recordOperation(op);
} }
void FakeVimHandler::Private::recordEndGroup() void FakeVimHandler::Private::recordEndGroup()
{ {
if (m_undoGroupStack.isEmpty()) {
qWarning("fakevim: undo groups not balanced.\n");
return;
}
EditOperation op; EditOperation op;
op.m_itemCount = m_undoStack.size() - m_undoGroupStack.pop(); op.itemCount = m_undoStack.size() - m_undoGroupStack.pop();
//qDebug() << "POP " << op.m_itemCount; //qDebug() << "POP " << op.itemCount << m_undoStack;
recordOperation(op); recordOperation(op);
} }
QString FakeVimHandler::Private::recordRemoveSelectedText() QString FakeVimHandler::Private::recordRemoveSelectedText()
{ {
EditOperation op; EditOperation op;
//qDebug() << "1 POS: " << position() << " ANCHOR: " << anchor() << m_tc.anchor(); //qDebug() << "POS: " << position() << " ANCHOR: " << anchor() << m_tc.anchor();
m_tc.setPosition(anchor(), KeepAnchor); int pos = m_tc.position();
op.m_position = qMin(position(), anchor()); if (pos == anchor())
//qDebug() << "2 POS: " << position() << " ANCHOR: " << anchor() << m_tc.anchor(); return QString();
op.m_from = m_tc.selection().toPlainText(); m_tc.setPosition(anchor(), MoveAnchor);
m_tc.setPosition(pos, KeepAnchor);
op.position = qMin(pos, anchor());
op.from = m_tc.selection().toPlainText();
//qDebug() << "OP: " << op;
recordOperation(op); recordOperation(op);
m_tc.deleteChar(); m_tc.removeSelectedText();
return op.m_from; return op.from;
} }
void FakeVimHandler::Private::recordRemoveNextChar() void FakeVimHandler::Private::recordRemoveNextChar()
@@ -1844,15 +1845,20 @@ void FakeVimHandler::Private::recordRemoveNextChar()
void FakeVimHandler::Private::recordInsertText(const QString &data) void FakeVimHandler::Private::recordInsertText(const QString &data)
{ {
EditOperation op; EditOperation op;
op.m_position = m_tc.position(); op.position = m_tc.position();
op.m_to = data; op.to = data;
recordOperation(op); recordOperation(op);
m_tc.insertText(data); m_tc.insertText(data);
} }
void FakeVimHandler::Private::recordOperation(const EditOperation &op) void FakeVimHandler::Private::recordOperation(const EditOperation &op)
{ {
//qDebug() << "OP: " << op; // No need to record operations that actually do not change anything.
if (op.from.isEmpty() && op.to.isEmpty() && op.itemCount == 0)
return;
// No need to create groups with only one member.
if (op.itemCount == 1)
return;
m_undoStack.push(op); m_undoStack.push(op);
m_redoStack.clear(); m_redoStack.clear();
} }
@@ -1860,16 +1866,16 @@ void FakeVimHandler::Private::recordOperation(const EditOperation &op)
void FakeVimHandler::Private::recordMove(int position, int nestedCount) void FakeVimHandler::Private::recordMove(int position, int nestedCount)
{ {
EditOperation op; EditOperation op;
op.m_position = position; op.position = position;
op.m_itemCount = nestedCount; op.itemCount = nestedCount;
recordOperation(op); recordOperation(op);
} }
void FakeVimHandler::Private::recordInsert(int position, const QString &data) void FakeVimHandler::Private::recordInsert(int position, const QString &data)
{ {
EditOperation op; EditOperation op;
op.m_position = position; op.position = position;
op.m_to = data; op.to = data;
recordOperation(op); recordOperation(op);
} }
@@ -1884,8 +1890,8 @@ void FakeVimHandler::Private::recordRemove(int position, int length)
void FakeVimHandler::Private::recordRemove(int position, const QString &data) void FakeVimHandler::Private::recordRemove(int position, const QString &data)
{ {
EditOperation op; EditOperation op;
op.m_position = position; op.position = position;
op.m_from = data; op.from = data;
recordOperation(op); recordOperation(op);
} }
@@ -1894,6 +1900,7 @@ void FakeVimHandler::Private::enterInsertMode()
EDITOR(setOverwriteMode(false)); EDITOR(setOverwriteMode(false));
m_mode = InsertMode; m_mode = InsertMode;
m_lastInsertion.clear(); m_lastInsertion.clear();
recordBeginGroup();
} }
void FakeVimHandler::Private::enterCommandMode() void FakeVimHandler::Private::enterCommandMode()

4
src/plugins/find/currentdocumentfind.cpp
View File

@@ -45,8 +45,8 @@ using namespace Core;
using namespace Find; using namespace Find;
using namespace Find::Internal; using namespace Find::Internal;
CurrentDocumentFind::CurrentDocumentFind(ICore *core) CurrentDocumentFind::CurrentDocumentFind()
: m_core(core), m_currentFind(0) : m_currentFind(0)
{ {
connect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)), connect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)),
this, SLOT(updateCurrentFindFilter(QWidget*,QWidget*))); this, SLOT(updateCurrentFindFilter(QWidget*,QWidget*)));

5
src/plugins/find/currentdocumentfind.h
View File

@@ -36,8 +36,6 @@
#include "ifindfilter.h" #include "ifindfilter.h"
#include <coreplugin/icore.h>
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtGui/QWidget> #include <QtGui/QWidget>
@@ -49,7 +47,7 @@ class CurrentDocumentFind : public QObject
Q_OBJECT Q_OBJECT
public: public:
CurrentDocumentFind(Core::ICore *core); CurrentDocumentFind();
void resetIncrementalSearch(); void resetIncrementalSearch();
void clearResults(); void clearResults();
@@ -83,7 +81,6 @@ private slots:
private: private:
void removeFindSupportConnections(); void removeFindSupportConnections();
Core::ICore *m_core;
QPointer<IFindSupport> m_currentFind; QPointer<IFindSupport> m_currentFind;
QPointer<QWidget> m_currentWidget; QPointer<QWidget> m_currentWidget;
}; };

12
src/plugins/find/findplugin.cpp
View File

@@ -42,6 +42,7 @@
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -77,14 +78,13 @@ FindPlugin::~FindPlugin()
bool FindPlugin::initialize(const QStringList &, QString *) bool FindPlugin::initialize(const QStringList &, QString *)
{ {
Core::ICore *core = Core::ICore::instance();
setupMenu(); setupMenu();
m_currentDocumentFind = new CurrentDocumentFind(core); m_currentDocumentFind = new CurrentDocumentFind;
m_findToolBar = new FindToolBar(this, m_currentDocumentFind); m_findToolBar = new FindToolBar(this, m_currentDocumentFind);
m_findDialog = new FindToolWindow(this); m_findDialog = new FindToolWindow(this);
SearchResultWindow *searchResultWindow = new SearchResultWindow(core); SearchResultWindow *searchResultWindow = new SearchResultWindow;
addAutoReleasedObject(searchResultWindow); addAutoReleasedObject(searchResultWindow);
return true; return true;
} }
@@ -126,8 +126,7 @@ void FindPlugin::openFindFilter()
void FindPlugin::setupMenu() void FindPlugin::setupMenu()
{ {
Core::ICore *core = Core::ICore::instance(); Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = core->actionManager();
Core::ActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT); Core::ActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT);
Core::ActionContainer *mfind = am->createMenu(Constants::M_FIND); Core::ActionContainer *mfind = am->createMenu(Constants::M_FIND);
medit->addMenu(mfind, Core::Constants::G_EDIT_FIND); medit->addMenu(mfind, Core::Constants::G_EDIT_FIND);
@@ -150,8 +149,7 @@ void FindPlugin::setupMenu()
void FindPlugin::setupFilterMenuItems() void FindPlugin::setupFilterMenuItems()
{ {
Core::ICore *core = Core::ICore::instance(); Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = core->actionManager();
QList<IFindFilter*> findInterfaces = QList<IFindFilter*> findInterfaces =
ExtensionSystem::PluginManager::instance()->getObjects<IFindFilter>(); ExtensionSystem::PluginManager::instance()->getObjects<IFindFilter>();
Core::Command *cmd; Core::Command *cmd;

1
src/plugins/find/findplugin.h
View File

@@ -38,7 +38,6 @@
#include "ifindfilter.h" #include "ifindfilter.h"
#include "findtoolbar.h" #include "findtoolbar.h"
#include <coreplugin/icore.h>
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
#include <QtCore/QHash> #include <QtCore/QHash>

1
src/plugins/find/findtoolbar.cpp
View File

@@ -37,6 +37,7 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/findplaceholder.h> #include <coreplugin/findplaceholder.h>
#include <coreplugin/icore.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>

15
src/plugins/find/searchresultwindow.cpp
View File

@@ -34,6 +34,8 @@
#include "searchresultwindow.h" #include "searchresultwindow.h"
#include "searchresulttreemodel.h" #include "searchresulttreemodel.h"
#include <coreplugin/icore.h>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QSettings> #include <QtCore/QSettings>
@@ -46,10 +48,9 @@ using namespace Find::Internal;
static const QString SETTINGSKEYSECTIONNAME("SearchResults"); static const QString SETTINGSKEYSECTIONNAME("SearchResults");
static const QString SETTINGSKEYEXPANDRESULTS("ExpandResults"); static const QString SETTINGSKEYEXPANDRESULTS("ExpandResults");
SearchResultWindow::SearchResultWindow(Core::ICore *core) : SearchResultWindow::SearchResultWindow()
m_core(core),
m_widget(new QStackedWidget())
{ {
m_widget = new QStackedWidget;
m_widget->setWindowTitle(name()); m_widget->setWindowTitle(name());
m_searchResultTreeView = new SearchResultTreeView(m_widget); m_searchResultTreeView = new SearchResultTreeView(m_widget);
@@ -173,8 +174,8 @@ void SearchResultWindow::handleExpandCollapseToolButton(bool checked)
void SearchResultWindow::readSettings(void) void SearchResultWindow::readSettings(void)
{ {
if (m_core && m_core->settings()) { QSettings *s = Core::ICore::instance()->settings();
QSettings *s = m_core->settings(); if (s) {
s->beginGroup(SETTINGSKEYSECTIONNAME); s->beginGroup(SETTINGSKEYSECTIONNAME);
m_expandCollapseToolButton->setChecked(s->value(SETTINGSKEYEXPANDRESULTS, m_initiallyExpand).toBool()); m_expandCollapseToolButton->setChecked(s->value(SETTINGSKEYEXPANDRESULTS, m_initiallyExpand).toBool());
s->endGroup(); s->endGroup();
@@ -183,8 +184,8 @@ void SearchResultWindow::readSettings(void)
void SearchResultWindow::writeSettings(void) void SearchResultWindow::writeSettings(void)
{ {
if (m_core && m_core->settings()) { QSettings *s = Core::ICore::instance()->settings();
QSettings *s = m_core->settings(); if (s) {
s->beginGroup(SETTINGSKEYSECTIONNAME); s->beginGroup(SETTINGSKEYSECTIONNAME);
s->setValue(SETTINGSKEYEXPANDRESULTS, m_expandCollapseToolButton->isChecked()); s->setValue(SETTINGSKEYEXPANDRESULTS, m_expandCollapseToolButton->isChecked());
s->endGroup(); s->endGroup();

4
src/plugins/find/searchresultwindow.h
View File

@@ -38,7 +38,6 @@
#include "searchresulttreeview.h" #include "searchresulttreeview.h"
#include <coreplugin/ioutputpane.h> #include <coreplugin/ioutputpane.h>
#include <coreplugin/icore.h>
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtCore/QStringList> #include <QtCore/QStringList>
@@ -65,7 +64,7 @@ class FIND_EXPORT SearchResultWindow : public Core::IOutputPane
Q_OBJECT Q_OBJECT
public: public:
SearchResultWindow(Core::ICore *core); SearchResultWindow();
~SearchResultWindow(); ~SearchResultWindow();
QWidget *outputWidget(QWidget *); QWidget *outputWidget(QWidget *);
@@ -97,7 +96,6 @@ private:
Internal::SearchResultTreeView *m_searchResultTreeView; Internal::SearchResultTreeView *m_searchResultTreeView;
QListWidget *m_noMatchesFoundDisplay; QListWidget *m_noMatchesFoundDisplay;
Core::ICore *m_core;
QToolButton *m_expandCollapseToolButton; QToolButton *m_expandCollapseToolButton;
static const bool m_initiallyExpand = false; static const bool m_initiallyExpand = false;
QStackedWidget *m_widget; QStackedWidget *m_widget;

3
src/plugins/git/gitplugin.cpp
View File

@@ -236,8 +236,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *error_message)
m_gitClient = new GitClient(this); m_gitClient = new GitClient(this);
// Create the globalcontext list to register actions accordingly // Create the globalcontext list to register actions accordingly
QList<int> globalcontext; QList<int> globalcontext;
globalcontext << m_core->uniqueIDManager()-> globalcontext << m_core->uniqueIDManager()->uniqueIdentifier(Core::Constants::C_GLOBAL);
uniqueIdentifier(Core::Constants::C_GLOBAL);
// Create the output Window // Create the output Window
m_outputWindow = new GitOutputWindow(); m_outputWindow = new GitOutputWindow();

26
src/plugins/perforce/perforceplugin.cpp
View File

@@ -241,8 +241,8 @@ bool PerforcePlugin::initialize(const QStringList &arguments, QString *errorMess
globalcontext << Core::Constants::C_GLOBAL_ID; globalcontext << Core::Constants::C_GLOBAL_ID;
QList<int> perforcesubmitcontext; QList<int> perforcesubmitcontext;
perforcesubmitcontext << perforcesubmitcontext << Core::UniqueIDManager::instance()->
Core::ICore::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_PERFORCESUBMITEDITOR); uniqueIdentifier(Constants::C_PERFORCESUBMITEDITOR);
Core::Command *command; Core::Command *command;
QAction *tmpaction; QAction *tmpaction;
@@ -467,7 +467,7 @@ void PerforcePlugin::diffAllOpened()
void PerforcePlugin::printOpenedFileList() void PerforcePlugin::printOpenedFileList()
{ {
Core::IEditor *e = Core::ICore::instance()->editorManager()->currentEditor(); Core::IEditor *e = Core::EditorManager::instance()->currentEditor();
if (e) if (e)
e->widget()->setFocus(); e->widget()->setFocus();
PerforceResponse result = runP4Cmd(QStringList() << QLatin1String("opened"), QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow); PerforceResponse result = runP4Cmd(QStringList() << QLatin1String("opened"), QStringList(), CommandToWindow|StdOutToWindow|StdErrToWindow|ErrorToWindow);
@@ -542,9 +542,9 @@ void PerforcePlugin::submit()
Core::IEditor *PerforcePlugin::openPerforceSubmitEditor(const QString &fileName, const QStringList &depotFileNames) Core::IEditor *PerforcePlugin::openPerforceSubmitEditor(const QString &fileName, const QStringList &depotFileNames)
{ {
Core::IEditor *editor = Core::EditorManager *editorManager = Core::EditorManager::instance();
Core::ICore::instance()->editorManager()->openEditor(fileName, Constants::PERFORCESUBMITEDITOR_KIND); Core::IEditor *editor = editorManager->openEditor(fileName, Constants::PERFORCESUBMITEDITOR_KIND);
Core::ICore::instance()->editorManager()->ensureEditorManagerVisible(); editorManager->ensureEditorManagerVisible();
PerforceSubmitEditor *submitEditor = dynamic_cast<PerforceSubmitEditor*>(editor); PerforceSubmitEditor *submitEditor = dynamic_cast<PerforceSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, return 0); QTC_ASSERT(submitEditor, return 0);
submitEditor->restrictToProjectFiles(depotFileNames); submitEditor->restrictToProjectFiles(depotFileNames);
@@ -841,9 +841,9 @@ Core::IEditor * PerforcePlugin::showOutputInEditor(const QString& title, const Q
if (Perforce::Constants::debug) if (Perforce::Constants::debug)
qDebug() << "PerforcePlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); qDebug() << "PerforcePlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title; QString s = title;
Core::IEditor *ediface = Core::ICore::instance()->editorManager()-> Core::IEditor *editor = Core::EditorManager::instance()->
newFile(kind, &s, output.toLocal8Bit()); newFile(kind, &s, output.toLocal8Bit());
PerforceEditor *e = qobject_cast<PerforceEditor*>(ediface->widget()); PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget());
if (!e) if (!e)
return 0; return 0;
s.replace(QLatin1Char(' '), QLatin1Char('_')); s.replace(QLatin1Char(' '), QLatin1Char('_'));
@@ -889,7 +889,7 @@ void PerforcePlugin::p4Diff(const QStringList &files, QString diffname)
diffname = fi.fileName(); diffname = fi.fileName();
} }
foreach (Core::IEditor *ed, Core::ICore::instance()->editorManager()->openedEditors()) { foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors()) {
if (ed->property("originalFileName").toString() == fileName) { if (ed->property("originalFileName").toString() == fileName) {
existingEditor = ed; existingEditor = ed;
displayInEditor = false; displayInEditor = false;
@@ -912,7 +912,7 @@ void PerforcePlugin::p4Diff(const QStringList &files, QString diffname)
} else if (!displayInEditor && existingEditor) { } else if (!displayInEditor && existingEditor) {
if (existingEditor) { if (existingEditor) {
existingEditor->createNew(result.stdOut); existingEditor->createNew(result.stdOut);
Core::ICore::instance()->editorManager()->setCurrentEditor(existingEditor); Core::EditorManager::instance()->setCurrentEditor(existingEditor);
} }
} }
} }
@@ -930,7 +930,7 @@ void PerforcePlugin::describe(const QString & source, const QString &n)
void PerforcePlugin::submitCurrentLog() void PerforcePlugin::submitCurrentLog()
{ {
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
em->closeEditors(QList<Core::IEditor*>() << em->currentEditor()); em->closeEditors(QList<Core::IEditor*>() << em->currentEditor());
} }
@@ -1004,8 +1004,8 @@ bool PerforcePlugin::editorAboutToClose(Core::IEditor *editor)
void PerforcePlugin::openFiles(const QStringList &files) void PerforcePlugin::openFiles(const QStringList &files)
{ {
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
foreach (QString s, files) foreach (const QString &s, files)
em->openEditor(clientFilePath(s)); em->openEditor(clientFilePath(s));
em->ensureEditorManagerVisible(); em->ensureEditorManagerVisible();
} }

2
src/plugins/projectexplorer/foldernavigationwidget.cpp
View File

@@ -170,7 +170,7 @@ void FolderNavigationWidget::openItem(const QModelIndex &index)
setCurrentTitle(QDir(m_dirModel->filePath(srcIndex))); setCurrentTitle(QDir(m_dirModel->filePath(srcIndex)));
} else { } else {
const QString filePath = m_dirModel->filePath(srcIndex); const QString filePath = m_dirModel->filePath(srcIndex);
Core::EditorManager *editorManager = Core::ICore::instance()->editorManager(); Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->openEditor(filePath); editorManager->openEditor(filePath);
editorManager->ensureEditorManagerVisible(); editorManager->ensureEditorManagerVisible();
} }

12
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -870,7 +870,7 @@ bool ProjectExplorerPlugin::openProjects(const QStringList &fileNames)
updateActions(); updateActions();
Core::ICore::instance()->modeManager()->activateMode(Core::Constants::MODE_EDIT); Core::ModeManager::instance()->activateMode(Core::Constants::MODE_EDIT);
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
return true; return true;
@@ -986,7 +986,7 @@ void ProjectExplorerPlugin::restoreSession()
} }
// update welcome page // update welcome page
Core::ModeManager *modeManager = Core::ICore::instance()->modeManager(); Core::ModeManager *modeManager = Core::ModeManager::instance();
connect(modeManager, SIGNAL(currentModeChanged(Core::IMode*)), this, SLOT(currentModeChanged(Core::IMode*))); connect(modeManager, SIGNAL(currentModeChanged(Core::IMode*)), this, SLOT(currentModeChanged(Core::IMode*)));
if (Core::Internal::WelcomeMode *welcomeMode = qobject_cast<Core::Internal::WelcomeMode*>(modeManager->mode(Core::Constants::MODE_WELCOME))) { if (Core::Internal::WelcomeMode *welcomeMode = qobject_cast<Core::Internal::WelcomeMode*>(modeManager->mode(Core::Constants::MODE_WELCOME))) {
updateWelcomePage(welcomeMode); updateWelcomePage(welcomeMode);
@@ -1618,9 +1618,9 @@ void ProjectExplorerPlugin::openFile()
{ {
if (m_currentNode) if (m_currentNode)
return; return;
Core::ICore *core = Core::ICore::instance(); Core::EditorManager *em = Core::EditorManager::instance();
core->editorManager()->openEditor(m_currentNode->path()); em->openEditor(m_currentNode->path());
core->editorManager()->ensureEditorManagerVisible(); em->ensureEditorManagerVisible();
} }
void ProjectExplorerPlugin::removeFile() void ProjectExplorerPlugin::removeFile()
@@ -1802,7 +1802,7 @@ void ProjectExplorerPlugin::openWithMenuTriggered(QAction *action)
qWarning() << "Editor Factory not attached to action, can't happen"<<editorFactory; qWarning() << "Editor Factory not attached to action, can't happen"<<editorFactory;
return; return;
} }
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(currentNode()->path(), editorFactory->kind()); em->openEditor(currentNode()->path(), editorFactory->kind());
em->ensureEditorManagerVisible(); em->ensureEditorManagerVisible();
} }

2
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -291,7 +291,7 @@ void ProjectTreeWidget::openItem(const QModelIndex &mainIndex)
{ {
Node *node = m_model->nodeForIndex(mainIndex); Node *node = m_model->nodeForIndex(mainIndex);
if (node->nodeType() == FileNodeType) { if (node->nodeType() == FileNodeType) {
Core::EditorManager *editorManager = Core::ICore::instance()->editorManager(); Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->openEditor(node->path()); editorManager->openEditor(node->path());
editorManager->ensureEditorManagerVisible(); editorManager->ensureEditorManagerVisible();
} }

4
src/plugins/projectexplorer/taskwindow.cpp
View File

@@ -578,8 +578,8 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
TaskWindowContext::TaskWindowContext(QWidget *widget) TaskWindowContext::TaskWindowContext(QWidget *widget)
: m_taskList(widget) : m_taskList(widget)
{ {
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << core->uniqueIDManager()->uniqueIdentifier(Core::Constants::C_PROBLEM_PANE); m_context << uidm->uniqueIdentifier(Core::Constants::C_PROBLEM_PANE);
} }
QList<int> TaskWindowContext::context() const QList<int> TaskWindowContext::context() const

12
src/plugins/qt4projectmanager/profileeditor.cpp
View File

@@ -40,7 +40,6 @@
#include "proeditormodel.h" #include "proeditormodel.h"
#include "procommandmanager.h" #include "procommandmanager.h"
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
#include <texteditor/fontsettings.h> #include <texteditor/fontsettings.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
@@ -62,13 +61,10 @@ using namespace ProjectExplorer;
ProFileEditorEditable::ProFileEditorEditable(ProFileEditor *editor) ProFileEditorEditable::ProFileEditorEditable(ProFileEditor *editor)
: BaseTextEditorEditable(editor) : BaseTextEditorEditable(editor)
{ {
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << core->uniqueIDManager()-> m_context << uidm->uniqueIdentifier(Qt4ProjectManager::Constants::C_PROFILEEDITOR);
uniqueIdentifier(Qt4ProjectManager::Constants::C_PROFILEEDITOR); m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
m_context << core->uniqueIDManager()-> // m_contexts << uidm->uniqueIdentifier(Qt4ProjectManager::Constants::PROJECT_KIND);
uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
// m_contexts << core->uniqueIDManager()->
// uniqueIdentifier(Qt4ProjectManager::Constants::PROJECT_KIND);
} }
TextEditor::BaseTextEditorEditable *ProFileEditor::createEditableInterface() TextEditor::BaseTextEditorEditable *ProFileEditor::createEditableInterface()

4
src/plugins/qt4projectmanager/profileeditorfactory.cpp
View File

@@ -37,7 +37,6 @@
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "profileeditor.h" #include "profileeditor.h"
#include <coreplugin/icore.h>
#include <coreplugin/fileiconprovider.h> #include <coreplugin/fileiconprovider.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
@@ -74,8 +73,7 @@ QString ProFileEditorFactory::kind() const
Core::IFile *ProFileEditorFactory::open(const QString &fileName) Core::IFile *ProFileEditorFactory::open(const QString &fileName)
{ {
Core::ICore *core = Core::ICore::instance(); Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
Core::IEditor *iface = core->editorManager()->openEditor(fileName, kind());
return iface ? iface->file() : 0; return iface ? iface->file() : 0;
} }

2
src/plugins/qt4projectmanager/qt4projectmanager.cpp
View File

@@ -89,7 +89,7 @@ Qt4Manager::Qt4Manager(Qt4ProjectManagerPlugin *plugin)
m_contextProject(0), m_contextProject(0),
m_languageID(0) m_languageID(0)
{ {
m_languageID = Core::ICore::instance()->uniqueIDManager()-> m_languageID = Core::UniqueIDManager::instance()->
uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX); uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
} }

3
src/plugins/qtscripteditor/qtscripteditorfactory.cpp
View File

@@ -37,7 +37,6 @@
#include "qtscripteditorconstants.h" #include "qtscripteditorconstants.h"
#include "qtscripteditorplugin.h" #include "qtscripteditorplugin.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
@@ -67,7 +66,7 @@ QString QtScriptEditorFactory::kind() const
Core::IFile *QtScriptEditorFactory::open(const QString &fileName) Core::IFile *QtScriptEditorFactory::open(const QString &fileName)
{ {
Core::IEditor *iface = Core::ICore::instance()->editorManager()->openEditor(fileName, kind()); Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
if (!iface) { if (!iface) {
qWarning() << "QtScriptEditorFactory::open: openEditor failed for " << fileName; qWarning() << "QtScriptEditorFactory::open: openEditor failed for " << fileName;
return 0; return 0;

3
src/plugins/quickopen/basefilefilter.cpp
View File

@@ -33,7 +33,6 @@
#include "basefilefilter.h" #include "basefilefilter.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <QtCore/QDir> #include <QtCore/QDir>
@@ -89,7 +88,7 @@ QList<FilterEntry> BaseFileFilter::matchesFor(const QString &origEntry)
void BaseFileFilter::accept(QuickOpen::FilterEntry selection) const void BaseFileFilter::accept(QuickOpen::FilterEntry selection) const
{ {
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(selection.internalData.toString()); em->openEditor(selection.internalData.toString());
em->ensureEditorManagerVisible(); em->ensureEditorManagerVisible();
} }

5
src/plugins/resourceeditor/resourceeditorfactory.cpp
View File

@@ -36,7 +36,6 @@
#include "resourceeditorplugin.h" #include "resourceeditorplugin.h"
#include "resourceeditorconstants.h" #include "resourceeditorconstants.h"
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
#include <coreplugin/fileiconprovider.h> #include <coreplugin/fileiconprovider.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
@@ -53,7 +52,7 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) :
m_kind(QLatin1String(C_RESOURCEEDITOR)), m_kind(QLatin1String(C_RESOURCEEDITOR)),
m_plugin(plugin) m_plugin(plugin)
{ {
m_context += Core::ICore::instance()->uniqueIDManager() m_context += Core::UniqueIDManager::instance()
->uniqueIdentifier(QLatin1String(ResourceEditor::Constants::C_RESOURCEEDITOR)); ->uniqueIdentifier(QLatin1String(ResourceEditor::Constants::C_RESOURCEEDITOR));
Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
iconProvider->registerIconForSuffix(QIcon(":/resourceeditor/images/qt_qrc.png"), iconProvider->registerIconForSuffix(QIcon(":/resourceeditor/images/qt_qrc.png"),
@@ -67,7 +66,7 @@ QString ResourceEditorFactory::kind() const
Core::IFile *ResourceEditorFactory::open(const QString &fileName) Core::IFile *ResourceEditorFactory::open(const QString &fileName)
{ {
Core::IEditor *iface = Core::ICore::instance()->editorManager()->openEditor(fileName, kind()); Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
if (!iface) { if (!iface) {
qWarning() << "ResourceEditorFactory::open: openEditor failed for " << fileName; qWarning() << "ResourceEditorFactory::open: openEditor failed for " << fileName;
return 0; return 0;

2
src/plugins/resourceeditor/resourceeditorplugin.cpp
View File

@@ -129,7 +129,7 @@ void ResourceEditorPlugin::onUndoStackChanged(ResourceEditorW const *editor,
ResourceEditorW * ResourceEditorPlugin::currentEditor() const ResourceEditorW * ResourceEditorPlugin::currentEditor() const
{ {
ResourceEditorW * const focusEditor = qobject_cast<ResourceEditorW *>( ResourceEditorW * const focusEditor = qobject_cast<ResourceEditorW *>(
Core::ICore::instance()->editorManager()->currentEditor()); Core::EditorManager::instance()->currentEditor());
QTC_ASSERT(focusEditor, return 0); QTC_ASSERT(focusEditor, return 0);
return focusEditor; return focusEditor;
} }

22
src/plugins/subversion/subversionplugin.cpp
View File

@@ -134,7 +134,7 @@ static inline QString debugCodec(const QTextCodec *c)
Core::IEditor* locateEditor(const char *property, const QString &entry) Core::IEditor* locateEditor(const char *property, const QString &entry)
{ {
foreach (Core::IEditor *ed, Core::ICore::instance()->editorManager()->openedEditors()) foreach (Core::IEditor *ed, Core::EditorManager::instance()->openedEditors())
if (ed->property(property).toString() == entry) if (ed->property(property).toString() == entry)
return ed; return ed;
return 0; return 0;
@@ -407,7 +407,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
// Actions of the submit editor // Actions of the submit editor
QList<int> svncommitcontext; QList<int> svncommitcontext;
svncommitcontext << Core::ICore::instance()->uniqueIDManager()->uniqueIdentifier(Constants::SUBVERSIONCOMMITEDITOR); svncommitcontext << Core::UniqueIDManager::instance()->uniqueIdentifier(Constants::SUBVERSIONCOMMITEDITOR);
m_submitCurrentLogAction = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this); m_submitCurrentLogAction = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this);
command = ami->registerAction(m_submitCurrentLogAction, Constants::SUBMIT_CURRENT, svncommitcontext); command = ami->registerAction(m_submitCurrentLogAction, Constants::SUBMIT_CURRENT, svncommitcontext);
@@ -513,7 +513,7 @@ void SubversionPlugin::svnDiff(const QStringList &files, QString diffname)
// Show in the same editor if diff has been executed before // Show in the same editor if diff has been executed before
if (Core::IEditor *editor = locateEditor("originalFileName", files.front())) { if (Core::IEditor *editor = locateEditor("originalFileName", files.front())) {
editor->createNew(response.stdOut); editor->createNew(response.stdOut);
Core::ICore::instance()->editorManager()->setCurrentEditor(editor); Core::EditorManager::instance()->setCurrentEditor(editor);
return; return;
} }
} }
@@ -525,7 +525,7 @@ void SubversionPlugin::svnDiff(const QStringList &files, QString diffname)
SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName) SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName)
{ {
Core::IEditor *editor = Core::ICore::instance()->editorManager()->openEditor(fileName, QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_KIND)); Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName, QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_KIND));
SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor); SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, /**/); QTC_ASSERT(submitEditor, /**/);
submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction); submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
@@ -776,7 +776,7 @@ void SubversionPlugin::filelog(const QString &file)
if (Core::IEditor *editor = locateEditor("logFileName", file)) { if (Core::IEditor *editor = locateEditor("logFileName", file)) {
editor->createNew(response.stdOut); editor->createNew(response.stdOut);
Core::ICore::instance()->editorManager()->setCurrentEditor(editor); Core::EditorManager::instance()->setCurrentEditor(editor);
} else { } else {
const QString title = tr("svn log %1").arg(QFileInfo(file).fileName()); const QString title = tr("svn log %1").arg(QFileInfo(file).fileName());
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::LogOutput, file, codec); Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::LogOutput, file, codec);
@@ -819,7 +819,7 @@ void SubversionPlugin::annotate(const QString &file)
if (Core::IEditor *editor = locateEditor("annotateFileName", file)) { if (Core::IEditor *editor = locateEditor("annotateFileName", file)) {
editor->createNew(response.stdOut); editor->createNew(response.stdOut);
Core::ICore::instance()->editorManager()->setCurrentEditor(editor); Core::EditorManager::instance()->setCurrentEditor(editor);
} else { } else {
const QString title = tr("svn annotate %1").arg(QFileInfo(file).fileName()); const QString title = tr("svn annotate %1").arg(QFileInfo(file).fileName());
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::AnnotateOutput, file, codec); Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::AnnotateOutput, file, codec);
@@ -873,7 +873,7 @@ void SubversionPlugin::describe(const QString &source, const QString &changeNr)
const QString id = diffArg + source; const QString id = diffArg + source;
if (Core::IEditor *editor = locateEditor("describeChange", id)) { if (Core::IEditor *editor = locateEditor("describeChange", id)) {
editor->createNew(response.stdOut); editor->createNew(response.stdOut);
Core::ICore::instance()->editorManager()->setCurrentEditor(editor); Core::EditorManager::instance()->setCurrentEditor(editor);
} else { } else {
const QString title = tr("svn describe %1#%2").arg(QFileInfo(source).fileName(), changeNr); const QString title = tr("svn describe %1#%2").arg(QFileInfo(source).fileName(), changeNr);
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec); Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec);
@@ -883,8 +883,8 @@ void SubversionPlugin::describe(const QString &source, const QString &changeNr)
void SubversionPlugin::submitCurrentLog() void SubversionPlugin::submitCurrentLog()
{ {
Core::ICore::instance()->editorManager()->closeEditors(QList<Core::IEditor*>() Core::EditorManager::instance()->closeEditors(QList<Core::IEditor*>()
<< Core::ICore::instance()->editorManager()->currentEditor()); << Core::EditorManager::instance()->currentEditor());
} }
QString SubversionPlugin::currentFileName() const QString SubversionPlugin::currentFileName() const
@@ -990,8 +990,8 @@ Core::IEditor * SubversionPlugin::showOutputInEditor(const QString& title, const
if (Subversion::Constants::debug) if (Subversion::Constants::debug)
qDebug() << "SubversionPlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); qDebug() << "SubversionPlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title; QString s = title;
Core::IEditor *ediface = Core::ICore::instance()->editorManager()->newFile(kind, &s, output.toLocal8Bit()); Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output.toLocal8Bit());
SubversionEditor *e = qobject_cast<SubversionEditor*>(ediface->widget()); SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget());
if (!e) if (!e)
return 0; return 0;
s.replace(QLatin1Char(' '), QLatin1Char('_')); s.replace(QLatin1Char(' '), QLatin1Char('_'));

3
src/plugins/texteditor/basefilefind.cpp
View File

@@ -33,6 +33,7 @@
#include "basefilefind.h" #include "basefilefind.h"
#include <coreplugin/icore.h>
#include <coreplugin/stylehelper.h> #include <coreplugin/stylehelper.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
@@ -40,7 +41,7 @@
#include <texteditor/itexteditor.h> #include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>
#include <QtDebug> #include <QtCore/QDebug>
#include <QtCore/QDirIterator> #include <QtCore/QDirIterator>
#include <QtGui/QPushButton> #include <QtGui/QPushButton>
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>

3
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -43,7 +43,6 @@
#include "codecselector.h" #include "codecselector.h"
#ifndef TEXTEDITOR_STANDALONE #ifndef TEXTEDITOR_STANDALONE
#include <coreplugin/icore.h>
#include <coreplugin/manhattanstyle.h> #include <coreplugin/manhattanstyle.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
@@ -132,7 +131,7 @@ ITextEditor *BaseTextEditor::openEditorAt(const QString &fileName,
int column, int column,
const QString &editorKind) const QString &editorKind)
{ {
Core::EditorManager *editorManager = Core::ICore::instance()->editorManager(); Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->addCurrentPositionToNavigationHistory(true); editorManager->addCurrentPositionToNavigationHistory(true);
Core::IEditor *editor = editorManager->openEditor(fileName, editorKind, true); Core::IEditor *editor = editorManager->openEditor(fileName, editorKind, true);
TextEditor::ITextEditor *texteditor = qobject_cast<TextEditor::ITextEditor *>(editor); TextEditor::ITextEditor *texteditor = qobject_cast<TextEditor::ITextEditor *>(editor);

5
src/plugins/texteditor/basetextmark.cpp
View File

@@ -35,7 +35,6 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <coreplugin/icore.h>
#include <QtCore/QTimer> #include <QtCore/QTimer>
@@ -57,7 +56,7 @@ BaseTextMark::BaseTextMark(const QString &filename, int line)
void BaseTextMark::init() void BaseTextMark::init()
{ {
m_init = true; m_init = true;
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
connect(em, SIGNAL(editorOpened(Core::IEditor *)), this, SLOT(editorOpened(Core::IEditor *))); connect(em, SIGNAL(editorOpened(Core::IEditor *)), this, SLOT(editorOpened(Core::IEditor *)));
foreach (Core::IEditor *editor, em->openedEditors()) foreach (Core::IEditor *editor, em->openedEditors())
@@ -117,7 +116,7 @@ void BaseTextMark::updateMarker()
void BaseTextMark::moveMark(const QString & /* filename */, int /* line */) void BaseTextMark::moveMark(const QString & /* filename */, int /* line */)
{ {
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
if (!m_init) { if (!m_init) {
connect(em, SIGNAL(editorOpened(Core::IEditor *)), this, SLOT(editorOpened(Core::IEditor *))); connect(em, SIGNAL(editorOpened(Core::IEditor *)), this, SLOT(editorOpened(Core::IEditor *)));
m_init = true; m_init = true;

13
src/plugins/texteditor/plaintexteditor.cpp
View File

@@ -36,7 +36,6 @@
#include "texteditorplugin.h" #include "texteditorplugin.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
using namespace TextEditor; using namespace TextEditor;
@@ -45,15 +44,13 @@ using namespace TextEditor::Internal;
PlainTextEditorEditable::PlainTextEditorEditable(PlainTextEditor *editor) PlainTextEditorEditable::PlainTextEditorEditable(PlainTextEditor *editor)
: BaseTextEditorEditable(editor) : BaseTextEditorEditable(editor)
{ {
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << core->uniqueIDManager()-> m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR);
uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR); m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
m_context << core->uniqueIDManager()->
uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
} }
PlainTextEditor::PlainTextEditor(QWidget *parent) : PlainTextEditor::PlainTextEditor(QWidget *parent)
BaseTextEditor(parent) : BaseTextEditor(parent)
{ {
setRevisionsVisible(true); setRevisionsVisible(true);
setMarksVisible(true); setMarksVisible(true);

4
src/plugins/texteditor/plaintexteditorfactory.cpp
View File

@@ -37,7 +37,6 @@
#include "texteditorplugin.h" #include "texteditorplugin.h"
#include "texteditoractionhandler.h" #include "texteditoractionhandler.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
@@ -67,8 +66,7 @@ QString PlainTextEditorFactory::kind() const
Core::IFile *PlainTextEditorFactory::open(const QString &fileName) Core::IFile *PlainTextEditorFactory::open(const QString &fileName)
{ {
Core::ICore *core = Core::ICore::instance(); Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
Core::IEditor *iface = core->editorManager()->openEditor(fileName, kind());
return iface ? iface->file() : 0; return iface ? iface->file() : 0;
} }

2
src/plugins/texteditor/texteditoractionhandler.cpp
View File

@@ -89,7 +89,7 @@ TextEditorActionHandler::TextEditorActionHandler(const QString &context,
m_moveLineUpAction = 0; m_moveLineUpAction = 0;
m_moveLineDownAction = 0; m_moveLineDownAction = 0;
m_contextId << Core::ICore::instance()->uniqueIDManager()->uniqueIdentifier(context); m_contextId << Core::UniqueIDManager::instance()->uniqueIdentifier(context);
connect(Core::ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext *)), connect(Core::ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext *)),
this, SLOT(updateCurrentEditor(Core::IContext *))); this, SLOT(updateCurrentEditor(Core::IContext *)));

3
src/plugins/texteditor/texteditorplugin.cpp
View File

@@ -43,6 +43,7 @@
#include "plaintexteditor.h" #include "plaintexteditor.h"
#include "storagesettings.h" #include "storagesettings.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
@@ -166,7 +167,7 @@ void TextEditorPlugin::initializeEditor(TextEditor::PlainTextEditor *editor)
void TextEditorPlugin::invokeCompletion() void TextEditorPlugin::invokeCompletion()
{ {
Core::IEditor *iface = Core::ICore::instance()->editorManager()->currentEditor(); Core::IEditor *iface = Core::EditorManager::instance()->currentEditor();
ITextEditor *editor = qobject_cast<ITextEditor *>(iface); ITextEditor *editor = qobject_cast<ITextEditor *>(iface);
if (editor) if (editor)
editor->triggerCompletions(); editor->triggerCompletions();

3
src/plugins/vcsbase/basevcseditorfactory.cpp
View File

@@ -35,7 +35,6 @@
#include "vcsbaseplugin.h" #include "vcsbaseplugin.h"
#include "vcsbaseeditor.h" #include "vcsbaseeditor.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <texteditor/fontsettings.h> #include <texteditor/fontsettings.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
@@ -83,7 +82,7 @@ QString BaseVCSEditorFactory::kind() const
Core::IFile *BaseVCSEditorFactory::open(const QString &fileName) Core::IFile *BaseVCSEditorFactory::open(const QString &fileName)
{ {
Core::IEditor *iface = Core::ICore::instance()->editorManager()->openEditor(fileName, kind()); Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind());
return iface ? iface->file() : 0; return iface ? iface->file() : 0;
} }

4
src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
View File

@@ -34,7 +34,6 @@
#include "basevcssubmiteditorfactory.h" #include "basevcssubmiteditorfactory.h"
#include "vcsbasesubmiteditor.h" #include "vcsbasesubmiteditor.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
namespace VCSBase { namespace VCSBase {
@@ -82,8 +81,7 @@ QStringList BaseVCSSubmitEditorFactory::mimeTypes() const
Core::IFile *BaseVCSSubmitEditorFactory::open(const QString &fileName) Core::IFile *BaseVCSSubmitEditorFactory::open(const QString &fileName)
{ {
Core::ICore *core = Core::ICore::instance(); if (Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind()))
if (Core::IEditor *iface = core->editorManager()->openEditor(fileName, kind()))
return iface->file(); return iface->file();
return 0; return 0;
} }

13
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -38,7 +38,6 @@
#include "vcsbaseconstants.h" #include "vcsbaseconstants.h"
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/editorconfiguration.h> #include <projectexplorer/editorconfiguration.h>
@@ -85,10 +84,9 @@ VCSBaseEditorEditable::VCSBaseEditorEditable(VCSBaseEditor *editor,
const VCSBaseEditorParameters *type) const VCSBaseEditorParameters *type)
: BaseTextEditorEditable(editor), m_kind(type->kind) : BaseTextEditorEditable(editor), m_kind(type->kind)
{ {
Core::ICore *core = Core::ICore::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << core->uniqueIDManager()->uniqueIdentifier(QLatin1String(type->context)) m_context << uidm->uniqueIdentifier(QLatin1String(type->context))
<< core->uniqueIDManager()->uniqueIdentifier(QLatin1String(TextEditor::Constants::C_TEXTEDITOR)); << uidm->uniqueIdentifier(QLatin1String(TextEditor::Constants::C_TEXTEDITOR));
} }
QList<int> VCSBaseEditorEditable::context() const QList<int> VCSBaseEditorEditable::context() const
@@ -363,7 +361,7 @@ void VCSBaseEditor::jumpToChangeFromDiff(QTextCursor cursor)
if (!exists) if (!exists)
return; return;
Core::EditorManager *em = Core::ICore::instance()->editorManager(); Core::EditorManager *em = Core::EditorManager::instance();
Core::IEditor *ed = em->openEditor(fileName); Core::IEditor *ed = em->openEditor(fileName);
em->ensureEditorManagerVisible(); em->ensureEditorManagerVisible();
if (TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor *>(ed)) if (TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor *>(ed))
@@ -409,8 +407,7 @@ static QTextCodec *findFileCodec(const QString &source)
{ {
typedef QList<Core::IEditor *> EditorList; typedef QList<Core::IEditor *> EditorList;
const EditorList editors = const EditorList editors = Core::EditorManager::instance()->editorsForFileName(source);
Core::ICore::instance()->editorManager()->editorsForFileName(source);
if (!editors.empty()) { if (!editors.empty()) {
const EditorList::const_iterator ecend = editors.constEnd(); const EditorList::const_iterator ecend = editors.constEnd();
for (EditorList::const_iterator it = editors.constBegin(); it != ecend; ++it) for (EditorList::const_iterator it = editors.constBegin(); it != ecend; ++it)

3
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -35,7 +35,6 @@
#include "submiteditorfile.h" #include "submiteditorfile.h"
#include <coreplugin/ifile.h> #include <coreplugin/ifile.h>
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -84,7 +83,7 @@ VCSBaseSubmitEditorPrivate::VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditor
m_parameters(parameters), m_parameters(parameters),
m_file(new VCSBase::Internal::SubmitEditorFile(QLatin1String(m_parameters->mimeType), q)) m_file(new VCSBase::Internal::SubmitEditorFile(QLatin1String(m_parameters->mimeType), q))
{ {
m_contexts << Core::ICore::instance()->uniqueIDManager()->uniqueIdentifier(m_parameters->context); m_contexts << Core::UniqueIDManager::instance()->uniqueIdentifier(m_parameters->context);
} }
VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters, VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters,