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

Use new static ICore interface.

Browse Source 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-01-24 15:36:40 +01:00
committed by hjk
parent c14a4756a9
commit 4a21f0c3c8
254 changed files with 848 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ namespace {
You get the only implementation of this class from the core interface
ICore::actionManager() method, e.g.
\code
Core::ICore::instance()->actionManager()
Core::ICore::actionManager()
\endcode
The main reasons for the need of this class is to provide a central place where the user
@@ -99,7 +99,7 @@ namespace {
To register a globally active action "My Action"
put the following in your plugin's IPlugin::initialize method:
\code
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
QAction *myAction = new QAction(tr("My Action"), this);
Core::Command *cmd = am->registerAction(myAction,
"myplugin.myaction",
@@ -505,7 +505,7 @@ static const char sequenceKey[] = "Keysequence";
void ActionManagerPrivate::initialize()
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
const int shortcuts = settings->beginReadArray(QLatin1String(settingsGroup));
for (int i = 0; i < shortcuts; ++i) {
settings->setArrayIndex(i);

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

@@ -737,7 +737,7 @@ QString BaseFileWizard::buildFileName(const QString &path,
QString BaseFileWizard::preferredSuffix(const QString &mimeType)
{
const QString rc = Core::ICore::instance()->mimeDatabase()->preferredSuffixByType(mimeType);
const QString rc = Core::ICore::mimeDatabase()->preferredSuffixByType(mimeType);
if (rc.isEmpty())
qWarning("%s: WARNING: Unable to find a preferred suffix for %s.",
Q_FUNC_INFO, mimeType.toUtf8().constData());

6
src/plugins/coreplugin/designmode.cpp
View File

@@ -260,10 +260,10 @@ void DesignMode::updateContext(Core::IMode *newMode, Core::IMode *oldMode)
{
if (newMode == this) {
// Apply active context
Core::ICore::instance()->updateAdditionalContexts(Context(), d->m_activeContext);
Core::ICore::updateAdditionalContexts(Context(), d->m_activeContext);
} else if (oldMode == this) {
// Remove active context
Core::ICore::instance()->updateAdditionalContexts(d->m_activeContext, Context());
Core::ICore::updateAdditionalContexts(d->m_activeContext, Context());
}
}
@@ -273,7 +273,7 @@ void DesignMode::setActiveContext(const Context &context)
return;
if (ModeManager::instance()->currentMode() == this)
Core::ICore::instance()->updateAdditionalContexts(d->m_activeContext, context);
Core::ICore::updateAdditionalContexts(d->m_activeContext, context);
d->m_activeContext = context;
}

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

@@ -332,7 +332,7 @@ void SettingsDialog::showPage(const QString &categoryId, const QString &pageId)
QString initialCategory = categoryId;
QString initialPage = pageId;
if (initialCategory.isEmpty() && initialPage.isEmpty()) {
QSettings *settings = ICore::instance()->settings();
QSettings *settings = ICore::settings();
initialCategory = settings->value(QLatin1String(categoryKeyC), QVariant(QString())).toString();
initialPage = settings->value(QLatin1String(pageKeyC), QVariant(QString())).toString();
}
@@ -540,7 +540,7 @@ void SettingsDialog::apply()
void SettingsDialog::done(int val)
{
QSettings *settings = ICore::instance()->settings();
QSettings *settings = ICore::settings();
settings->setValue(QLatin1String(categoryKeyC), m_currentCategory);
settings->setValue(QLatin1String(pageKeyC), m_currentPage);

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

@@ -219,7 +219,7 @@ void ShortcutSettings::removeTargetIdentifier()
void ShortcutSettings::importAction()
{
QString fileName = QFileDialog::getOpenFileName(0, tr("Import Keyboard Mapping Scheme"),
ICore::instance()->resourcePath() + QLatin1String("/schemes/"),
ICore::resourcePath() + QLatin1String("/schemes/"),
tr("Keyboard Mapping Scheme (*.kms)"));
if (!fileName.isEmpty()) {
@@ -268,7 +268,7 @@ void ShortcutSettings::exportAction()
{
QString fileName = FileManager::instance()->getSaveFileNameWithExtension(
tr("Export Keyboard Mapping Scheme"),
ICore::instance()->resourcePath() + QLatin1String("/schemes/"),
ICore::resourcePath() + QLatin1String("/schemes/"),
tr("Keyboard Mapping Scheme (*.kms)"));
if (!fileName.isEmpty()) {
CommandsFile cf(fileName);

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

@@ -186,8 +186,9 @@ EditorManagerPlaceHolder* EditorManagerPlaceHolder::current()
namespace Core {
struct EditorManagerPrivate {
explicit EditorManagerPrivate(ICore *core, QWidget *parent);
struct EditorManagerPrivate
{
explicit EditorManagerPrivate(QWidget *parent);
~EditorManagerPrivate();
Internal::EditorView *m_view;
Internal::SplitterOrView *m_splitter;
@@ -195,9 +196,6 @@ struct EditorManagerPrivate {
QPointer<SplitterOrView> m_currentView;
QTimer *m_autoSaveTimer;
ICore *m_core;
// actions
QAction *m_revertToSavedAction;
QAction *m_saveAction;
@@ -239,11 +237,10 @@ struct EditorManagerPrivate {
};
}
EditorManagerPrivate::EditorManagerPrivate(ICore *core, QWidget *parent) :
EditorManagerPrivate::EditorManagerPrivate(QWidget *parent) :
m_view(0),
m_splitter(0),
m_autoSaveTimer(0),
m_core(core),
m_revertToSavedAction(new QAction(EditorManager::tr("Revert to Saved"), parent)),
m_saveAction(new QAction(parent)),
m_saveAsAction(new QAction(parent)),
@@ -286,20 +283,20 @@ static Command *createSeparator(ActionManager *am, QObject *parent,
return cmd;
}
EditorManager::EditorManager(ICore *core, QWidget *parent) :
EditorManager::EditorManager(QWidget *parent) :
QWidget(parent),
d(new EditorManagerPrivate(core, parent))
d(new EditorManagerPrivate(parent))
{
m_instance = this;
connect(d->m_core, SIGNAL(contextAboutToChange(Core::IContext *)),
connect(ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext *)),
this, SLOT(handleContextChange(Core::IContext *)));
const Context editManagerContext(Constants::C_EDITORMANAGER);
// combined context for edit & design modes
const Context editDesignContext(Constants::C_EDITORMANAGER, Constants::C_DESIGN_MODE);
ActionManager *am = d->m_core->actionManager();
ActionManager *am = ICore::actionManager();
ActionContainer *mfile = am->actionContainer(Constants::M_FILE);
// Revert to saved
@@ -488,7 +485,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
EditorManager::~EditorManager()
{
m_instance = 0;
if (d->m_core) {
if (ICore::instance()) {
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
if (d->m_coreListener) {
pm->removeObject(d->m_coreListener);
@@ -540,7 +537,7 @@ void EditorManager::removeEditor(IEditor *editor)
d->m_editorModel->removeEditor(editor);
if (!isDuplicate)
FileManager::instance()->removeFile(editor->file());
d->m_core->removeContextObject(editor);
ICore::removeContextObject(editor);
}
void EditorManager::handleContextChange(Core::IContext *context)
@@ -817,7 +814,7 @@ void EditorManager::closeOtherEditorsFromContextMenu()
void EditorManager::showInGraphicalShell()
{
const QString path = d->m_contextMenuEditorIndex.data(Qt::UserRole + 1).toString();
Core::FileUtils::showInGraphicalShell(ICore::instance()->mainWindow(), path);
Core::FileUtils::showInGraphicalShell(ICore::mainWindow(), path);
}
void EditorManager::openTerminal()
@@ -873,7 +870,7 @@ bool EditorManager::closeEditors(const QList<IEditor*> &editorsToClose, bool ask
//ask whether to save modified files
if (askAboutModifiedEditors) {
bool cancelled = false;
QList<IFile*> list = d->m_core->fileManager()->
QList<IFile*> list = ICore::fileManager()->
saveModifiedFiles(filesForEditors(acceptedEditors), &cancelled);
if (cancelled)
return false;
@@ -1132,7 +1129,7 @@ EditorManager::EditorFactoryList
{
EditorFactoryList rc;
const EditorFactoryList allFactories = pluginManager()->getObjects<IEditorFactory>();
mimeTypeFactoryRecursion(d->m_core->mimeDatabase(), mimeType, allFactories, bestMatchOnly, &rc);
mimeTypeFactoryRecursion(ICore::mimeDatabase(), mimeType, allFactories, bestMatchOnly, &rc);
if (debugEditorManager)
qDebug() << Q_FUNC_INFO << mimeType.type() << " returns " << rc;
return rc;
@@ -1143,7 +1140,7 @@ EditorManager::ExternalEditorList
{
ExternalEditorList rc;
const ExternalEditorList allEditors = pluginManager()->getObjects<IExternalEditor>();
mimeTypeFactoryRecursion(d->m_core->mimeDatabase(), mimeType, allEditors, bestMatchOnly, &rc);
mimeTypeFactoryRecursion(ICore::mimeDatabase(), mimeType, allEditors, bestMatchOnly, &rc);
if (debugEditorManager)
qDebug() << Q_FUNC_INFO << mimeType.type() << " returns " << rc;
return rc;
@@ -1170,15 +1167,15 @@ IEditor *EditorManager::createEditor(const Id &editorId, const QString &fileName
if (!editorId.isValid()) {
const QFileInfo fileInfo(fileName);
// Find by mime type
MimeType mimeType = d->m_core->mimeDatabase()->findByFile(fileInfo);
MimeType mimeType = ICore::mimeDatabase()->findByFile(fileInfo);
if (!mimeType) {
qWarning("%s unable to determine mime type of %s/%s. Falling back to text/plain",
Q_FUNC_INFO, fileName.toUtf8().constData(), editorId.name().constData());
mimeType = d->m_core->mimeDatabase()->findByType(QLatin1String("text/plain"));
mimeType = ICore::mimeDatabase()->findByType(QLatin1String("text/plain"));
}
// open text files > 48 MB in binary editor
if (fileInfo.size() > maxTextFileSize() && mimeType.type().startsWith(QLatin1String("text")))
mimeType = d->m_core->mimeDatabase()->findByType(QLatin1String("application/octet-stream"));
mimeType = ICore::mimeDatabase()->findByType(QLatin1String("application/octet-stream"));
factories = editorFactories(mimeType, true);
} else {
// Find by editor id
@@ -1203,15 +1200,15 @@ void EditorManager::addEditor(IEditor *editor, bool isDuplicate)
{
if (!editor)
return;
d->m_core->addContextObject(editor);
ICore::addContextObject(editor);
d->m_editorModel->addEditor(editor, isDuplicate);
if (!isDuplicate) {
const bool isTemporary = editor->isTemporary();
const bool addWatcher = !isTemporary;
d->m_core->fileManager()->addFile(editor->file(), addWatcher);
ICore::fileManager()->addFile(editor->file(), addWatcher);
if (!isTemporary)
d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName(),
ICore::fileManager()->addToRecentFiles(editor->file()->fileName(),
editor->id());
}
emit editorOpened(editor);
@@ -1223,7 +1220,7 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
bool *isExternalEditor) const
{
// Collect editors that can open the file
const MimeType mt = d->m_core->mimeDatabase()->findByFile(fileName);
const MimeType mt = ICore::mimeDatabase()->findByFile(fileName);
if (!mt)
return Id();
QStringList allEditorIds;
@@ -1244,7 +1241,7 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
if (allEditorIds.empty())
return Id();
// Run dialog.
OpenWithDialog dialog(fileName, d->m_core->mainWindow());
OpenWithDialog dialog(fileName, ICore::mainWindow());
dialog.setEditors(allEditorIds);
dialog.setCurrentEditor(0);
if (dialog.exec() != QDialog::Accepted)
@@ -1330,7 +1327,7 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
QString errorString;
if (!editor->open(&errorString, fn, realFn)) {
QApplication::restoreOverrideCursor();
QMessageBox::critical(d->m_core->mainWindow(), tr("File Error"), errorString);
QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errorString);
delete editor;
return 0;
}
@@ -1362,15 +1359,15 @@ bool EditorManager::openExternalEditor(const QString &fileName, const Core::Id &
const bool ok = ee->startEditor(fileName, &errorMessage);
QApplication::restoreOverrideCursor();
if (!ok)
QMessageBox::critical(d->m_core->mainWindow(), tr("Opening File"), errorMessage);
QMessageBox::critical(ICore::mainWindow(), tr("Opening File"), errorMessage);
return ok;
}
QStringList EditorManager::getOpenFileNames() const
{
QString selectedFilter;
const QString &fileFilters = d->m_core->mimeDatabase()->allFiltersString(&selectedFilter);
return ICore::instance()->fileManager()->getOpenFileNames(fileFilters,
const QString &fileFilters = ICore::mimeDatabase()->allFiltersString(&selectedFilter);
return ICore::fileManager()->getOpenFileNames(fileFilters,
QString(), &selectedFilter);
}
@@ -1488,7 +1485,7 @@ bool EditorManager::saveFile(IFile *fileParam)
bool isReadOnly;
// try saving, no matter what isReadOnly tells us
success = d->m_core->fileManager()->saveFile(file, QString(), &isReadOnly);
success = ICore::fileManager()->saveFile(file, QString(), &isReadOnly);
if (!success && isReadOnly) {
MakeWritableResult answer =
@@ -1500,7 +1497,7 @@ bool EditorManager::saveFile(IFile *fileParam)
file->checkPermissions();
success = d->m_core->fileManager()->saveFile(file);
success = ICore::fileManager()->saveFile(file);
}
if (success) {
@@ -1525,7 +1522,7 @@ void EditorManager::autoSave()
errors << errorString;
}
if (!errors.isEmpty())
QMessageBox::critical(d->m_core->mainWindow(), tr("File Error"),
QMessageBox::critical(ICore::mainWindow(), tr("File Error"),
errors.join(QLatin1String("\n")));
}
@@ -1534,13 +1531,13 @@ MakeWritableResult EditorManager::makeFileWritable(IFile *file)
if (!file)
return Failed;
QString directory = QFileInfo(file->fileName()).absolutePath();
IVersionControl *versionControl = d->m_core->vcsManager()->findVersionControlForDirectory(directory);
IVersionControl *versionControl = ICore::vcsManager()->findVersionControlForDirectory(directory);
const QString &fileName = file->fileName();
switch (FileManager::promptReadOnlyFile(fileName, versionControl, d->m_core->mainWindow(), file->isSaveAsAllowed())) {
switch (FileManager::promptReadOnlyFile(fileName, versionControl, ICore::mainWindow(), file->isSaveAsAllowed())) {
case FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(fileName)) {
QMessageBox::warning(d->m_core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for editing with SCC."));
QMessageBox::warning(ICore::mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for editing with SCC."));
return Failed;
}
file->checkPermissions();
@@ -1548,7 +1545,7 @@ MakeWritableResult EditorManager::makeFileWritable(IFile *file)
case FileManager::RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(fileName, QFile::permissions(fileName) | QFile::WriteUser);
if (!permsOk) {
QMessageBox::warning(d->m_core->mainWindow(), tr("Cannot Set Permissions"), tr("Cannot set permissions to writable."));
QMessageBox::warning(ICore::mainWindow(), tr("Cannot Set Permissions"), tr("Cannot set permissions to writable."));
return Failed;
}
}
@@ -1570,11 +1567,11 @@ bool EditorManager::saveFileAs(IFile *fileParam)
if (!file)
return false;
const QString &filter = d->m_core->mimeDatabase()->allFiltersString();
const QString &filter = ICore::mimeDatabase()->allFiltersString();
QString selectedFilter =
d->m_core->mimeDatabase()->findByFile(QFileInfo(file->fileName())).filterString();
ICore::mimeDatabase()->findByFile(QFileInfo(file->fileName())).filterString();
const QString &absoluteFilePath =
d->m_core->fileManager()->getSaveAsFileName(file, filter, &selectedFilter);
ICore::fileManager()->getSaveAsFileName(file, filter, &selectedFilter);
if (absoluteFilePath.isEmpty())
return false;
@@ -1587,7 +1584,7 @@ bool EditorManager::saveFileAs(IFile *fileParam)
}
}
const bool success = d->m_core->fileManager()->saveFile(file, absoluteFilePath);
const bool success = ICore::fileManager()->saveFile(file, absoluteFilePath);
file->checkPermissions();
// @todo: There is an issue to be treated here. The new file might be of a different mime
@@ -1617,7 +1614,7 @@ void EditorManager::addFileToRecentFiles(IFile *file)
}
}
if (!isTemporary)
d->m_core->fileManager()->addToRecentFiles(file->fileName(), editorId);
ICore::fileManager()->addToRecentFiles(file->fileName(), editorId);
}
void EditorManager::gotoNextDocHistory()
@@ -1659,12 +1656,12 @@ void EditorManager::vcsOpenCurrentEditor()
return;
const QString directory = QFileInfo(curEditor->file()->fileName()).absolutePath();
IVersionControl *versionControl = d->m_core->vcsManager()->findVersionControlForDirectory(directory);
IVersionControl *versionControl = ICore::vcsManager()->findVersionControlForDirectory(directory);
if (!versionControl || !versionControl->supportsOperation(IVersionControl::OpenOperation))
return;
if (!versionControl->vcsOpen(curEditor->file()->fileName())) {
QMessageBox::warning(d->m_core->mainWindow(), tr("Cannot Open File"),
QMessageBox::warning(ICore::mainWindow(), tr("Cannot Open File"),
tr("Cannot open the file for editing with VCS."));
}
}
@@ -1683,11 +1680,11 @@ void EditorManager::updateWindowTitle()
windowTitle.prepend(editorName + dashSep);
QString filePath = QFileInfo(curEditor->file()->fileName()).absoluteFilePath();
if (!filePath.isEmpty())
d->m_core->mainWindow()->setWindowFilePath(filePath);
ICore::mainWindow()->setWindowFilePath(filePath);
} else {
d->m_core->mainWindow()->setWindowFilePath(QString());
ICore::mainWindow()->setWindowFilePath(QString());
}
d->m_core->mainWindow()->setWindowTitle(windowTitle);
ICore::mainWindow()->setWindowTitle(windowTitle);
}
void EditorManager::handleEditorStateChange()
@@ -1729,7 +1726,7 @@ void EditorManager::updateActions()
// if we do not really show a warning.
bool promptVCS = false;
const QString directory = QFileInfo(curEditor->file()->fileName()).absolutePath();
IVersionControl *versionControl = d->m_core->vcsManager()->findVersionControlForDirectory(directory);
IVersionControl *versionControl = ICore::vcsManager()->findVersionControlForDirectory(directory);
if (versionControl && versionControl->supportsOperation(IVersionControl::OpenOperation)) {
if (versionControl->settingsFlags() & IVersionControl::AutoOpen) {
vcsOpenCurrentEditor();
@@ -1883,7 +1880,7 @@ void EditorManager::showPopupOrSelectDocument() const
// EditorManager is invisible when invoked from Design Mode.
const QPoint p = isVisible() ?
mapToGlobal(QPoint(0, 0)) :
d->m_core->mainWindow()->mapToGlobal(QPoint(0, 0));
ICore::mainWindow()->mapToGlobal(QPoint(0, 0));
windowPopup()->move((width()-d->m_windowPopup->width())/2 + p.x(),
(height()-d->m_windowPopup->height())/2 + p.y());
windowPopup()->setVisible(true);
@@ -1995,7 +1992,7 @@ static const char autoSaveIntervalKey[] = "EditorManager/AutoSaveInterval";
void EditorManager::saveSettings()
{
SettingsDatabase *settings = d->m_core->settingsDatabase();
SettingsDatabase *settings = ICore::settingsDatabase();
settings->setValue(QLatin1String(documentStatesKey), d->m_editorStates);
settings->setValue(QLatin1String(reloadBehaviorKey), d->m_reloadSetting);
settings->setValue(QLatin1String(autoSaveEnabledKey), d->m_autoSaveEnabled);
@@ -2005,14 +2002,14 @@ void EditorManager::saveSettings()
void EditorManager::readSettings()
{
// Backward compatibility to old locations for these settings
QSettings *qs = d->m_core->settings();
QSettings *qs = ICore::settings();
if (qs->contains(QLatin1String(documentStatesKey))) {
d->m_editorStates = qs->value(QLatin1String(documentStatesKey))
.value<QMap<QString, QVariant> >();
qs->remove(QLatin1String(documentStatesKey));
}
SettingsDatabase *settings = d->m_core->settingsDatabase();
SettingsDatabase *settings = ICore::settingsDatabase();
if (settings->contains(QLatin1String(documentStatesKey)))
d->m_editorStates = settings->value(QLatin1String(documentStatesKey))
.value<QMap<QString, QVariant> >();
@@ -2039,7 +2036,7 @@ void EditorManager::revertToSaved()
if (currEditor->file()->isModified()) {
QMessageBox msgBox(QMessageBox::Question, tr("Revert to Saved"),
tr("You will lose your current changes if you proceed reverting %1.").arg(QDir::toNativeSeparators(fileName)),
QMessageBox::Yes|QMessageBox::No, d->m_core->mainWindow());
QMessageBox::Yes|QMessageBox::No, ICore::mainWindow());
msgBox.button(QMessageBox::Yes)->setText(tr("Proceed"));
msgBox.button(QMessageBox::No)->setText(tr("Cancel"));
msgBox.setDefaultButton(QMessageBox::No);
@@ -2050,7 +2047,7 @@ void EditorManager::revertToSaved()
}
QString errorString;
if (!currEditor->file()->reload(&errorString, IFile::FlagReload, IFile::TypeContents))
QMessageBox::critical(d->m_core->mainWindow(), tr("File Error"), errorString);
QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errorString);
}
void EditorManager::showEditorStatusBar(const QString &id,
@@ -2101,7 +2098,7 @@ int EditorManager::autoSaveInterval() const
QTextCodec *EditorManager::defaultTextCodec() const
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
if (QTextCodec *candidate = QTextCodec::codecForName(
settings->value(QLatin1String(Constants::SETTINGS_DEFAULTTEXTENCODING)).toByteArray()))
return candidate;

3
src/plugins/coreplugin/editormanager/editormanager.h
View File

@@ -49,7 +49,6 @@ QT_END_NAMESPACE
namespace Core {
class IContext;
class ICore;
class IEditor;
class IEditorFactory;
class IExternalEditor;
@@ -103,7 +102,7 @@ public:
typedef QList<IEditorFactory *> EditorFactoryList;
typedef QList<IExternalEditor *> ExternalEditorList;
explicit EditorManager(ICore *core, QWidget *parent);
explicit EditorManager(QWidget *parent);
virtual ~EditorManager();
void init();
static EditorManager *instance();

20
src/plugins/coreplugin/editormanager/editorview.cpp
View File

@@ -139,7 +139,7 @@ EditorView::~EditorView()
void EditorView::closeView()
{
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
IEditor *editor = currentEditor();
if (editor)
em->closeEditor(editor);
@@ -406,7 +406,7 @@ void EditorView::updateCurrentPositionInNavigationHistory()
void EditorView::goBackInNavigationHistory()
{
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
updateCurrentPositionInNavigationHistory();
while (m_currentNavigationHistoryPosition > 0) {
--m_currentNavigationHistoryPosition;
@@ -431,7 +431,7 @@ void EditorView::goBackInNavigationHistory()
void EditorView::goForwardInNavigationHistory()
{
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
updateCurrentPositionInNavigationHistory();
if (m_currentNavigationHistoryPosition >= m_navigationHistory.size()-1)
return;
@@ -490,12 +490,12 @@ void SplitterOrView::mousePressEvent(QMouseEvent *e)
if (e->button() != Qt::LeftButton)
return;
setFocus(Qt::MouseFocusReason);
ICore::instance()->editorManager()->setCurrentView(this);
ICore::editorManager()->setCurrentView(this);
}
void SplitterOrView::paintEvent(QPaintEvent *)
{
if (ICore::instance()->editorManager()->currentSplitterOrView() != this)
if (ICore::editorManager()->currentSplitterOrView() != this)
return;
if (!m_view || hasEditors())
@@ -657,7 +657,7 @@ void SplitterOrView::split(Qt::Orientation orientation)
m_splitter = new MiniSplitter(this);
m_splitter->setOrientation(orientation);
m_layout->addWidget(m_splitter);
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
Core::IEditor *e = m_view->currentEditor();
SplitterOrView *view = 0;
@@ -710,7 +710,7 @@ void SplitterOrView::unsplitAll()
void SplitterOrView::unsplitAll_helper()
{
if (!m_isRoot && m_view)
ICore::instance()->editorManager()->emptyView(m_view);
ICore::editorManager()->emptyView(m_view);
if (m_splitter) {
for (int i = 0; i < m_splitter->count(); ++i) {
if (SplitterOrView *splitterOrView = qobject_cast<SplitterOrView*>(m_splitter->widget(i))) {
@@ -726,7 +726,7 @@ void SplitterOrView::unsplit()
return;
Q_ASSERT(m_splitter->count() == 1);
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
SplitterOrView *childSplitterOrView = qobject_cast<SplitterOrView*>(m_splitter->widget(0));
QSplitter *oldSplitter = m_splitter;
m_splitter = 0;
@@ -771,7 +771,7 @@ QByteArray SplitterOrView::saveState() const
<< static_cast<SplitterOrView*>(m_splitter->widget(1))->saveState();
} else {
IEditor* e = editor();
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
// don't save state of temporary or ad-hoc editors
if (e && (e->isTemporary() || e->file()->fileName().isEmpty())) {
@@ -812,7 +812,7 @@ void SplitterOrView::restoreState(const QByteArray &state)
static_cast<SplitterOrView*>(m_splitter->widget(0))->restoreState(first);
static_cast<SplitterOrView*>(m_splitter->widget(1))->restoreState(second);
} else if (mode == "editor" || mode == "currenteditor") {
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
QString fileName;
QString id;
QByteArray editorState;

12
src/plugins/coreplugin/editortoolbar.cpp
View File

@@ -203,7 +203,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
this, SIGNAL(closeSplitClicked()), Qt::QueuedConnection);
ActionManager *am = ICore::instance()->actionManager();
ActionManager *am = ICore::actionManager();
connect(am->command(Constants::CLOSE), SIGNAL(keySequenceChanged()),
this, SLOT(updateActionShortcuts()));
connect(am->command(Constants::GO_BACK), SIGNAL(keySequenceChanged()),
@@ -246,7 +246,7 @@ void EditorToolBar::closeEditor()
return;
if (d->m_isStandalone) {
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
if (IEditor *editor = currentEditor()) {
em->closeEditor(editor);
}
@@ -321,7 +321,7 @@ void EditorToolBar::updateEditorListSelection(IEditor *newSelection)
void EditorToolBar::changeActiveEditor(int row)
{
EditorManager *em = ICore::instance()->editorManager();
EditorManager *em = ICore::editorManager();
QAbstractItemModel *model = d->m_editorList->model();
em->activateEditorForIndex(model->index(row, 0), EditorManager::ModeSwitch);
}
@@ -347,7 +347,7 @@ void EditorToolBar::listContextMenu(QPoint pos)
void EditorToolBar::makeEditorWritable()
{
if (currentEditor())
ICore::instance()->editorManager()->makeFileWritable(currentEditor()->file());
ICore::editorManager()->makeFileWritable(currentEditor()->file());
}
void EditorToolBar::setCanGoBack(bool canGoBack)
@@ -362,7 +362,7 @@ void EditorToolBar::setCanGoForward(bool canGoForward)
void EditorToolBar::updateActionShortcuts()
{
ActionManager *am = ICore::instance()->actionManager();
ActionManager *am = ICore::actionManager();
d->m_closeEditorButton->setToolTip(am->command(Constants::CLOSE)->stringWithAppendedShortcut(EditorManager::tr("Close")));
d->m_goBackAction->setToolTip(am->command(Constants::GO_BACK)->action()->toolTip());
d->m_goForwardAction->setToolTip(am->command(Constants::GO_FORWARD)->action()->toolTip());
@@ -370,7 +370,7 @@ void EditorToolBar::updateActionShortcuts()
IEditor *EditorToolBar::currentEditor() const
{
return ICore::instance()->editorManager()->currentEditor();
return ICore::editorManager()->currentEditor();
}
void EditorToolBar::checkEditorStatus()

30
src/plugins/coreplugin/externaltool.cpp
View File

@@ -620,7 +620,7 @@ void ExternalToolRunner::run()
if (!m_resolvedWorkingDirectory.isEmpty())
m_process->setWorkingDirectory(m_resolvedWorkingDirectory);
m_process->setCommand(m_resolvedExecutable, m_resolvedArguments);
ICore::instance()->messageManager()->printToOutputPane(
ICore::messageManager()->printToOutputPane(
tr("Starting external tool '%1' %2").arg(m_resolvedExecutable, m_resolvedArguments), false);
m_process->start();
}
@@ -644,7 +644,7 @@ void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
FileManager::instance()->unexpectFileChange(m_expectedFileName);
}
}
ICore::instance()->messageManager()->printToOutputPane(
ICore::messageManager()->printToOutputPane(
tr("'%1' finished").arg(m_resolvedExecutable), false);
deleteLater();
}
@@ -666,7 +666,7 @@ void ExternalToolRunner::readStandardOutput()
QByteArray data = m_process->readAllStandardOutput();
QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_outputCodecState);
if (m_tool->outputHandling() == ExternalTool::ShowInPane) {
ICore::instance()->messageManager()->printToOutputPane(output, true);
ICore::messageManager()->printToOutputPane(output, true);
} else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection) {
m_processOutput.append(output);
}
@@ -679,7 +679,7 @@ void ExternalToolRunner::readStandardError()
QByteArray data = m_process->readAllStandardError();
QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_errorCodecState);
if (m_tool->errorHandling() == ExternalTool::ShowInPane) {
ICore::instance()->messageManager()->printToOutputPane(output, true);
ICore::messageManager()->printToOutputPane(output, true);
} else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection) {
m_processOutput.append(output);
}
@@ -689,8 +689,8 @@ void ExternalToolRunner::readStandardError()
ExternalToolManager *ExternalToolManager::m_instance = 0;
ExternalToolManager::ExternalToolManager(Core::ICore *core)
: QObject(core), m_core(core)
ExternalToolManager::ExternalToolManager()
: QObject(ICore::instance())
{
m_instance = this;
initialize();
@@ -711,7 +711,7 @@ void ExternalToolManager::initialize()
connect(m_configureAction, SIGNAL(triggered()), this, SLOT(openPreferences()));
// add the external tools menu
ActionManager *am = m_core->actionManager();
ActionManager *am = ICore::actionManager();
ActionContainer *mexternaltools = am->createMenu(Id(Constants::M_TOOLS_EXTERNAL));
mexternaltools->menu()->setTitle(tr("&External"));
ActionContainer *mtools = am->actionContainer(Constants::M_TOOLS);
@@ -719,10 +719,10 @@ void ExternalToolManager::initialize()
QMap<QString, QMultiMap<int, ExternalTool*> > categoryPriorityMap;
QMap<QString, ExternalTool *> tools;
parseDirectory(m_core->userResourcePath() + QLatin1String("/externaltools"),
parseDirectory(ICore::userResourcePath() + QLatin1String("/externaltools"),
&categoryPriorityMap,
&tools);
parseDirectory(m_core->resourcePath() + QLatin1String("/externaltools"),
parseDirectory(ICore::resourcePath() + QLatin1String("/externaltools"),
&categoryPriorityMap,
&tools,
true);
@@ -750,7 +750,7 @@ void ExternalToolManager::parseDirectory(const QString &directory,
foreach (const QFileInfo &info, dir.entryInfoList()) {
const QString &fileName = info.absoluteFilePath();
QString error;
ExternalTool *tool = ExternalTool::createFromFile(fileName, &error, m_core->userInterfaceLanguage());
ExternalTool *tool = ExternalTool::createFromFile(fileName, &error, ICore::userInterfaceLanguage());
if (!tool) {
qWarning() << tr("Error while parsing external tool %1: %2").arg(fileName, error);
continue;
@@ -783,7 +783,7 @@ void ExternalToolManager::menuActivated()
QTC_ASSERT(tool, return);
ExternalToolRunner *runner = new ExternalToolRunner(tool);
if (runner->hasError()) {
ICore::instance()->messageManager()->printToOutputPane(runner->errorString(), true);
ICore::messageManager()->printToOutputPane(runner->errorString(), true);
}
}
@@ -800,7 +800,7 @@ QMap<QString, ExternalTool *> ExternalToolManager::toolsById() const
void ExternalToolManager::setToolsByCategory(const QMap<QString, QList<Internal::ExternalTool *> > &tools)
{
// clear menu
ActionManager *am = m_core->actionManager();
ActionManager *am = ICore::actionManager();
ActionContainer *mexternaltools = am->actionContainer(Id(Constants::M_TOOLS_EXTERNAL));
mexternaltools->clear();
@@ -890,7 +890,7 @@ void ExternalToolManager::setToolsByCategory(const QMap<QString, QList<Internal:
void ExternalToolManager::readSettings(const QMap<QString, ExternalTool *> &tools,
QMap<QString, QList<ExternalTool *> > *categoryMap)
{
QSettings *settings = m_core->settings();
QSettings *settings = ICore::settings();
settings->beginGroup(QLatin1String("ExternalTools"));
if (categoryMap) {
@@ -923,7 +923,7 @@ void ExternalToolManager::readSettings(const QMap<QString, ExternalTool *> &tool
void ExternalToolManager::writeSettings()
{
QSettings *settings = m_core->settings();
QSettings *settings = ICore::settings();
settings->beginGroup(QLatin1String("ExternalTools"));
settings->remove(QLatin1String(""));
@@ -950,6 +950,6 @@ void ExternalToolManager::writeSettings()
void ExternalToolManager::openPreferences()
{
ICore::instance()->showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE),
ICore::showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE),
QLatin1String(Core::Constants::SETTINGS_ID_TOOLS));
}

1
src/plugins/coreplugin/externaltool.h
View File

@@ -44,7 +44,6 @@ namespace Utils {
class QtcProcess;
}
namespace Core {
class ActionContainer;
namespace Internal {
class ExternalTool : public QObject

4
src/plugins/coreplugin/externaltoolmanager.h
View File

@@ -43,7 +43,6 @@
QT_FORWARD_DECLARE_CLASS(QAction)
namespace Core {
class ICore;
class ActionContainer;
namespace Internal {
@@ -58,7 +57,7 @@ class CORE_EXPORT ExternalToolManager : public QObject
public:
static ExternalToolManager *instance() { return m_instance; }
ExternalToolManager(Core::ICore *core);
ExternalToolManager();
~ExternalToolManager();
QMap<QString, QList<Internal::ExternalTool *> > toolsByCategory() const;
@@ -84,7 +83,6 @@ private:
void writeSettings();
static ExternalToolManager *m_instance;
Core::ICore *m_core;
QMap<QString, Internal::ExternalTool *> m_tools;
QMap<QString, QList<Internal::ExternalTool *> > m_categoryMap;
QMap<QString, QAction *> m_actions;

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

@@ -210,10 +210,9 @@ FileManager::FileManager(QMainWindow *mw)
: QObject(mw),
d(new Internal::FileManagerPrivate(this, mw))
{
Core::ICore *core = Core::ICore::instance();
connect(d->m_mainWindow, SIGNAL(windowActivated()),
this, SLOT(mainWindowActivated()));
connect(core, SIGNAL(contextChanged(Core::IContext*,Core::Context)),
connect(ICore::instance(), SIGNAL(contextChanged(Core::IContext*,Core::Context)),
this, SLOT(syncWithEditor(Core::IContext*)));
readSettings();
@@ -740,7 +739,7 @@ QString FileManager::getSaveAsFileName(IFile *file, const QString &filter, QStri
QString filterString;
if (filter.isEmpty()) {
if (const MimeType &mt = Core::ICore::instance()->mimeDatabase()->findByFile(fi))
if (const MimeType &mt = Core::ICore::mimeDatabase()->findByFile(fi))
filterString = mt.filterString();
selectedFilter = &filterString;
} else {
@@ -1126,7 +1125,7 @@ void FileManager::saveSettings()
recentEditorIds.append(file.second.toString());
}
QSettings *s = Core::ICore::instance()->settings();
QSettings *s = Core::ICore::settings();
s->beginGroup(QLatin1String(settingsGroupC));
s->setValue(QLatin1String(filesKeyC), recentFiles);
s->setValue(QLatin1String(editorsKeyC), recentEditorIds);
@@ -1139,7 +1138,7 @@ void FileManager::saveSettings()
void FileManager::readSettings()
{
QSettings *s = Core::ICore::instance()->settings();
QSettings *s = Core::ICore::settings();
d->m_recentFiles.clear();
s->beginGroup(QLatin1String(settingsGroupC));
QStringList recentFiles = s->value(QLatin1String(filesKeyC)).toStringList();
@@ -1302,10 +1301,9 @@ void FileManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
bool anyMatches = false;
ICore *core = ICore::instance();
if (const MimeType mt = core->mimeDatabase()->findByFile(QFileInfo(fileName))) {
const EditorFactoryList factories = core->editorManager()->editorFactories(mt, false);
const ExternalEditorList externalEditors = core->editorManager()->externalEditors(mt, false);
if (const MimeType mt = ICore::mimeDatabase()->findByFile(QFileInfo(fileName))) {
const EditorFactoryList factories = ICore::editorManager()->editorFactories(mt, false);
const ExternalEditorList externalEditors = ICore::editorManager()->externalEditors(mt, false);
anyMatches = !factories.empty() || !externalEditors.empty();
if (anyMatches) {
// Add all suitable editors
@@ -1361,13 +1359,13 @@ void FileManager::executeOpenWithMenuAction(QAction *action)
FileChangeBlocker::FileChangeBlocker(const QString &fileName)
: m_fileName(fileName)
{
Core::FileManager *fm = Core::ICore::instance()->fileManager();
Core::FileManager *fm = Core::ICore::fileManager();
fm->expectFileChange(fileName);
}
FileChangeBlocker::~FileChangeBlocker()
{
Core::FileManager *fm = Core::ICore::instance()->fileManager();
Core::FileManager *fm = Core::ICore::fileManager();
fm->unexpectFileChange(m_fileName);
}

8
src/plugins/coreplugin/fileutils.cpp
View File

@@ -72,7 +72,7 @@ static inline void showGraphicalShellError(QWidget *parent,
QMessageBox::ActionRole);
mbox.exec();
if (mbox.clickedButton() == settingsButton)
Core::ICore::instance()->showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE),
Core::ICore::showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE),
QLatin1String(Core::Constants::SETTINGS_ID_ENVIRONMENT));
}
#endif
@@ -110,7 +110,7 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const QString &pathIn)
// we cannot select a file here, because no file browser really supports it...
const QFileInfo fileInfo(pathIn);
const QString folder = fileInfo.isDir() ? fileInfo.absoluteFilePath() : fileInfo.filePath();
const QString app = Utils::UnixUtils::fileBrowser(Core::ICore::instance()->settings());
const QString app = Utils::UnixUtils::fileBrowser(Core::ICore::settings());
QProcess browserProc;
const QString browserArgs = Utils::UnixUtils::substituteFileBrowserParameters(app, folder);
bool success = browserProc.startDetached(browserArgs);
@@ -128,12 +128,12 @@ void FileUtils::openTerminal(const QString &path)
const QString terminalEmulator = QString::fromLocal8Bit(qgetenv("COMSPEC"));
const QStringList args; // none
#elif defined(Q_WS_MAC)
const QString terminalEmulator = Core::ICore::instance()->resourcePath()
const QString terminalEmulator = Core::ICore::resourcePath()
+ QLatin1String("/scripts/openTerminal.command");
QStringList args;
#else
QStringList args = Utils::QtcProcess::splitArgs(
Utils::ConsoleProcess::terminalEmulator(Core::ICore::instance()->settings()));
Utils::ConsoleProcess::terminalEmulator(Core::ICore::settings()));
const QString terminalEmulator = args.takeFirst();
const QString shell = QString::fromLocal8Bit(qgetenv("SHELL"));
args.append(shell);

14
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -105,7 +105,7 @@ void GeneralSettings::fillLanguageBox() const
m_page->languageBox->setCurrentIndex(m_page->languageBox->count() - 1);
const QString creatorTrPath =
Core::ICore::instance()->resourcePath() + QLatin1String("/translations");
Core::ICore::resourcePath() + QLatin1String("/translations");
const QStringList languageFiles = QDir(creatorTrPath).entryList(QStringList(QLatin1String("qtcreator*.qm")));
Q_FOREACH(const QString &languageFile, languageFiles)
@@ -128,7 +128,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
m_widget = new QWidget(parent);
m_page->setupUi(m_widget);
QSettings* settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
Q_UNUSED(settings) // Windows
fillLanguageBox();
@@ -197,10 +197,10 @@ void GeneralSettings::apply()
StyleHelper::setBaseColor(m_page->colorButton->color());
EditorManager::instance()->setReloadSetting(IFile::ReloadSetting(m_page->reloadBehavior->currentIndex()));
#ifdef Q_OS_UNIX
ConsoleProcess::setTerminalEmulator(Core::ICore::instance()->settings(),
ConsoleProcess::setTerminalEmulator(Core::ICore::settings(),
m_page->terminalEdit->text());
#ifndef Q_OS_MAC
Utils::UnixUtils::setFileBrowser(Core::ICore::instance()->settings(), m_page->externalFileBrowserEdit->text());
Utils::UnixUtils::setFileBrowser(Core::ICore::settings(), m_page->externalFileBrowserEdit->text());
#endif
#endif
EditorManager::instance()->setAutoSaveEnabled(m_page->autoSaveCheckBox->isChecked());
@@ -272,16 +272,16 @@ void GeneralSettings::resetLanguage()
QString GeneralSettings::language() const
{
QSettings* settings = Core::ICore::instance()->settings();
QSettings* settings = Core::ICore::settings();
return settings->value(QLatin1String("General/OverrideLanguage")).toString();
}
void GeneralSettings::setLanguage(const QString &locale)
{
QSettings* settings = Core::ICore::instance()->settings();
QSettings* settings = Core::ICore::settings();
if (settings->value(QLatin1String("General/OverrideLanguage")).toString() != locale)
{
QMessageBox::information(Core::ICore::instance()->mainWindow(), tr("Restart required"),
QMessageBox::information(Core::ICore::mainWindow(), tr("Restart required"),
tr("The language change will take effect after a restart of Qt Creator."));
}
if (locale.isEmpty())

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

@@ -109,7 +109,7 @@ HelpManager *HelpManager::instance()
QString HelpManager::collectionFilePath()
{
return QDir::cleanPath(Core::ICore::instance()->userResourcePath()
return QDir::cleanPath(Core::ICore::userResourcePath()
+ QLatin1String("/helpcollection.qhc"));
}
@@ -437,7 +437,7 @@ void HelpManager::verifyDocumenation()
QStringList HelpManagerPrivate::documentationFromInstaller()
{
QSettings *installSettings = Core::ICore::instance()->settings();
QSettings *installSettings = Core::ICore::settings();
QStringList documentationPaths = installSettings->value(QLatin1String("Help/InstalledDocumentation"))
.toStringList();
QStringList documentationFiles;

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

@@ -379,6 +379,7 @@ ICore::ICore(MainWindow *mainwindow)
ICore::~ICore()
{
m_instance = 0;
m_mainwindow = 0;
}
void ICore::showNewItemDialog(const QString &title,

3
src/plugins/coreplugin/icore.h
View File

@@ -74,6 +74,9 @@ class CORE_EXPORT ICore : public QObject
~ICore();
public:
// This should only be used to acccess the signals, so it could
// theoretically return an QObject *. For source compatibility
// it returns a ICore.
static ICore *instance();
static void showNewItemDialog(const QString &title,

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

@@ -114,7 +114,7 @@
extern "C" void handleSigInt(int sig)
{
Q_UNUSED(sig)
Core::ICore::instance()->exit();
Core::ICore::exit();
qDebug() << "SIGINT caught. Shutting down.";
}
#endif
@@ -210,9 +210,9 @@ MainWindow::MainWindow() :
m_modeManager->addWidget(m_progressManager->progressView());
m_statusBarManager = new StatusBarManager(this);
m_messageManager = new MessageManager;
m_editorManager = new EditorManager(m_coreImpl, this);
m_editorManager = new EditorManager(this);
m_editorManager->hide();
m_externalToolManager = new ExternalToolManager(m_coreImpl);
m_externalToolManager = new ExternalToolManager();
setCentralWidget(m_modeStack);
connect(QApplication::instance(), SIGNAL(focusChanged(QWidget*,QWidget*)),

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

@@ -1296,7 +1296,7 @@ MimeDatabasePrivate::MimeDatabasePrivate() :
m_maxLevel(-1)
{
// Assign here to avoid non-local static data initialization issues.
kModifiedMimeTypesPath = ICore::instance()->userResourcePath() + QLatin1String("/mimetypes/");
kModifiedMimeTypesPath = ICore::userResourcePath() + QLatin1String("/mimetypes/");
}
/*!

17
src/plugins/coreplugin/mimetypesettings.cpp
View File

@@ -73,7 +73,7 @@ class MimeTypeSettingsModel : public QAbstractTableModel
public:
MimeTypeSettingsModel(QObject *parent = 0)
: QAbstractTableModel(parent), m_core(ICore::instance()) {}
: QAbstractTableModel(parent) {}
virtual ~MimeTypeSettingsModel() {}
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
@@ -86,7 +86,6 @@ public:
void validatePatterns(QStringList *candidates, const MimeType &mimeType) const;
void updateKnownPatterns(const QStringList &oldPatterns, const QStringList &newPatterns);
ICore *m_core;
QList<MimeType> m_mimeTypes;
QSet<QString> m_knownPatterns;
QHash<QString, QString> m_handlersByMimeType;
@@ -134,20 +133,20 @@ QVariant MimeTypeSettingsModel::data(const QModelIndex &modelIndex, int role) co
void MimeTypeSettingsModel::load()
{
m_mimeTypes = m_core->mimeDatabase()->mimeTypes();
m_mimeTypes = ICore::mimeDatabase()->mimeTypes();
qSort(m_mimeTypes.begin(), m_mimeTypes.end(), MimeTypeComp());
m_knownPatterns = QSet<QString>::fromList(
MimeDatabase::fromGlobPatterns(m_core->mimeDatabase()->globPatterns()));
MimeDatabase::fromGlobPatterns(ICore::mimeDatabase()->globPatterns()));
foreach (const MimeType &mimeType, m_mimeTypes) {
QString value;
const QList<IEditorFactory *> factories =
m_core->editorManager()->editorFactories(mimeType);
ICore::editorManager()->editorFactories(mimeType);
if (!factories.isEmpty()) {
value = factories.front()->displayName();
} else {
const QList<IExternalEditor *> externalEditors =
m_core->editorManager()->externalEditors(mimeType);
ICore::editorManager()->externalEditors(mimeType);
if (!externalEditors.isEmpty())
value = externalEditors.front()->displayName();
else
@@ -257,7 +256,7 @@ public:
const QChar MimeTypeSettingsPrivate::kSemiColon(QLatin1Char(';'));
MimeTypeSettingsPrivate::MimeTypeSettingsPrivate()
: m_mimeDatabase(ICore::instance()->mimeDatabase())
: m_mimeDatabase(ICore::mimeDatabase())
, m_model(new MimeTypeSettingsModel)
, m_mimeForPatternSync(-1)
, m_mimeForMagicSync(-1)
@@ -518,7 +517,7 @@ void MimeTypeSettingsPrivate::updateMimeDatabase()
m_modifiedMimeTypes.erase(std::unique(m_modifiedMimeTypes.begin(), m_modifiedMimeTypes.end()),
m_modifiedMimeTypes.end());
MimeDatabase *db = ICore::instance()->mimeDatabase();
MimeDatabase *db = ICore::mimeDatabase();
QList<MimeType> allModified;
foreach (int index, m_modifiedMimeTypes) {
const MimeType &mimeType = m_model->m_mimeTypes.at(index);
@@ -615,7 +614,7 @@ void MimeTypeSettings::finish()
{
if (d->m_persist) {
if (d->m_reset)
ICore::instance()->mimeDatabase()->clearUserModifiedMimeTypes();
ICore::mimeDatabase()->clearUserModifiedMimeTypes();
else
d->updateMimeDatabase();
}

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

@@ -315,7 +315,7 @@ void ModeManager::currentTabChanged(int index)
// FIXME: This hardcoded context update is required for the Debug and Edit modes, since
// they use the editor widget, which is already a context widget so the main window won't
// go further up the parent tree to find the mode context.
ICore::instance()->updateAdditionalContexts(d->m_addedContexts, mode->context());
ICore::updateAdditionalContexts(d->m_addedContexts, mode->context());
d->m_addedContexts = mode->context();
IMode *oldMode = 0;

3
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -187,8 +187,7 @@ NavigationWidget *NavigationWidget::instance()
void NavigationWidget::setFactories(const QList<INavigationWidgetFactory *> factories)
{
ICore *core = ICore::instance();
ActionManager *am = core->actionManager();
ActionManager *am = ICore::actionManager();
Context navicontext(Core::Constants::C_NAVIGATION_PANE);
foreach (INavigationWidgetFactory *factory, factories) {

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

@@ -194,7 +194,7 @@ static inline int paneShortCut(int number)
void OutputPaneManager::init()
{
ActionManager *am = Core::ICore::instance()->actionManager();
ActionManager *am = Core::ICore::actionManager();
ActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW);
const Context globalcontext(Core::Constants::C_GLOBAL);

8
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -63,12 +63,10 @@ OutputWindow::OutputWindow(Core::Context context, QWidget *parent)
setFrameShape(QFrame::NoFrame);
setMouseTracking(true);
Core::ICore *core = Core::ICore::instance();
m_outputWindowContext = new Core::IContext;
m_outputWindowContext->setContext(context);
m_outputWindowContext->setWidget(this);
core->addContextObject(m_outputWindowContext);
ICore::addContextObject(m_outputWindowContext);
QAction *undoAction = new QAction(this);
QAction *redoAction = new QAction(this);
@@ -77,7 +75,7 @@ OutputWindow::OutputWindow(Core::Context context, QWidget *parent)
QAction *pasteAction = new QAction(this);
QAction *selectAllAction = new QAction(this);
Core::ActionManager *am = core->actionManager();
Core::ActionManager *am = ICore::actionManager();
am->registerAction(undoAction, Core::Constants::UNDO, context);
am->registerAction(redoAction, Core::Constants::REDO, context);
am->registerAction(cutAction, Core::Constants::CUT, context);
@@ -105,7 +103,7 @@ OutputWindow::OutputWindow(Core::Context context, QWidget *parent)
OutputWindow::~OutputWindow()
{
Core::ICore::instance()->removeContextObject(m_outputWindowContext);
Core::ICore::removeContextObject(m_outputWindowContext);
delete m_outputWindowContext;
}

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

@@ -146,7 +146,7 @@ using namespace Core::Internal;
// We are already running in a different thread here
QFutureInterface<void> *progressObject = new QFutureInterface<void>;
progressObject->setProgressRange(0, MAX);
Core::ICore::instance()->progressManager()->addTask(
Core::ICore::progressManager()->addTask(
progressObject->future(),
tr("DoIt"), MYTASKTYPE);
progressObject->reportStarted();
@@ -250,8 +250,7 @@ ProgressManagerPrivate::ProgressManagerPrivate(QObject *parent)
m_applicationTask(0)
{
m_progressView = new ProgressView;
ICore *core = ICore::instance();
connect(core, SIGNAL(coreAboutToClose()), this, SLOT(cancelAllRunningTasks()));
connect(ICore::instance(), SIGNAL(coreAboutToClose()), this, SLOT(cancelAllRunningTasks()));
}
ProgressManagerPrivate::~ProgressManagerPrivate()

6
src/plugins/coreplugin/progressmanager/progressmanager_win.cpp
View File

@@ -117,7 +117,7 @@ void Core::Internal::ProgressManagerPrivate::setApplicationLabel(const QString &
if (!pITask)
return;
const HWND winId = hwndOfWidget(Core::ICore::instance()->mainWindow());
const HWND winId = hwndOfWidget(Core::ICore::mainWindow());
if (text.isEmpty()) {
pITask->SetOverlayIcon(winId, NULL, NULL);
} else {
@@ -145,7 +145,7 @@ void Core::Internal::ProgressManagerPrivate::setApplicationProgressRange(int min
void Core::Internal::ProgressManagerPrivate::setApplicationProgressValue(int value)
{
if (pITask) {
const HWND winId = hwndOfWidget(Core::ICore::instance()->mainWindow());
const HWND winId = hwndOfWidget(Core::ICore::mainWindow());
pITask->SetProgressValue(winId, value, total);
}
}
@@ -155,7 +155,7 @@ void Core::Internal::ProgressManagerPrivate::setApplicationProgressVisible(bool
if (!pITask)
return;
const HWND winId = hwndOfWidget(Core::ICore::instance()->mainWindow());
const HWND winId = hwndOfWidget(Core::ICore::mainWindow());
if (visible)
pITask->SetProgressState(winId, TBPF_NORMAL);
else

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

@@ -108,12 +108,12 @@ QWidget *ToolSettings::createPage(QWidget *parent)
static QString getUserFilePath(const QString &proposalFileName)
{
static bool seeded = false;
QDir resourceDir(ICore::instance()->userResourcePath());
QDir resourceDir(ICore::userResourcePath());
if (!resourceDir.exists(QLatin1String("externaltools")))
resourceDir.mkpath(QLatin1String("externaltools"));
QFileInfo fi(proposalFileName);
const QString &suffix = QLatin1String(".") + fi.completeSuffix();
const QString &newFilePath = ICore::instance()->userResourcePath()
const QString &newFilePath = ICore::userResourcePath()
+ QLatin1String("/externaltools/") + fi.baseName();
int count = 0;
QString tryPath = newFilePath + suffix;

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

@@ -179,7 +179,7 @@ VcsManager::~VcsManager()
void VcsManager::extensionsInitialized()
{
// Change signal connections
FileManager *fileManager = ICore::instance()->fileManager();
FileManager *fileManager = ICore::fileManager();
foreach (IVersionControl *versionControl, allVersionControls()) {
connect(versionControl, SIGNAL(filesChanged(QStringList)),
fileManager, SIGNAL(filesChangedInternally(QStringList)));