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
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ bool %PluginName%Plugin::initialize(const QStringList &arguments, QString *error
Q_UNUSED(arguments)
Q_UNUSED(errorString)
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
QAction *action = new QAction(tr("%PluginName% action"), this);
Core::Command *cmd = am->registerAction(action, Constants::ACTION_ID,
@@ -72,7 +72,7 @@ ExtensionSystem::IPlugin::ShutdownFlag %PluginName%Plugin::aboutToShutdown()
void %PluginName%Plugin::triggerAction()
{
QMessageBox::information(Core::ICore::instance()->mainWindow(),
QMessageBox::information(Core::ICore::mainWindow(),
tr("Action triggered"),
tr("This is an action from %PluginName%."));
}
src/plugins/analyzerbase/analyzermanager.cpp
+11 -12
View File
@@ -261,8 +261,7 @@ AnalyzerManagerPrivate::~AnalyzerManagerPrivate()
void AnalyzerManagerPrivate::setupActions()
{
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
const Core::Context globalcontext(Core::Constants::C_GLOBAL);
Core::Command *command = 0;
@@ -340,7 +339,7 @@ void AnalyzerManagerPrivate::delayedInit()
// Populate Windows->Views menu with standard actions.
Core::Context analyzerContext(Constants::C_ANALYZEMODE);
ActionManager *am = ICore::instance()->actionManager();
ActionManager *am = ICore::actionManager();
ActionContainer *viewsMenu =
am->actionContainer(Core::Id(Core::Constants::M_WINDOW_VIEWS));
Command *cmd = am->registerAction(m_mainWindow->menuSeparator1(),
@@ -435,7 +434,7 @@ void AnalyzerManagerPrivate::activateDock(Qt::DockWidgetArea area, QDockWidget *
Context globalContext(Core::Constants::C_GLOBAL);
ActionManager *am = ICore::instance()->actionManager();
ActionManager *am = ICore::actionManager();
QAction *toggleViewAction = dockWidget->toggleViewAction();
toggleViewAction->setText(dockWidget->windowTitle());
Command *cmd = am->registerAction(toggleViewAction,
@@ -449,7 +448,7 @@ void AnalyzerManagerPrivate::activateDock(Qt::DockWidgetArea area, QDockWidget *
void AnalyzerManagerPrivate::deactivateDock(QDockWidget *dockWidget)
{
ActionManager *am = ICore::instance()->actionManager();
ActionManager *am = ICore::actionManager();
QAction *toggleViewAction = dockWidget->toggleViewAction();
am->unregisterAction(toggleViewAction, Core::Id("Analyzer." + dockWidget->objectName()));
m_mainWindow->removeDockWidget(dockWidget);
@@ -477,7 +476,7 @@ bool buildTypeAccepted(IAnalyzerTool::ToolMode toolMode,
bool AnalyzerManagerPrivate::showPromptDialog(const QString &title, const QString &text,
const QString &stopButtonText, const QString &cancelButtonText) const
{
Utils::CheckableMessageBox messageBox(Core::ICore::instance()->mainWindow());
Utils::CheckableMessageBox messageBox(Core::ICore::mainWindow());
messageBox.setWindowTitle(title);
messageBox.setText(text);
messageBox.setStandardButtons(QDialogButtonBox::Yes|QDialogButtonBox::Cancel);
@@ -523,7 +522,7 @@ void AnalyzerManagerPrivate::startLocalTool(IAnalyzerTool *tool)
const QString currentMode =
buildType == BuildConfiguration::Debug ? tr("Debug") : tr("Release");
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
const QString configKey = QLatin1String("Analyzer.AnalyzeCorrectMode");
int ret;
if (settings->contains(configKey)) {
@@ -547,7 +546,7 @@ void AnalyzerManagerPrivate::startLocalTool(IAnalyzerTool *tool)
const QString checkBoxText = tr("&Do not ask again");
bool checkBoxSetting = false;
const QDialogButtonBox::StandardButton button =
Utils::CheckableMessageBox::question(Core::ICore::instance()->mainWindow(),
Utils::CheckableMessageBox::question(Core::ICore::mainWindow(),
title, message, checkBoxText,
&checkBoxSetting, QDialogButtonBox::Yes|QDialogButtonBox::Cancel,
QDialogButtonBox::Cancel);
@@ -605,7 +604,7 @@ QAction *AnalyzerManagerPrivate::actionFromToolAndMode(IAnalyzerTool *tool, Star
void AnalyzerManagerPrivate::selectSavedTool()
{
const QSettings *settings = Core::ICore::instance()->settings();
const QSettings *settings = Core::ICore::settings();
const Core::Id lastActiveAction(settings->value(QLatin1String(LAST_ACTIVE_TOOL)).toString());
foreach (QAction *action, m_actions) {
IAnalyzerTool *tool = m_toolFromAction.value(action);
@@ -688,7 +687,7 @@ void AnalyzerManagerPrivate::addTool(IAnalyzerTool *tool, const StartModes &mode
delayedInit(); // Make sure that there is a valid IMode instance.
const bool blocked = m_toolBox->blockSignals(true); // Do not make current.
ActionManager *am = Core::ICore::instance()->actionManager();
ActionManager *am = Core::ICore::actionManager();
foreach (StartMode mode, modes) {
QString actionName = tool->actionName(mode);
Id menuGroup = tool->menuGroup(mode);
@@ -725,7 +724,7 @@ void AnalyzerManagerPrivate::handleToolFinished()
void AnalyzerManagerPrivate::loadToolSettings(IAnalyzerTool *tool)
{
QTC_ASSERT(m_mainWindow, return);
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String("AnalyzerViewSettings_") + tool->id().toString());
if (settings->value("ToolSettingsSaved", false).toBool())
m_mainWindow->restoreSettings(settings);
@@ -740,7 +739,7 @@ void AnalyzerManagerPrivate::saveToolSettings(IAnalyzerTool *tool, StartMode mod
return; // no active tool, do nothing
QTC_ASSERT(m_mainWindow, return);
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String("AnalyzerViewSettings_") + tool->id().toString());
m_mainWindow->saveSettings(settings);
settings->setValue("ToolSettingsSaved", true);
src/plugins/analyzerbase/analyzersettings.cpp
+2 -2
View File
@@ -119,7 +119,7 @@ AnalyzerGlobalSettings::~AnalyzerGlobalSettings()
void AnalyzerGlobalSettings::readSettings()
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
QVariantMap map;
@@ -136,7 +136,7 @@ void AnalyzerGlobalSettings::readSettings()
void AnalyzerGlobalSettings::writeSettings() const
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String(groupC));
const QVariantMap map = toMap();
for (QVariantMap::ConstIterator it = map.begin(); it != map.end(); ++it)
src/plugins/analyzerbase/startremotedialog.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent)
m_ui->keyFile->setExpectedKind(Utils::PathChooser::File);
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup("AnalyzerStartRemoteDialog");
m_ui->host->setText(settings->value("host").toString());
m_ui->port->setValue(settings->value("port", 22).toInt());
@@ -91,7 +91,7 @@ StartRemoteDialog::~StartRemoteDialog()
void StartRemoteDialog::accept()
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup("AnalyzerStartRemoteDialog");
settings->setValue("host", m_ui->host->text());
settings->setValue("port", m_ui->port->value());
src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
+1 -2
View File
@@ -63,8 +63,7 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &arguments,
{
Q_UNUSED(arguments);
Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":autotoolsproject/AutotoolsProject.mimetypes.xml"), errorString))
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":autotoolsproject/AutotoolsProject.mimetypes.xml"), errorString))
return false;
addAutoReleasedObject(new AutotoolsTargetFactory);
src/plugins/bazaar/bazaarplugin.cpp
+5 -7
View File
@@ -124,7 +124,6 @@ BazaarPlugin::BazaarPlugin()
: VcsBase::VcsBasePlugin(QLatin1String(Constants::COMMIT_ID)),
m_optionsPage(0),
m_client(0),
m_core(0),
m_commandLocator(0),
m_changeLog(0),
m_addAction(0),
@@ -156,12 +155,11 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
m_client = new BazaarClient(&m_bazaarSettings);
initializeVcs(new BazaarControl(m_client));
m_core = Core::ICore::instance();
m_actionManager = m_core->actionManager();
m_actionManager = Core::ICore::actionManager();
m_optionsPage = new OptionsPage();
addAutoReleasedObject(m_optionsPage);
m_bazaarSettings.readSettings(m_core->settings());
m_bazaarSettings.readSettings(Core::ICore::settings());
connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
@@ -571,7 +569,7 @@ void BazaarPlugin::showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusIt
return;
}
Core::IEditor *editor = m_core->editorManager()->openEditor(m_changeLog->fileName(),
Core::IEditor *editor = Core::ICore::editorManager()->openEditor(m_changeLog->fileName(),
Constants::COMMIT_ID,
Core::EditorManager::ModeSwitch);
if (!editor) {
@@ -612,7 +610,7 @@ void BazaarPlugin::commitFromEditor()
return;
//use the same functionality than if the user closes the file without completing the commit
m_core->editorManager()->closeEditors(m_core->editorManager()->editorsForFileName(m_changeLog->fileName()));
Core::ICore::editorManager()->closeEditors(Core::ICore::editorManager()->editorsForFileName(m_changeLog->fileName()));
}
bool BazaarPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor)
@@ -643,7 +641,7 @@ bool BazaarPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submit
QStringList files = commitEditor->checkedFiles();
if (!files.empty()) {
//save the commit message
if (!m_core->fileManager()->saveFile(editorFile))
if (!Core::ICore::fileManager()->saveFile(editorFile))
return false;
//rewrite entries of the form 'file => newfile' to 'newfile' because
src/plugins/bazaar/bazaarplugin.h
-2
View File
@@ -52,7 +52,6 @@ QT_END_NAMESPACE
namespace Core {
class ActionManager;
class ActionContainer;
class ICore;
class Id;
class IVersionControl;
class IEditorFactory;
@@ -138,7 +137,6 @@ private:
OptionsPage *m_optionsPage;
BazaarClient *m_client;
Core::ICore *m_core;
Locator::CommandLocator *m_commandLocator;
Core::ActionManager *m_actionManager;
Core::ActionContainer *m_bazaarContainer;
src/plugins/bazaar/optionspage.cpp
+1 -1
View File
@@ -126,7 +126,7 @@ void OptionsPage::apply()
if (newSettings != plugin->settings()) {
//assume success and emit signal that settings are changed;
plugin->setSettings(newSettings);
newSettings.writeSettings(Core::ICore::instance()->settings());
newSettings.writeSettings(Core::ICore::settings());
emit settingsChanged();
}
}
src/plugins/bineditor/bineditorplugin.cpp
+4 -5
View File
@@ -245,7 +245,7 @@ public:
if (errorString)
*errorString = errStr;
else
QMessageBox::critical(Core::ICore::instance()->mainWindow(), tr("File Error"), errStr);
QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), errStr);
return false;
}
@@ -264,7 +264,7 @@ private slots:
m_editor->addData(block, data);
file.close();
} else {
QMessageBox::critical(Core::ICore::instance()->mainWindow(), tr("File Error"),
QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"),
tr("Cannot open %1: %2").arg(
QDir::toNativeSeparators(m_fileName), file.errorString()));
}
@@ -477,7 +477,7 @@ BinEditorPlugin::~BinEditorPlugin()
QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title)
{
QAction *result = new QAction(title, this);
Core::ICore::instance()->actionManager()->registerAction(result, Core::Id(id), m_context);
Core::ICore::actionManager()->registerAction(result, Core::Id(id), m_context);
return result;
}
@@ -535,8 +535,7 @@ bool BinEditorPlugin::initialize(const QStringList &arguments, QString *errorMes
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
Core::ICore *core = Core::ICore::instance();
connect(core, SIGNAL(contextAboutToChange(Core::IContext *)),
connect(Core::ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext *)),
this, SLOT(updateCurrentEditor(Core::IContext *)));
addAutoReleasedObject(new BinEditorFactory(this));
src/plugins/bookmarks/bookmarkmanager.cpp
+2 -2
View File
@@ -215,7 +215,7 @@ BookmarkView::BookmarkView(QWidget *parent) :
connect(this, SIGNAL(clicked(const QModelIndex &)),
this, SLOT(gotoBookmark(const QModelIndex &)));
ICore::instance()->addContextObject(m_bookmarkContext);
ICore::addContextObject(m_bookmarkContext);
setItemDelegate(new BookmarkDelegate(this));
setFrameStyle(QFrame::NoFrame);
@@ -225,7 +225,7 @@ BookmarkView::BookmarkView(QWidget *parent) :
BookmarkView::~BookmarkView()
{
ICore::instance()->removeContextObject(m_bookmarkContext);
ICore::removeContextObject(m_bookmarkContext);
}
void BookmarkView::contextMenuEvent(QContextMenuEvent *event)
src/plugins/bookmarks/bookmarksplugin.cpp
+2 -3
View File
@@ -70,8 +70,7 @@ void BookmarksPlugin::extensionsInitialized()
bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
{
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::Context textcontext(TextEditor::Constants::C_TEXTEDITOR);
Core::Context globalcontext(Core::Constants::C_GLOBAL);
@@ -148,7 +147,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
this, SLOT(bookmarkMarginActionTriggered()));
// EditorManager
QObject *editorManager = core->editorManager();
QObject *editorManager = Core::ICore::editorManager();
connect(editorManager, SIGNAL(editorAboutToClose(Core::IEditor*)),
this, SLOT(editorAboutToClose(Core::IEditor*)));
connect(editorManager, SIGNAL(editorOpened(Core::IEditor*)),
src/plugins/classview/classviewmanager.cpp
+2 -4
View File
@@ -150,12 +150,10 @@ void Manager::initialize()
connect(sessionManager, SIGNAL(projectRemoved(ProjectExplorer::Project*)),
SLOT(onProjectListChanged()), Qt::QueuedConnection);
Core::ICore *core = Core::ICore::instance();
// connect to the progress manager for signals about Parsing tasks
connect(core->progressManager(), SIGNAL(taskStarted(QString)),
connect(Core::ICore::progressManager(), SIGNAL(taskStarted(QString)),
SLOT(onTaskStarted(QString)), Qt::QueuedConnection);
connect(core->progressManager(), SIGNAL(allTasksFinished(QString)),
connect(Core::ICore::progressManager(), SIGNAL(allTasksFinished(QString)),
SLOT(onAllTasksFinished(QString)), Qt::QueuedConnection);
// when we signals that really document is updated - sent it to the parser
src/plugins/classview/classviewnavigationwidgetfactory.cpp
+2 -2
View File
@@ -111,7 +111,7 @@ void NavigationWidgetFactory::saveSettings(int position, QWidget *widget)
NavigationWidget *pw = qobject_cast<NavigationWidget *>(widget);
QTC_ASSERT(pw, return);
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
QTC_ASSERT(settings, return);
// .beginGroup is not used - to prevent simultaneous access
@@ -126,7 +126,7 @@ void NavigationWidgetFactory::restoreSettings(int position, QWidget *widget)
NavigationWidget *pw = qobject_cast<NavigationWidget *>(widget);
QTC_ASSERT(pw, return);
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
QTC_ASSERT(settings, return);
// .beginGroup is not used - to prevent simultaneous access
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+3 -4
View File
@@ -67,7 +67,7 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage)
connect(projectExplorer, SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)),
this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)));
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::ActionContainer *mbuild =
am->actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);
@@ -252,8 +252,7 @@ CMakeSettingsPage::CMakeSettingsPage()
m_pathCmake.process = 0;
m_userCmake.hasCodeBlocksMsvcGenerator = false;
m_pathCmake.hasCodeBlocksMsvcGenerator = false;
Core::ICore *core = Core::ICore::instance();
QSettings * settings = core->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String("CMakeSettings"));
m_userCmake.executable = settings->value(QLatin1String("cmakeExecutable")).toString();
settings->endGroup();
@@ -404,7 +403,7 @@ void CMakeSettingsPage::updateInfo(CMakeValidator *cmakeValidator)
void CMakeSettingsPage::saveSettings() const
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String("CMakeSettings"));
settings->setValue(QLatin1String("cmakeExecutable"), m_userCmake.executable);
settings->endGroup();
src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+1 -2
View File
@@ -59,8 +59,7 @@ CMakeProjectPlugin::~CMakeProjectPlugin()
bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProject.mimetypes.xml"), errorMessage))
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProject.mimetypes.xml"), errorMessage))
return false;
CMakeSettingsPage *cmp = new CMakeSettingsPage();
addAutoReleasedObject(cmp);
src/plugins/coreplugin/actionmanager/actionmanager.cpp
+3 -3
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);
src/plugins/coreplugin/basefilewizard.cpp
+1 -1
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());
src/plugins/coreplugin/designmode.cpp
+3 -3
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;
}
src/plugins/coreplugin/dialogs/settingsdialog.cpp
+2 -2
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);
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+2 -2
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);
src/plugins/coreplugin/editormanager/editormanager.cpp
+51 -54
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;
src/plugins/coreplugin/editormanager/editormanager.h
+1 -2
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();
src/plugins/coreplugin/editormanager/editorview.cpp
+10 -10
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;
src/plugins/coreplugin/editortoolbar.cpp
+6 -6
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()
src/plugins/coreplugin/externaltool.cpp
+15 -15
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));
}
src/plugins/coreplugin/externaltool.h
-1
View File
@@ -44,7 +44,6 @@ namespace Utils {
class QtcProcess;
}
namespace Core {
class ActionContainer;
namespace Internal {
class ExternalTool : public QObject
src/plugins/coreplugin/externaltoolmanager.h
+1 -3
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;
src/plugins/coreplugin/filemanager.cpp
+9 -11
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);
}
src/plugins/coreplugin/fileutils.cpp
+4 -4
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);
src/plugins/coreplugin/generalsettings.cpp
+7 -7
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())
src/plugins/coreplugin/helpmanager.cpp
+2 -2
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;
src/plugins/coreplugin/icore.cpp
+1
View File
@@ -379,6 +379,7 @@ ICore::ICore(MainWindow *mainwindow)
ICore::~ICore()
{
m_instance = 0;
m_mainwindow = 0;
}
void ICore::showNewItemDialog(const QString &title,
src/plugins/coreplugin/icore.h
+3
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,
src/plugins/coreplugin/mainwindow.cpp
+3 -3
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*)),
src/plugins/coreplugin/mimedatabase.cpp
+1 -1
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/");
}
/*!
src/plugins/coreplugin/mimetypesettings.cpp
+8 -9
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();
}
src/plugins/coreplugin/modemanager.cpp
+1 -1
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;
src/plugins/coreplugin/navigationwidget.cpp
+1 -2
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) {
src/plugins/coreplugin/outputpanemanager.cpp
+1 -1
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);
src/plugins/coreplugin/outputwindow.cpp
+3 -5
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;
}
src/plugins/coreplugin/progressmanager/progressmanager.cpp
+2 -3
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()
src/plugins/coreplugin/progressmanager/progressmanager_win.cpp
+3 -3
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
src/plugins/coreplugin/toolsettings.cpp
+2 -2
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;
src/plugins/coreplugin/vcsmanager.cpp
+1 -1
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)));
src/plugins/cpaster/codepasterprotocol.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ void CodePasterProtocol::fetchFinished()
void CodePasterProtocol::listFinished()
{
if (m_listReply->error()) {
Core::ICore::instance()->messageManager()->printToOutputPane(m_listReply->errorString(), true);
Core::ICore::messageManager()->printToOutputPane(m_listReply->errorString(), true);
} else {
const QByteArray data = m_listReply->readAll();
const QStringList lines = QString::fromAscii(data).split(QLatin1Char('\n'));
src/plugins/cpaster/codepastersettings.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ namespace CodePaster {
CodePasterSettingsPage::CodePasterSettingsPage()
{
m_settings = Core::ICore::instance()->settings();
m_settings = Core::ICore::settings();
if (m_settings) {
const QString keyRoot = QLatin1String(settingsGroupC) + QLatin1Char('/');
m_host = m_settings->value(keyRoot + QLatin1String(serverKeyC), QString()).toString();
src/plugins/cpaster/cpasterplugin.cpp
+8 -9
View File
@@ -129,7 +129,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
Core::Context globalcontext(Core::Constants::C_GLOBAL);
// Create the settings Page
m_settings->fromSettings(Core::ICore::instance()->settings());
m_settings->fromSettings(Core::ICore::settings());
SettingsPage *settingsPage = new SettingsPage(m_settings);
addAutoReleasedObject(settingsPage);
@@ -153,7 +153,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
}
//register actions
Core::ActionManager *actionManager = ICore::instance()->actionManager();
Core::ActionManager *actionManager = ICore::actionManager();
Core::ActionContainer *toolsContainer =
actionManager->actionContainer(Core::Constants::M_TOOLS);
@@ -264,13 +264,13 @@ void CodepasterPlugin::post(QString data, const QString &mimeType)
if (dialogResult == QDialog::Accepted
&& m_settings->protocol != view.protocol()) {
m_settings->protocol = view.protocol();
m_settings->toSettings(Core::ICore::instance()->settings());
m_settings->toSettings(Core::ICore::settings());
}
}
void CodepasterPlugin::fetch()
{
PasteSelectDialog dialog(m_protocols, ICore::instance()->mainWindow());
PasteSelectDialog dialog(m_protocols, ICore::mainWindow());
dialog.setProtocol(m_settings->protocol);
if (dialog.exec() != QDialog::Accepted)
@@ -278,7 +278,7 @@ void CodepasterPlugin::fetch()
// Save new protocol in case user changed it.
if (m_settings->protocol != dialog.protocol()) {
m_settings->protocol = dialog.protocol();
m_settings->toSettings(Core::ICore::instance()->settings());
m_settings->toSettings(Core::ICore::settings());
}
const QString pasteID = dialog.pasteId();
@@ -293,8 +293,7 @@ void CodepasterPlugin::finishPost(const QString &link)
{
if (m_settings->copyToClipboard)
QApplication::clipboard()->setText(link);
ICore::instance()->messageManager()->printToOutputPane(link,
m_settings->displayOutput);
ICore::messageManager()->printToOutputPane(link, m_settings->displayOutput);
}
// Extract the characters that can be used for a file name from a title
@@ -334,7 +333,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
const QString &content,
bool error)
{
Core::MessageManager *messageManager = ICore::instance()->messageManager();
Core::MessageManager *messageManager = ICore::messageManager();
// Failure?
if (error) {
messageManager->printToOutputPane(content, true);
@@ -351,7 +350,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
// Default to "txt".
QByteArray byteContent = content.toUtf8();
QString suffix;
if (const Core::MimeType mimeType = Core::ICore::instance()->mimeDatabase()->findByData(byteContent))
if (const Core::MimeType mimeType = Core::ICore::mimeDatabase()->findByData(byteContent))
suffix = mimeType.preferredSuffix();
if (suffix.isEmpty())
suffix = QLatin1String("txt");
src/plugins/cpaster/fileshareprotocol.cpp
+3 -3
View File
@@ -62,7 +62,7 @@ FileShareProtocol::FileShareProtocol() :
m_settings(new FileShareProtocolSettings),
m_settingsPage(new FileShareProtocolSettingsPage(m_settings))
{
m_settings->fromSettings(Core::ICore::instance()->settings());
m_settings->fromSettings(Core::ICore::settings());
}
FileShareProtocol::~FileShareProtocol()
@@ -214,11 +214,11 @@ void FileShareProtocol::paste(const QString &text,
saver.setResult(&writer);
}
if (!saver.finalize()) {
Core::ICore::instance()->messageManager()->printToOutputPanePopup(saver.errorString());
Core::ICore::messageManager()->printToOutputPanePopup(saver.errorString());
return;
}
const QString msg = tr("Pasted: %1").arg(saver.fileName());
Core::ICore::instance()->messageManager()->printToOutputPanePopup(msg);
Core::ICore::messageManager()->printToOutputPanePopup(msg);
}
} // namespace CodePaster
src/plugins/cpaster/fileshareprotocolsettingspage.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ void FileShareProtocolSettingsPage::apply()
const FileShareProtocolSettings newSettings = m_widget->settings();
if (newSettings != *m_settings) {
*m_settings = newSettings;
m_settings->toSettings(Core::ICore::instance()->settings());
m_settings->toSettings(Core::ICore::settings());
}
}
} // namespace CodePaster
src/plugins/cpaster/pastebindotcomsettings.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ static const char prefixKeyC[] = "Prefix";
namespace CodePaster {
PasteBinDotComSettings::PasteBinDotComSettings()
{
m_settings = Core::ICore::instance()->settings();
m_settings = Core::ICore::settings();
if (m_settings) {
const QString rootKey = QLatin1String(groupC) + QLatin1Char('/');
m_hostPrefix = m_settings->value(rootKey + QLatin1String(prefixKeyC), QString()).toString();
src/plugins/cpaster/pasteview.cpp
+2 -2
View File
@@ -137,7 +137,7 @@ int PasteView::showDialog()
m_ui.uiDescription->selectAll();
// (Re)store dialog size
const QSettings *settings = Core::ICore::instance()->settings();
const QSettings *settings = Core::ICore::settings();
const QString rootKey = QLatin1String(groupC) + QLatin1Char('/');
const int h = settings->value(rootKey + QLatin1String(heightKeyC), height()).toInt();
const int defaultWidth = m_ui.uiPatchView->columnIndicator() + 50;
@@ -198,7 +198,7 @@ void PasteView::accept()
const Protocol::ContentType ct = Protocol::contentType(m_mimeType);
protocol->paste(data, ct, user(), comment(), description());
// Store settings and close
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String(groupC));
settings->setValue(QLatin1String(heightKeyC), height());
settings->setValue(QLatin1String(widthKeyC), width());
src/plugins/cpaster/protocol.cpp
+3 -3
View File
@@ -150,7 +150,7 @@ bool Protocol::showConfigurationError(const Protocol *p,
showConfig = false;
if (!parent)
parent = Core::ICore::instance()->mainWindow();
parent = Core::ICore::mainWindow();
const QString title = tr("%1 - Configuration Error").arg(p->name());
QMessageBox mb(QMessageBox::Warning, title, message, QMessageBox::Cancel, parent);
QPushButton *settingsButton = 0;
@@ -159,7 +159,7 @@ bool Protocol::showConfigurationError(const Protocol *p,
mb.exec();
bool rc = false;
if (mb.clickedButton() == settingsButton)
rc = Core::ICore::instance()->showOptionsDialog(p->settingsPage()->category(),
rc = Core::ICore::showOptionsDialog(p->settingsPage()->category(),
p->settingsPage()->id(),
parent);
return rc;
@@ -224,7 +224,7 @@ bool NetworkProtocol::httpStatus(QString url, QString *errorMessage)
tr("Checking connection"),
tr("Connecting to %1...").arg(url),
QMessageBox::Cancel,
Core::ICore::instance()->mainWindow());
Core::ICore::mainWindow());
connect(reply.data(), SIGNAL(finished()), &box, SLOT(close()));
QApplication::setOverrideCursor(Qt::WaitCursor);
box.exec();
src/plugins/cpaster/settingspage.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ void SettingsPage::apply()
const Settings newSettings = m_widget->settings();
if (newSettings != *m_settings) {
*m_settings = newSettings;
m_settings->toSettings(Core::ICore::instance()->settings());
m_settings->toSettings(Core::ICore::settings());
}
}
src/plugins/cppeditor/cppclasswizard.cpp
+4 -5
View File
@@ -91,23 +91,22 @@ ClassNamePage::ClassNamePage(QWidget *parent) :
}
// Retrieve settings of CppTools plugin.
static inline bool lowerCaseFiles(const Core::ICore *core)
static bool lowerCaseFiles()
{
QString lowerCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP);
lowerCaseSettingsKey += QLatin1Char('/');
lowerCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY);
const bool lowerCaseDefault = CppTools::Constants::lowerCaseFilesDefault;
return core->settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
return Core::ICore::settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
}
// Set up new class widget from settings
void ClassNamePage::initParameters()
{
Core::ICore *core = Core::ICore::instance();
const Core::MimeDatabase *mdb = core->mimeDatabase();
const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
m_newClassWidget->setHeaderExtension(mdb->preferredSuffixByType(QLatin1String(Constants::CPP_HEADER_MIMETYPE)));
m_newClassWidget->setSourceExtension(mdb->preferredSuffixByType(QLatin1String(Constants::CPP_SOURCE_MIMETYPE)));
m_newClassWidget->setLowerCaseFiles(lowerCaseFiles(core));
m_newClassWidget->setLowerCaseFiles(lowerCaseFiles());
}
void ClassNamePage::slotValidChanged()
src/plugins/cppeditor/cppeditor.cpp
+3 -3
View File
@@ -149,7 +149,7 @@ public:
void adjustWidth()
{
const int w = Core::ICore::instance()->mainWindow()->geometry().width();
const int w = Core::ICore::mainWindow()->geometry().width();
setMaximumWidth(w);
setMinimumWidth(qMin(qMax(sizeHintForColumn(0), minimumSizeHint().width()), w));
}
@@ -1536,7 +1536,7 @@ void CPPEditorWidget::contextMenuEvent(QContextMenuEvent *e)
QMenu *menu = new QMenu;
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::ActionContainer *mcontext = am->actionContainer(Constants::M_CONTEXT);
QMenu *contextMenu = mcontext->menu();
@@ -1684,7 +1684,7 @@ Core::Id CPPEditor::id() const
bool CPPEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
{
bool b = TextEditor::BaseTextEditor::open(errorString, fileName, realFileName);
editorWidget()->setMimeType(Core::ICore::instance()->mimeDatabase()->findByFile(QFileInfo(fileName)).type());
editorWidget()->setMimeType(Core::ICore::mimeDatabase()->findByFile(QFileInfo(fileName)).type());
return b;
}
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+1 -1
View File
@@ -368,7 +368,7 @@ void FunctionDeclDefLink::showMarker(CPPEditorWidget *editor)
else
message = tr("Apply changes to declaration");
Core::ActionManager *actionManager = Core::ICore::instance()->actionManager();
Core::ActionManager *actionManager = Core::ICore::actionManager();
Core::Command *quickfixCommand = actionManager->command(TextEditor::Constants::QUICKFIX_THIS);
if (quickfixCommand)
message = Utils::ProxyAction::stringWithAppendedShortcut(message, quickfixCommand->keySequence());
src/plugins/cppeditor/cppplugin.cpp
+9 -10
View File
@@ -88,7 +88,7 @@ CppEditorFactory::CppEditorFactory(CppPlugin *owner) :
#if !defined(Q_WS_MAC) && !defined(Q_WS_WIN)
Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
Core::MimeDatabase *mimeDatabase = Core::ICore::instance()->mimeDatabase();
Core::MimeDatabase *mimeDatabase = Core::ICore::mimeDatabase();
iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_cpp.png")),
mimeDatabase->findByType(QLatin1String(CppEditor::Constants::CPP_SOURCE_MIMETYPE)));
iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_c.png")),
@@ -195,9 +195,7 @@ CppQuickFixAssistProvider *CppPlugin::quickFixProvider() const
bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/cppeditor/CppEditor.mimetypes.xml"), errorMessage))
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/cppeditor/CppEditor.mimetypes.xml"), errorMessage))
return false;
addAutoReleasedObject(new CppEditorFactory(this));
@@ -210,6 +208,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
addAutoReleasedObject(m_quickFixProvider);
registerQuickFixes(this);
QObject *core = Core::ICore::instance();
CppFileWizard::BaseFileWizardParameters wizardParameters(Core::IWizard::FileWizard);
wizardParameters.setCategory(QLatin1String(Constants::WIZARD_CATEGORY));
@@ -234,7 +233,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
Core::Context context(CppEditor::Constants::C_CPPEDITOR);
Core::ActionManager *am = core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::ActionContainer *contextMenu= am->createMenu(CppEditor::Constants::M_CONTEXT);
Core::Command *cmd;
@@ -317,12 +316,12 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
cmd = am->command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd);
connect(core->progressManager(), SIGNAL(taskStarted(QString)),
connect(Core::ICore::progressManager(), SIGNAL(taskStarted(QString)),
this, SLOT(onTaskStarted(QString)));
connect(core->progressManager(), SIGNAL(allTasksFinished(QString)),
connect(Core::ICore::progressManager(), SIGNAL(allTasksFinished(QString)),
this, SLOT(onAllTasksFinished(QString)));
connect(core->editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)), SLOT(currentEditorChanged(Core::IEditor*)));
connect(Core::ICore::editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)), SLOT(currentEditorChanged(Core::IEditor*)));
readSettings();
return true;
@@ -330,12 +329,12 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
void CppPlugin::readSettings()
{
m_sortedOutline = Core::ICore::instance()->settings()->value(QLatin1String("CppTools/SortedMethodOverview"), false).toBool();
m_sortedOutline = Core::ICore::settings()->value(QLatin1String("CppTools/SortedMethodOverview"), false).toBool();
}
void CppPlugin::writeSettings()
{
Core::ICore::instance()->settings()->setValue(QLatin1String("CppTools/SortedMethodOverview"), m_sortedOutline);
Core::ICore::settings()->setValue(QLatin1String("CppTools/SortedMethodOverview"), m_sortedOutline);
}
void CppPlugin::extensionsInitialized()
src/plugins/cpptools/completionsettingspage.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ CompletionSettingsPage::CompletionSettingsPage(QObject *parent)
: TextEditor::TextEditorOptionsPage(parent)
, m_page(0)
{
if (QSettings *s = Core::ICore::instance()->settings())
if (QSettings *s = Core::ICore::settings())
m_commentsSettings.fromSettings(QLatin1String(CPPTOOLS_SETTINGSGROUP), s);
}
@@ -151,7 +151,7 @@ void CompletionSettingsPage::apply()
m_commentsSettings.m_enableDoxygen = m_page->enableDoxygenCheckBox->isChecked();
m_commentsSettings.m_generateBrief = m_page->generateBriefCheckBox->isChecked();
m_commentsSettings.m_leadingAsterisks = m_page->leadingAsterisksCheckBox->isChecked();
if (QSettings *s = Core::ICore::instance()->settings())
if (QSettings *s = Core::ICore::settings())
m_commentsSettings.toSettings(QLatin1String(CPPTOOLS_SETTINGSGROUP), s);
emit commentsSettingsChanged(m_commentsSettings);
src/plugins/cpptools/cppcodestylesettingspage.cpp
+1 -1
View File
@@ -535,7 +535,7 @@ QWidget *CppCodeStyleSettingsPage::createPage(QWidget *parent)
void CppCodeStyleSettingsPage::apply()
{
if (m_widget) {
QSettings *s = Core::ICore::instance()->settings();
QSettings *s = Core::ICore::settings();
CppCodeStylePreferences *originalCppCodeStylePreferences = CppToolsSettings::instance()->cppCodeStyle();
if (originalCppCodeStylePreferences->codeStyleSettings() != m_pageCppCodeStylePreferences->codeStyleSettings()) {
src/plugins/cpptools/cppcompletionassist.cpp
+2 -2
View File
@@ -1174,7 +1174,7 @@ bool CppCompletionAssistProcessor::completeInclude(const QTextCursor &cursor)
includePaths.append(currentFilePath);
const Core::MimeType mimeType =
Core::ICore::instance()->mimeDatabase()->findByType(QLatin1String("text/x-c++hdr"));
Core::ICore::mimeDatabase()->findByType(QLatin1String("text/x-c++hdr"));
const QStringList suffixes = mimeType.suffixes();
foreach (const QString &includePath, includePaths) {
@@ -1233,7 +1233,7 @@ bool CppCompletionAssistProcessor::objcKeywordsWanted() const
const Core::IFile *file = m_interface->file();
QString fileName = file->fileName();
const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
return mdb->findByFile(fileName).type() == CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE;
}
src/plugins/cpptools/cppfilesettingspage.cpp
+4 -4
View File
@@ -99,7 +99,7 @@ void CppFileSettings::fromSettings(QSettings *s)
bool CppFileSettings::applySuffixesToMimeDB()
{
Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
return mdb->setPreferredSuffix(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE), sourceSuffix)
&& mdb->setPreferredSuffix(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE), headerSuffix);
}
@@ -202,7 +202,7 @@ static void parseLicenseTemplatePlaceholders(QString *t, const QString &file, co
QString CppFileSettings::licenseTemplate(const QString &fileName, const QString &className)
{
const QSettings *s = Core::ICore::instance()->settings();
const QSettings *s = Core::ICore::settings();
QString key = QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP);
key += QLatin1Char('/');
key += QLatin1String(licenseTemplatePathKeyC);
@@ -237,7 +237,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
m_ui(new Internal::Ui::CppFileSettingsPage)
{
m_ui->setupUi(this);
const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
// populate suffix combos
if (const Core::MimeType sourceMt = mdb->findByType(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE)))
foreach (const QString &suffix, sourceMt.suffixes())
@@ -372,7 +372,7 @@ void CppFileSettingsPage::apply()
const CppFileSettings newSettings = m_widget->settings();
if (newSettings != *m_settings) {
*m_settings = newSettings;
m_settings->toSettings(Core::ICore::instance()->settings());
m_settings->toSettings(Core::ICore::settings());
m_settings->applySuffixesToMimeDB();
}
}
src/plugins/cpptools/cppfindreferences.cpp
+2 -2
View File
@@ -289,7 +289,7 @@ void CppFindReferences::findAll_helper(Find::SearchResult *search)
parameters.context, this, parameters.symbol);
createWatcher(result, search);
Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
Core::ProgressManager *progressManager = Core::ICore::progressManager();
Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching"),
CppTools::Constants::TASK_SEARCH);
@@ -652,7 +652,7 @@ void CppFindReferences::findMacroUses(const Macro &macro)
result = QtConcurrent::run(&findMacroUses_helper, workingCopy, snapshot, this, macro);
createWatcher(result, search);
Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
Core::ProgressManager *progressManager = Core::ICore::progressManager();
Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching"),
CppTools::Constants::TASK_SEARCH);
connect(progress, SIGNAL(clicked()), Find::SearchResultWindow::instance(), SLOT(popup()));
src/plugins/cpptools/cppmodelmanager.cpp
+8 -9
View File
@@ -665,7 +665,6 @@ CppModelManager::CppModelManager(QObject *parent)
m_revision = 0;
m_synchronizer.setCancelOnWait(true);
m_core = Core::ICore::instance(); // FIXME
m_dirty = true;
ProjectExplorer::ProjectExplorerPlugin *pe =
@@ -700,10 +699,10 @@ CppModelManager::CppModelManager(QObject *parent)
this, SLOT(onExtraDiagnosticsUpdated(QString)));
// Listen for editor closed and opened events so that we can keep track of changing files
connect(m_core->editorManager(), SIGNAL(editorOpened(Core::IEditor *)),
connect(Core::ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor *)),
this, SLOT(editorOpened(Core::IEditor *)));
connect(m_core->editorManager(), SIGNAL(editorAboutToClose(Core::IEditor *)),
connect(Core::ICore::editorManager(), SIGNAL(editorAboutToClose(Core::IEditor *)),
this, SLOT(editorAboutToClose(Core::IEditor *)));
}
@@ -901,8 +900,8 @@ QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles
m_synchronizer.addFuture(result);
if (sourceFiles.count() > 1) {
m_core->progressManager()->addTask(result, tr("Parsing"),
CppTools::Constants::TASK_INDEX);
Core::ICore::progressManager()->addTask(result, tr("Parsing"),
CppTools::Constants::TASK_INDEX);
}
return result;
@@ -988,7 +987,7 @@ void CppModelManager::updateEditor(Document::Ptr doc)
{
const QString fileName = doc->fileName();
QList<Core::IEditor *> openedEditors = m_core->editorManager()->openedEditors();
QList<Core::IEditor *> openedEditors = Core::ICore::editorManager()->openedEditors();
foreach (Core::IEditor *editor, openedEditors) {
if (editor->file()->fileName() == fileName) {
TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor *>(editor);
@@ -1177,8 +1176,8 @@ void CppModelManager::onAboutToRemoveProject(ProjectExplorer::Project *project)
void CppModelManager::onAboutToUnloadSession()
{
if (m_core->progressManager()) {
m_core->progressManager()->cancelTasks(CppTools::Constants::TASK_INDEX);
if (Core::ProgressManager *pm = Core::ICore::progressManager()) {
pm->cancelTasks(CppTools::Constants::TASK_INDEX);
}
do {
QMutexLocker locker(&mutex);
@@ -1196,7 +1195,7 @@ void CppModelManager::parse(QFutureInterface<void> &future,
if (files.isEmpty())
return;
const Core::MimeDatabase *mimeDb = Core::ICore::instance()->mimeDatabase();
const Core::MimeDatabase *mimeDb = Core::ICore::mimeDatabase();
Core::MimeType cSourceTy = mimeDb->findByType(QLatin1String("text/x-csrc"));
Core::MimeType cppSourceTy = mimeDb->findByType(QLatin1String("text/x-c++src"));
Core::MimeType mSourceTy = mimeDb->findByType(QLatin1String("text/x-objcsrc"));
src/plugins/cpptools/cppmodelmanager.h
-4
View File
@@ -58,7 +58,6 @@
#endif
namespace Core {
class ICore;
class IEditor;
}
@@ -106,8 +105,6 @@ public:
QFuture<void> refreshSourceFiles(const QStringList &sourceFiles);
inline Core::ICore *core() const { return m_core; }
virtual bool isCppEditor(Core::IEditor *editor) const;
CppEditorSupport *editorSupport(TextEditor::ITextEditor *editor) const
@@ -197,7 +194,6 @@ private:
QStringList files);
private:
Core::ICore *m_core;
CPlusPlus::Snapshot m_snapshot;
// cache
src/plugins/cpptools/cpptoolsplugin.cpp
+6 -8
View File
@@ -103,15 +103,14 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
Q_UNUSED(arguments)
Q_UNUSED(error)
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
m_settings = new CppToolsSettings(this); // force registration of cpp tools settings
// Objects
m_modelManager = new CppModelManager(this);
Core::VcsManager *vcsManager = core->vcsManager();
Core::FileManager *fileManager = core->fileManager();
Core::VcsManager *vcsManager = Core::ICore::vcsManager();
Core::FileManager *fileManager = Core::ICore::fileManager();
connect(vcsManager, SIGNAL(repositoryChanged(QString)),
m_modelManager, SLOT(updateModifiedSourceFiles()));
connect(fileManager, SIGNAL(filesChangedInternally(QStringList)),
@@ -122,7 +121,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
addAutoReleasedObject(new CppLocatorFilter(m_modelManager));
addAutoReleasedObject(new CppClassesFilter(m_modelManager));
addAutoReleasedObject(new CppFunctionsFilter(m_modelManager));
addAutoReleasedObject(new CppCurrentDocumentFilter(m_modelManager, core->editorManager()));
addAutoReleasedObject(new CppCurrentDocumentFilter(m_modelManager, Core::ICore::editorManager()));
addAutoReleasedObject(new CppFileSettingsPage(m_fileSettings));
addAutoReleasedObject(new SymbolsFindFilter(m_modelManager));
addAutoReleasedObject(new CppCodeStyleSettingsPage);
@@ -151,7 +150,7 @@ void CppToolsPlugin::extensionsInitialized()
{
// The Cpp editor plugin, which is loaded later on, registers the Cpp mime types,
// so, apply settings here
m_fileSettings->fromSettings(Core::ICore::instance()->settings());
m_fileSettings->fromSettings(Core::ICore::settings());
if (!m_fileSettings->applySuffixesToMimeDB())
qWarning("Unable to apply cpp suffixes to mime database (cpp mime types not found).\n");
}
@@ -266,8 +265,7 @@ QString CppToolsPlugin::correspondingHeaderOrSourceI(const QString &fileName) co
if (m_headerSourceMapping.contains(fi.absoluteFilePath()))
return m_headerSourceMapping.value(fi.absoluteFilePath());
const Core::ICore *core = Core::ICore::instance();
const Core::MimeDatabase *mimeDatase = core->mimeDatabase();
const Core::MimeDatabase *mimeDatase = Core::ICore::mimeDatabase();
ProjectExplorer::ProjectExplorerPlugin *explorer =
ProjectExplorer::ProjectExplorerPlugin::instance();
ProjectExplorer::Project *project = (explorer ? explorer->currentProject() : 0);
src/plugins/cpptools/cpptoolssettings.cpp
+1 -1
View File
@@ -173,7 +173,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent)
pool->loadCustomCodeStyles();
// load global settings (after built-in settings are added to the pool)
if (QSettings *s = Core::ICore::instance()->settings()) {
if (QSettings *s = Core::ICore::settings()) {
d->m_globalCodeStyle->fromSettings(CppTools::Constants::CPP_SETTINGS_ID, s);
// legacy handling start (Qt Creator Version < 2.4)
src/plugins/cpptools/insertionpointlocator.cpp
+1 -1
View File
@@ -311,7 +311,7 @@ InsertionLocation InsertionPointLocator::methodDeclarationInClass(
static bool isSourceFile(const QString &fileName)
{
const Core::MimeDatabase *mimeDb = Core::ICore::instance()->mimeDatabase();
const Core::MimeDatabase *mimeDb = Core::ICore::mimeDatabase();
Core::MimeType cSourceTy = mimeDb->findByType(QLatin1String("text/x-csrc"));
Core::MimeType cppSourceTy = mimeDb->findByType(QLatin1String("text/x-c++src"));
Core::MimeType mSourceTy = mimeDb->findByType(QLatin1String("text/x-objcsrc"));
src/plugins/cpptools/symbolsfindfilter.cpp
+3 -3
View File
@@ -114,9 +114,9 @@ SymbolsFindFilter::SymbolsFindFilter(CppModelManager *manager)
m_scope(SearchProjectsOnly)
{
// for disabling while parser is running
connect(Core::ICore::instance()->progressManager(), SIGNAL(taskStarted(QString)),
connect(Core::ICore::progressManager(), SIGNAL(taskStarted(QString)),
this, SLOT(onTaskStarted(QString)));
connect(Core::ICore::instance()->progressManager(), SIGNAL(allTasksFinished(QString)),
connect(Core::ICore::progressManager(), SIGNAL(allTasksFinished(QString)),
this, SLOT(onAllTasksFinished(QString)));
}
@@ -190,7 +190,7 @@ void SymbolsFindFilter::startSearch(Find::SearchResult *search)
watcher->setFuture(QtConcurrent::run<Find::SearchResultItem, SymbolsFindParameters,
CPlusPlus::Snapshot, QSet<QString> >(runSearch, parameters,
m_manager->snapshot(), projectFileNames));
Core::ICore::instance()->progressManager()->addTask(watcher->future(),
Core::ICore::progressManager()->addTask(watcher->future(),
tr("Searching"),
Find::Constants::TASK_SEARCH);
}
src/plugins/cvs/cvsplugin.cpp
+5 -6
View File
@@ -246,12 +246,11 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
initializeVcs(new CvsControl(this));
m_cvsPluginInstance = this;
ICore *core = ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.cvs/CVS.mimetypes.xml"), errorMessage))
if (!ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.cvs/CVS.mimetypes.xml"), errorMessage))
return false;
if (QSettings *settings = core->settings())
if (QSettings *settings = ICore::settings())
m_settings.fromSettings(settings);
addAutoReleasedObject(new SettingsPage);
@@ -270,7 +269,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
addAutoReleasedObject(m_commandLocator);
// Register actions
ActionManager *ami = core->actionManager();
ActionManager *ami = ICore::actionManager();
ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS);
ActionContainer *cvsMenu = ami->createMenu(Id(CMD_ID_CVS_MENU));
@@ -505,7 +504,7 @@ bool CvsPlugin::submitEditorAboutToClose(VcsBaseSubmitEditor *submitEditor)
bool closeEditor = true;
if (!fileList.empty()) {
// get message & commit
closeEditor = ICore::instance()->fileManager()->saveFile(fileIFace);
closeEditor = ICore::fileManager()->saveFile(fileIFace);
if (closeEditor)
closeEditor = commit(m_commitMessageFileName, fileList);
}
@@ -1321,7 +1320,7 @@ void CvsPlugin::setSettings(const CvsSettings &s)
{
if (s != m_settings) {
m_settings = s;
if (QSettings *settings = ICore::instance()->settings())
if (QSettings *settings = ICore::settings())
m_settings.toSettings(settings);
cvsVersionControl()->emitConfigurationChanged();
}
src/plugins/debugger/cdb/cdbengine.cpp
+1 -1
View File
@@ -682,7 +682,7 @@ void CdbEngine::setupEngine()
// Nag to add symbol server
if (CdbSymbolPathListEditor::promptToAddSymbolServer(CdbOptions::settingsGroup(),
&(m_options->symbolPaths)))
m_options->toSettings(Core::ICore::instance()->settings());
m_options->toSettings(Core::ICore::settings());
init();
if (!m_logTime.elapsed())
src/plugins/debugger/cdb/cdboptionspage.cpp
+2 -2
View File
@@ -229,7 +229,7 @@ CdbOptionsPage::CdbOptionsPage() :
m_options(new CdbOptions)
{
CdbOptionsPage::m_instance = this;
m_options->fromSettings(Core::ICore::instance()->settings());
m_options->fromSettings(Core::ICore::settings());
}
CdbOptionsPage::~CdbOptionsPage()
@@ -278,7 +278,7 @@ void CdbOptionsPage::apply()
const CdbOptions newOptions = m_widget->options();
if (*m_options != newOptions) {
*m_options = newOptions;
m_options->toSettings(Core::ICore::instance()->settings());
m_options->toSettings(Core::ICore::settings());
}
}
src/plugins/debugger/commonoptionspage.cpp
+2 -2
View File
@@ -180,7 +180,7 @@ void CommonOptionsPage::apply()
{
QTC_ASSERT(!m_widget.isNull() && !m_group.isNull(), return; )
QSettings *settings = ICore::instance()->settings();
QSettings *settings = ICore::settings();
m_group->apply(settings);
const GlobalDebuggerOptions newGlobalOptions = m_widget->globalOptions();
@@ -245,7 +245,7 @@ QIcon DebuggingHelperOptionPage::categoryIcon() const
void DebuggingHelperOptionPage::apply()
{
m_group.apply(ICore::instance()->settings());
m_group.apply(ICore::settings());
}
void DebuggingHelperOptionPage::finish()
src/plugins/debugger/debuggerdialogs.cpp
+2 -2
View File
@@ -444,7 +444,7 @@ void AttachExternalDialog::accept()
StartExternalDialog::StartExternalDialog(QWidget *parent)
: QDialog(parent), m_ui(new Ui::StartExternalDialog)
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
m_ui->setupUi(this);
m_ui->toolChainComboBox->init(true);
@@ -916,7 +916,7 @@ StartRemoteEngineDialog::StartRemoteEngineDialog(QWidget *parent) :
QDialog(parent) ,
m_ui(new Ui::StartRemoteEngineDialog)
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
m_ui->setupUi(this);
m_ui->host->setCompleter(new HistoryCompleter(settings, m_ui->host));
src/plugins/debugger/debuggerengine.cpp
+1 -1
View File
@@ -538,7 +538,7 @@ void DebuggerEngine::startDebugger(DebuggerRunControl *runControl)
QTC_ASSERT(!d->m_runControl, notifyEngineSetupFailed(); return);
d->m_progress.setProgressRange(0, 1000);
Core::FutureProgress *fp = Core::ICore::instance()->progressManager()
Core::FutureProgress *fp = Core::ICore::progressManager()
->addTask(d->m_progress.future(),
tr("Launching"), _("Debugger.Launcher"));
fp->setKeepOnFinish(Core::FutureProgress::HideOnFinish);
src/plugins/debugger/debuggermainwindow.cpp
+11 -19
View File
@@ -305,8 +305,7 @@ void DebuggerMainWindow::onModeChanged(IMode *mode)
void DebuggerMainWindowPrivate::createViewsMenuItems()
{
ICore *core = ICore::instance();
ActionManager *am = core->actionManager();
ActionManager *am = ICore::actionManager();
Context debugcontext(Constants::C_DEBUGMODE);
m_viewsMenu = am->actionContainer(Id(Core::Constants::M_WINDOW_VIEWS));
QTC_ASSERT(m_viewsMenu, return)
@@ -352,7 +351,6 @@ void DebuggerMainWindowPrivate::addLanguage(DebuggerLanguage languageId,
void DebuggerMainWindowPrivate::activateQmlCppLayout()
{
ICore *core = ICore::instance();
Context qmlCppContext = m_contextsForLanguage.value(QmlLanguage);
qmlCppContext.add(m_contextsForLanguage.value(CppLanguage));
if (m_toolBars.value(QmlLanguage))
@@ -360,37 +358,36 @@ void DebuggerMainWindowPrivate::activateQmlCppLayout()
if (m_previousDebugLanguages & QmlLanguage) {
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
core->updateAdditionalContexts(qmlCppContext, Context());
ICore::updateAdditionalContexts(qmlCppContext, Context());
} else if (m_previousDebugLanguages & CppLanguage) {
m_dockWidgetActiveStateCpp = q->saveSettings();
core->updateAdditionalContexts(m_contextsForLanguage.value(CppLanguage),
ICore::updateAdditionalContexts(m_contextsForLanguage.value(CppLanguage),
Context());
}
q->restoreSettings(m_dockWidgetActiveStateQmlCpp);
core->updateAdditionalContexts(Context(), qmlCppContext);
ICore::updateAdditionalContexts(Context(), qmlCppContext);
}
void DebuggerMainWindowPrivate::activateCppLayout()
{
ICore *core = ICore::instance();
Context qmlCppContext = m_contextsForLanguage.value(QmlLanguage);
qmlCppContext.add(m_contextsForLanguage.value(CppLanguage));
m_toolBarStack->setCurrentWidget(m_toolBars.value(CppLanguage));
if (m_previousDebugLanguages & QmlLanguage) {
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
core->updateAdditionalContexts(qmlCppContext, Context());
ICore::updateAdditionalContexts(qmlCppContext, Context());
} else if (m_previousDebugLanguages & CppLanguage) {
m_dockWidgetActiveStateCpp = q->saveSettings();
core->updateAdditionalContexts(m_contextsForLanguage.value(CppLanguage),
ICore::updateAdditionalContexts(m_contextsForLanguage.value(CppLanguage),
Context());
}
q->restoreSettings(m_dockWidgetActiveStateCpp);
const Context &cppContext = m_contextsForLanguage.value(CppLanguage);
core->updateAdditionalContexts(Context(), cppContext);
ICore::updateAdditionalContexts(Context(), cppContext);
}
void DebuggerMainWindow::setToolBar(DebuggerLanguage language, QWidget *widget)
@@ -426,7 +423,7 @@ QDockWidget *DebuggerMainWindow::createDockWidget(const DebuggerLanguage &langua
Context globalContext(Core::Constants::C_GLOBAL);
ActionManager *am = ICore::instance()->actionManager();
ActionManager *am = ICore::actionManager();
QAction *toggleViewAction = dockWidget->toggleViewAction();
Command *cmd = am->registerAction(toggleViewAction,
Core::Id(QLatin1String("Debugger.") + widget->objectName()), globalContext);
@@ -460,8 +457,7 @@ void DebuggerMainWindow::addStagedMenuEntries()
QWidget *DebuggerMainWindow::createContents(IMode *mode)
{
ICore *core = ICore::instance();
ActionManager *am = core->actionManager();
ActionManager *am = ICore::actionManager();
ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
connect(pe->session(), SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
d, SLOT(updateUiForProject(ProjectExplorer::Project*)));
@@ -543,9 +539,7 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
void DebuggerMainWindow::writeSettings() const
{
ICore *core = ICore::instance();
QTC_ASSERT(core, return);
QSettings *settings = core->settings();
QSettings *settings = ICore::settings();
QTC_ASSERT(settings, return);
settings->beginGroup(QLatin1String("DebugMode.CppMode"));
@@ -567,9 +561,7 @@ void DebuggerMainWindow::writeSettings() const
void DebuggerMainWindow::readSettings()
{
ICore *core = ICore::instance();
QTC_ASSERT(core, return);
QSettings *settings = core->settings();
QSettings *settings = ICore::settings();
QTC_ASSERT(settings, return);
d->m_dockWidgetActiveStateCpp.clear();
src/plugins/debugger/debuggerplugin.cpp
+8 -13
View File
@@ -2449,7 +2449,7 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode)
void DebuggerPluginPrivate::showSettingsDialog()
{
ICore::instance()->showOptionsDialog(
ICore::showOptionsDialog(
_(DEBUGGER_SETTINGS_CATEGORY),
_(DEBUGGER_COMMON_SETTINGS_ID));
}
@@ -2655,7 +2655,7 @@ void DebuggerPluginPrivate::showQtDumperLibraryWarning(const QString &details)
dialog.setDetailedText(details);
dialog.exec();
if (dialog.clickedButton() == qtPref) {
ICore::instance()->showOptionsDialog(
ICore::showOptionsDialog(
_(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY),
_(QtSupport::Constants::QTVERSION_SETTINGS_PAGE_ID));
} else if (dialog.clickedButton() == helperOff) {
@@ -2852,16 +2852,14 @@ QMessageBox *showMessageBox(int icon, const QString &title,
void DebuggerPluginPrivate::extensionsInitialized()
{
ICore *core = ICore::instance();
QTC_ASSERT(core, return);
m_coreSettings = core->settings();
m_coreSettings = ICore::settings();
m_debuggerSettings = new DebuggerSettings(m_coreSettings);
m_debuggerSettings->readSettings();
connect(core, SIGNAL(coreAboutToClose()), this, SLOT(coreShutdown()));
connect(ICore::instance(), SIGNAL(coreAboutToClose()), this, SLOT(coreShutdown()));
ActionManager *am = core->actionManager();
ActionManager *am = ICore::actionManager();
QTC_ASSERT(am, return);
m_plugin->addObject(this);
@@ -3404,7 +3402,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
//
// Core
connect(core, SIGNAL(saveSettingsRequested()), SLOT(writeSettings()));
connect(ICore::instance(), SIGNAL(saveSettingsRequested()), SLOT(writeSettings()));
// TextEditor
connect(TextEditorSettings::instance(),
@@ -3422,7 +3420,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
SLOT(updateDebugActions()));
// EditorManager
QObject *editorManager = core->editorManager();
QObject *editorManager = ICore::editorManager();
connect(editorManager, SIGNAL(editorOpened(Core::IEditor*)),
SLOT(editorOpened(Core::IEditor*)));
connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)),
@@ -3572,13 +3570,10 @@ DebuggerPlugin::~DebuggerPlugin()
bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
ICore *core = ICore::instance();
QTC_ASSERT(core, return false);
// Menu groups
const Context globalcontext(CC::C_GLOBAL);
ActionManager *am = core->actionManager();
ActionManager *am = ICore::actionManager();
ActionContainer *mstart = am->actionContainer(PE::M_DEBUG_STARTDEBUGGING);
mstart->appendGroup(Constants::G_START_LOCAL);
src/plugins/debugger/debuggerrunner.cpp
+3 -3
View File
@@ -200,7 +200,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
DebuggerToolTipManager::instance()->registerEngine(d->m_engine);
} else {
debuggingFinished();
Core::ICore::instance()->showWarningWithOptions(DebuggerRunControl::tr("Debugger"), errorMessage);
Core::ICore::showWarningWithOptions(DebuggerRunControl::tr("Debugger"), errorMessage);
}
}
@@ -600,7 +600,7 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa
// Filter out disables types, command line + current settings.
unsigned cmdLineEnabledEngines = debuggerCore()->enabledEngines();
#ifdef WITH_LLDB
if (!Core::ICore::instance()->settings()->value(QLatin1String("LLDB/enabled")).toBool())
if (!Core::ICore::settings()->value(QLatin1String("LLDB/enabled")).toBool())
cmdLineEnabledEngines &= ~LldbEngineType;
#else
cmdLineEnabledEngines &= ~LldbEngineType;
@@ -807,7 +807,7 @@ DebuggerRunControl *DebuggerRunControlFactory::create
if (!check) {
//appendMessage(errorMessage, true);
Core::ICore::instance()->showWarningWithOptions(DebuggerRunControl::tr("Debugger"),
Core::ICore::showWarningWithOptions(DebuggerRunControl::tr("Debugger"),
check.errorMessage, check.errorDetailsString(), check.settingsCategory, check.settingsPage);
return 0;
}
src/plugins/debugger/debuggertooltipmanager.cpp
+2 -2
View File
@@ -1394,7 +1394,7 @@ void DebuggerToolTipManager::debugModeEntered()
// Hook up all signals in debug mode.
if (!m_debugModeActive) {
m_debugModeActive = true;
QWidget *topLevel = ICore::instance()->mainWindow()->topLevelWidget();
QWidget *topLevel = ICore::mainWindow()->topLevelWidget();
topLevel->installEventFilter(this);
EditorManager *em = EditorManager::instance();
connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)),
@@ -1418,7 +1418,7 @@ void DebuggerToolTipManager::leavingDebugMode()
if (m_debugModeActive) {
m_debugModeActive = false;
hide();
if (QWidget *topLevel = ICore::instance()->mainWindow()->topLevelWidget())
if (QWidget *topLevel = ICore::mainWindow()->topLevelWidget())
topLevel->removeEventFilter(this);
if (EditorManager *em = EditorManager::instance()) {
foreach (IEditor *e, em->openedEditors()) {
src/plugins/debugger/disassembleragent.cpp
+1 -1
View File
@@ -259,7 +259,7 @@ void DisassemblerAgentPrivate::configureMimeType()
qobject_cast<TextEditor::PlainTextEditorWidget *>(editor->widget());
QTC_ASSERT(pe, return);
MimeType mtype = ICore::instance()->mimeDatabase()->findByType(mimeType);
MimeType mtype = ICore::mimeDatabase()->findByType(mimeType);
if (mtype)
pe->configure(mtype);
else
src/plugins/debugger/gdb/gdbengine.cpp
+3 -3
View File
@@ -4701,7 +4701,7 @@ void GdbEngine::loadInitScript()
void GdbEngine::loadPythonDumpers()
{
const QByteArray dumperSourcePath =
Core::ICore::instance()->resourcePath().toLocal8Bit() + "/dumper/";
Core::ICore::resourcePath().toLocal8Bit() + "/dumper/";
postCommand("python execfile('" + dumperSourcePath + "bridge.py')",
ConsoleCommand|NonCriticalResponse);
@@ -4791,9 +4791,9 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg,
if (!msg.isEmpty()) {
const QString title = tr("Adapter start failed");
if (settingsIdHint.isEmpty()) {
Core::ICore::instance()->showWarningWithOptions(title, msg);
Core::ICore::showWarningWithOptions(title, msg);
} else {
Core::ICore::instance()->showWarningWithOptions(title, msg, QString(),
Core::ICore::showWarningWithOptions(title, msg, QString(),
_(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY), settingsIdHint);
}
}
src/plugins/debugger/gdb/gdboptionspage.cpp
+1 -1
View File
@@ -337,7 +337,7 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
void GdbOptionsPage::apply()
{
m_group.apply(Core::ICore::instance()->settings());
m_group.apply(Core::ICore::settings());
}
void GdbOptionsPage::finish()
src/plugins/debugger/gdb/termgdbadapter.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ TermGdbAdapter::TermGdbAdapter(GdbEngine *engine)
}
#else
m_stubProc.setMode(Utils::ConsoleProcess::Debug);
m_stubProc.setSettings(Core::ICore::instance()->settings());
m_stubProc.setSettings(Core::ICore::settings());
#endif
connect(&m_stubProc, SIGNAL(processError(QString)), SLOT(stubError(QString)));
src/plugins/debugger/lldb/lldbenginehost.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ LldbEngineHost::LldbEngineHost(const DebuggerStartParameters &startParameters)
SLOT(stderrReady()));
QString a = Core::ICore::instance()->resourcePath() + QLatin1String("/qtcreator-lldb");
QString a = Core::ICore::resourcePath() + QLatin1String("/qtcreator-lldb");
if(getenv("QTC_LLDB_GUEST") != 0)
a = QString::fromLocal8Bit(getenv("QTC_LLDB_GUEST"));
src/plugins/debugger/lldb/lldboptionspage.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ void LldbOptionsPageWidget::load()
// ---------- LldbOptionsPage
LldbOptionsPage::LldbOptionsPage()
{
// m_options->fromSettings(Core::ICore::instance()->settings());
// m_options->fromSettings(Core::ICore::settings());
}
LldbOptionsPage::~LldbOptionsPage()
@@ -106,7 +106,7 @@ QIcon LldbOptionsPage::categoryIcon() const
QWidget *LldbOptionsPage::createPage(QWidget *parent)
{
m_widget = new LldbOptionsPageWidget(parent, Core::ICore::instance()->settings());
m_widget = new LldbOptionsPageWidget(parent, Core::ICore::settings());
return m_widget;
}
src/plugins/debugger/logwindow.cpp
+1 -1
View File
@@ -338,7 +338,7 @@ LogWindow::LogWindow(QWidget *parent)
m_commandEdit->setFrame(false);
m_commandEdit->setObjectName(QLatin1String("DebuggerInput"));
m_commandEdit->setCompleter(new Utils::HistoryCompleter(
Core::ICore::instance()->settings(), m_commandEdit));
Core::ICore::settings(), m_commandEdit));
QHBoxLayout *commandBox = new QHBoxLayout;
commandBox->addWidget(m_commandLabel);
commandBox->addWidget(m_commandEdit);
src/plugins/debugger/pdb/pdbengine.cpp
+2 -2
View File
@@ -185,7 +185,7 @@ void PdbEngine::setupEngine()
showMessage(_("ADAPTER START FAILED"));
if (!msg.isEmpty()) {
const QString title = tr("Adapter start failed");
Core::ICore::instance()->showWarningWithOptions(title, msg);
Core::ICore::showWarningWithOptions(title, msg);
}
notifyEngineSetupFailed();
return;
@@ -214,7 +214,7 @@ void PdbEngine::runEngine()
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
showStatusMessage(tr("Running requested..."), 5000);
const QByteArray dumperSourcePath =
Core::ICore::instance()->resourcePath().toLocal8Bit() + "/dumper/";
Core::ICore::resourcePath().toLocal8Bit() + "/dumper/";
QString fileName = QFileInfo(startParameters().executable).absoluteFilePath();
postDirectCommand("import sys");
postDirectCommand("sys.argv.append('" + fileName.toLocal8Bit() + "')");
src/plugins/debugger/qml/qmlengine.cpp
+2 -4
View File
@@ -234,8 +234,7 @@ void QmlEngine::connectionStartupFailed()
}
}
Core::ICore * const core = Core::ICore::instance();
QMessageBox *infoBox = new QMessageBox(core->mainWindow());
QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow());
infoBox->setIcon(QMessageBox::Critical);
infoBox->setWindowTitle(tr("Qt Creator"));
infoBox->setText(tr("Could not connect to the in-process QML debugger.\n"
@@ -278,8 +277,7 @@ void QmlEngine::wrongSetupMessageBox(const QString &errorMessage)
d->m_noDebugOutputTimer.stop();
notifyEngineRunFailed();
Core::ICore * const core = Core::ICore::instance();
QMessageBox *infoBox = new QMessageBox(core->mainWindow());
QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow());
infoBox->setIcon(QMessageBox::Critical);
infoBox->setWindowTitle(tr("Qt Creator"));
//: %1 is detailed error message
src/plugins/debugger/qml/qmljsscriptconsole.cpp
+2 -6
View File
@@ -167,9 +167,7 @@ QmlJSScriptConsoleWidget::QmlJSScriptConsoleWidget(QWidget *parent)
vbox->addWidget(statusbarContainer);
vbox->addWidget(m_console);
Core::ICore *core = Core::ICore::instance();
QTC_ASSERT(core, return);
QSettings *settings = core->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(_(SCRIPT_CONSOLE));
m_showLog->setChecked(settings->value(_(SHOW_LOG), true).toBool());
m_showWarning->setChecked(settings->value(_(SHOW_WARNING), true).toBool());
@@ -179,9 +177,7 @@ QmlJSScriptConsoleWidget::QmlJSScriptConsoleWidget(QWidget *parent)
QmlJSScriptConsoleWidget::~QmlJSScriptConsoleWidget()
{
Core::ICore *core = Core::ICore::instance();
QTC_ASSERT(core, return);
QSettings *settings = core->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(_(SCRIPT_CONSOLE));
settings->setValue(_(SHOW_LOG), QVariant(m_showLog->isChecked()));
settings->setValue(_(SHOW_WARNING), QVariant(m_showWarning->isChecked()));
src/plugins/debugger/script/scriptengine.cpp
+1 -1
View File
@@ -245,7 +245,7 @@ void ScriptEngine::setupEngine()
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
showMessage(_("STARTING SCRIPT DEBUGGER"), LogMisc);
if (m_scriptEngine.isNull())
m_scriptEngine = Core::ICore::instance()->scriptManager()->scriptEngine();
m_scriptEngine = Core::ICore::scriptManager()->scriptEngine();
QTC_CHECK(!m_scriptAgent);
m_scriptAgent.reset(new ScriptAgent(this, m_scriptEngine.data()));
m_scriptEngine->setAgent(m_scriptAgent.data());
src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
+4 -5
View File
@@ -177,9 +177,8 @@ bool CdbSymbolPathListEditor::promptToAddSymbolServer(const QString &settingsGro
|| CdbSymbolPathListEditor::indexOfSymbolServerPath(*symbolPaths) != -1)
return false;
// Prompt to use Symbol server unless the user checked "No nagging".
Core::ICore *core = Core::ICore::instance();
const QString nagSymbolServerKey = settingsGroup + QLatin1String("/NoPromptSymbolServer");
bool noFurtherNagging = core->settings()->value(nagSymbolServerKey, false).toBool();
bool noFurtherNagging = Core::ICore::settings()->value(nagSymbolServerKey, false).toBool();
if (noFurtherNagging)
return false;
@@ -192,13 +191,13 @@ bool CdbSymbolPathListEditor::promptToAddSymbolServer(const QString &settingsGro
"<p>Would you like to set it up?</p></br>"
"</body></html>").arg(symServUrl);
const QDialogButtonBox::StandardButton answer =
Utils::CheckableMessageBox::question(core->mainWindow(), tr("Symbol Server"), msg,
Utils::CheckableMessageBox::question(Core::ICore::mainWindow(), tr("Symbol Server"), msg,
tr("Do not ask again"), &noFurtherNagging);
core->settings()->setValue(nagSymbolServerKey, noFurtherNagging);
Core::ICore::settings()->setValue(nagSymbolServerKey, noFurtherNagging);
if (answer == QDialogButtonBox::No)
return false;
// Prompt for path and add it. Synchronize QSetting and debugger.
const QString cacheDir = CdbSymbolPathListEditor::promptCacheDirectory(core->mainWindow());
const QString cacheDir = CdbSymbolPathListEditor::promptCacheDirectory(Core::ICore::mainWindow());
if (cacheDir.isEmpty())
return false;
src/plugins/designer/cpp/cppsettingspage.cpp
+2 -2
View File
@@ -103,7 +103,7 @@ QString CppSettingsPageWidget::searchKeywords() const
// ---------- CppSettingsPage
CppSettingsPage::CppSettingsPage(QObject *parent) : Core::IOptionsPage(parent)
{
m_parameters.fromSettings(Core::ICore::instance()->settings());
m_parameters.fromSettings(Core::ICore::settings());
}
QString CppSettingsPage::id() const
@@ -146,7 +146,7 @@ void CppSettingsPage::apply()
const FormClassWizardGenerationParameters newParameters = m_widget->parameters();
if (newParameters != m_parameters) {
m_parameters = newParameters;
m_parameters.toSettings(Core::ICore::instance()->settings());
m_parameters.toSettings(Core::ICore::settings());
}
}
}
src/plugins/designer/cpp/formclasswizardpage.cpp
+2 -3
View File
@@ -79,14 +79,13 @@ bool FormClassWizardPage::lowercaseHeaderFiles()
lowerCaseSettingsKey += QLatin1Char('/');
lowerCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY);
const bool lowerCaseDefault = CppTools::Constants::lowerCaseFilesDefault;
return Core::ICore::instance()->settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
return Core::ICore::settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
}
// Set up new class widget from settings
void FormClassWizardPage::initFileGenerationSettings()
{
Core::ICore *core = Core::ICore::instance();
const Core::MimeDatabase *mdb = core->mimeDatabase();
const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
m_ui->newClassWidget->setHeaderExtension(mdb->preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)));
m_ui->newClassWidget->setSourceExtension(mdb->preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE)));
m_ui->newClassWidget->setLowerCaseFiles(lowercaseHeaderFiles());
src/plugins/designer/formeditorplugin.cpp
+3 -4
View File
@@ -83,8 +83,7 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
Q_UNUSED(arguments)
Q_UNUSED(error)
Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/formeditor/Designer.mimetypes.xml"), error))
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/formeditor/Designer.mimetypes.xml"), error))
return false;
initializeTemplates();
@@ -93,11 +92,11 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
addAutoReleasedObject(new SettingsPageProvider);
addAutoReleasedObject(new QtDesignerFormClassCodeGenerator);
// Ensure that loading designer translations is done before FormEditorW is instantiated
const QString locale = Core::ICore::instance()->userInterfaceLanguage();
const QString locale = Core::ICore::userInterfaceLanguage();
if (!locale.isEmpty()) {
QTranslator *qtr = new QTranslator(this);
const QString &creatorTrPath =
Core::ICore::instance()->resourcePath() + QLatin1String("/translations");
Core::ICore::resourcePath() + QLatin1String("/translations");
const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
const QString &trFile = QLatin1String("designer_") + locale;
if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
src/plugins/designer/formeditorw.cpp
+33 -34
View File
@@ -159,7 +159,6 @@ FormEditorW::FormEditorW() :
m_formeditor(QDesignerComponents::createFormEditor(0)),
m_integration(0),
m_fwm(0),
m_core(Core::ICore::instance()),
m_initStage(RegisterPlugins),
m_actionGroupEditMode(0),
m_actionPrint(0),
@@ -180,12 +179,11 @@ FormEditorW::FormEditorW() :
qDebug() << Q_FUNC_INFO;
QTC_ASSERT(!m_self, return);
m_self = this;
QTC_ASSERT(m_core, return);
qFill(m_designerSubWindows, m_designerSubWindows + Designer::Constants::DesignerSubWindowCount,
static_cast<QWidget *>(0));
m_formeditor->setTopLevel(qobject_cast<QWidget *>(m_core->editorManager()));
m_formeditor->setTopLevel(Core::ICore::editorManager());
m_formeditor->setSettingsManager(new SettingsManager());
#if QT_VERSION >= 0x050000
@@ -204,7 +202,7 @@ FormEditorW::FormEditorW() :
m_settingsPages.append(settingsPage);
}
connect(m_core->editorManager(), SIGNAL(currentEditorChanged(Core::IEditor *)),
connect(Core::ICore::editorManager(), SIGNAL(currentEditorChanged(Core::IEditor *)),
this, SLOT(currentEditorChanged(Core::IEditor *)));
connect(m_shortcutMapper, SIGNAL(mapped(QObject *)),
this, SLOT(updateShortcut(QObject *)));
@@ -213,10 +211,10 @@ FormEditorW::FormEditorW() :
FormEditorW::~FormEditorW()
{
if (m_context)
m_core->removeContextObject(m_context);
Core::ICore::removeContextObject(m_context);
if (m_initStage == FullyInitialized) {
if (QSettings *s = m_core->settings()) {
m_core->settings()->beginGroup(QLatin1String(settingsGroupC));
if (QSettings *s = Core::ICore::settings()) {
s->beginGroup(QLatin1String(settingsGroupC));
m_editorWidget->saveSettings(s);
s->endGroup();
}
@@ -251,7 +249,7 @@ void FormEditorW::addDockViewAction(Core::ActionManager *am,
void FormEditorW::setupViewActions()
{
// Populate "View" menu of form editor menu
Core::ActionManager *am = m_core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::ActionContainer *viewMenu = am->actionContainer(Core::Id(Core::Constants::M_WINDOW_VIEWS));
QTC_ASSERT(viewMenu, return)
@@ -327,11 +325,11 @@ void FormEditorW::fullInit()
delete initTime;
}
connect(m_core->editorManager()->instance(), SIGNAL(editorsClosed(QList<Core::IEditor*>)),
connect(Core::ICore::editorManager(), SIGNAL(editorsClosed(QList<Core::IEditor*>)),
SLOT(closeFormEditorsForXmlEditors(QList<Core::IEditor*>)));
// Nest toolbar and editor widget
m_editorWidget = new EditorWidget(this);
QSettings *settings = m_core->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String(settingsGroupC));
m_editorWidget->restoreSettings(settings);
settings->endGroup();
@@ -362,7 +360,7 @@ void FormEditorW::fullInit()
Core::Context designerContexts = m_contexts;
designerContexts.add(Core::Constants::C_EDITORMANAGER);
m_context = new DesignerContext(designerContexts, m_modeWidget, this);
m_core->addContextObject(m_context);
Core::ICore::addContextObject(m_context);
m_designMode->registerDesignWidget(m_modeWidget, QStringList(QLatin1String(FORM_MIMETYPE)), m_contexts);
@@ -436,7 +434,7 @@ void FormEditorW::deleteInstance()
void FormEditorW::setupActions()
{
Core::ActionManager *am = m_core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::Command *command;
//menus
@@ -614,7 +612,7 @@ void FormEditorW::setupActions()
QToolBar *FormEditorW::createEditorToolBar() const
{
QToolBar *editorToolBar = new QToolBar;
Core::ActionManager *am = m_core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
const QList<Core::Id>::const_iterator cend = m_toolActionIds.constEnd();
for (QList<Core::Id>::const_iterator it = m_toolActionIds.constBegin(); it != cend; ++it) {
Core::Command *cmd = am->command(*it);
@@ -681,7 +679,7 @@ void FormEditorW::saveSettings(QSettings *s)
void FormEditorW::critical(const QString &errorMessage)
{
QMessageBox::critical(m_core->mainWindow(), tr("Designer"), errorMessage);
QMessageBox::critical(Core::ICore::mainWindow(), tr("Designer"), errorMessage);
}
// Apply the command shortcut to the action and connects to the command's keySequenceChanged signal
@@ -852,9 +850,10 @@ void FormEditorW::print()
if (!fw)
return;
const bool oldFullPage = m_core->printer()->fullPage();
const QPrinter::Orientation oldOrientation = m_core->printer()->orientation ();
m_core->printer()->setFullPage(false);
QPrinter *printer = Core::ICore::printer();
const bool oldFullPage = printer->fullPage();
const QPrinter::Orientation oldOrientation = printer->orientation ();
printer->setFullPage(false);
do {
// Grab the image to be able to a suggest suitable orientation
QString errorMessage;
@@ -869,19 +868,20 @@ void FormEditorW::print()
}
const QSizeF pixmapSize = pixmap.size();
m_core->printer()->setOrientation( pixmapSize.width() > pixmapSize.height() ? QPrinter::Landscape : QPrinter::Portrait);
printer->setOrientation( pixmapSize.width() > pixmapSize.height() ? QPrinter::Landscape : QPrinter::Portrait);
// Printer parameters
QPrintDialog dialog(m_core->printer(), fw);
QPrintDialog dialog(printer, fw);
if (!dialog.exec())
break;
const QCursor oldCursor = m_core->mainWindow()->cursor();
m_core->mainWindow()->setCursor(Qt::WaitCursor);
QWidget *mainWindow = Core::ICore::mainWindow();
const QCursor oldCursor = mainWindow->cursor();
mainWindow->setCursor(Qt::WaitCursor);
// Estimate of required scaling to make form look the same on screen and printer.
const double suggestedScaling = static_cast<double>(m_core->printer()->physicalDpiX()) / static_cast<double>(fw->physicalDpiX());
const double suggestedScaling = static_cast<double>(printer->physicalDpiX()) / static_cast<double>(fw->physicalDpiX());
QPainter painter(m_core->printer());
QPainter painter(printer);
painter.setRenderHint(QPainter::SmoothPixmapTransform);
// Clamp to page
@@ -896,17 +896,17 @@ void FormEditorW::print()
painter.translate(xOffset, yOffset);
painter.scale(scaling, scaling);
painter.drawPixmap(0, 0, pixmap);
m_core->mainWindow()->setCursor(oldCursor);
mainWindow->setCursor(oldCursor);
} while (false);
m_core->printer()->setFullPage(oldFullPage);
m_core->printer()->setOrientation(oldOrientation);
printer->setFullPage(oldFullPage);
printer->setOrientation(oldOrientation);
}
// Find out current existing editor file
static QString currentFile(const Core::EditorManager *em)
static QString currentFile()
{
if (Core::IEditor *editor = em->currentEditor())
if (Core::IEditor *editor = Core::EditorManager::instance()->currentEditor())
if (const Core::IFile *file = editor->file()) {
const QString fileName = file->fileName();
if (!fileName.isEmpty() && QFileInfo(fileName).isFile())
@@ -917,13 +917,13 @@ static QString currentFile(const Core::EditorManager *em)
// Switch between form ('ui') and source file ('cpp'):
// Find corresponding 'other' file, simply assuming it is in the same directory.
static QString otherFile(const Core::EditorManager *em)
static QString otherFile()
{
// Determine mime type of current file.
const QString current = currentFile(em);
const QString current = currentFile();
if (current.isEmpty())
return QString();
const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
const Core::MimeType currentMimeType = mdb->findByFile(current);
if (!currentMimeType)
return QString();
@@ -952,10 +952,9 @@ static QString otherFile(const Core::EditorManager *em)
void FormEditorW::switchSourceForm()
{
Core::EditorManager *em = Core::EditorManager::instance();
const QString fileToOpen = otherFile(em);
const QString fileToOpen = otherFile();
if (!fileToOpen.isEmpty())
em->openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
Core::ICore::editorManager()->openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
}
} // namespace Internal
src/plugins/designer/formeditorw.h
-2
View File
@@ -69,7 +69,6 @@ namespace Core {
class ActionManager;
class ActionContainer;
class Command;
class ICore;
class IEditor;
class Id;
class DesignMode;
@@ -183,7 +182,6 @@ private:
#else
qdesigner_internal::QDesignerFormWindowManager *m_fwm;
#endif
Core::ICore *m_core;
InitializationStage m_initStage;
QWidget *m_designerSubWindows[Designer::Constants::DesignerSubWindowCount];
src/plugins/designer/qtcreatorintegration.cpp
+1 -1
View File
@@ -654,7 +654,7 @@ void QtCreatorIntegration::slotSyncSettingsToDesigner()
{
#if QT_VERSION > 0x040800
// Set promotion-relevant parameters on integration.
const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();
const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase();
setHeaderSuffix(mdb->preferredSuffixByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)));
setHeaderLowercase(FormClassWizardPage::lowercaseHeaderFiles());
#endif
src/plugins/designer/qtdesignerformclasscodegenerator.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
QString *header, QString *source, int indentation)
{
Internal::FormClassWizardGenerationParameters generationParameters;
generationParameters.fromSettings(Core::ICore::instance()->settings());
generationParameters.fromSettings(Core::ICore::settings());
const QString indent = QString(indentation, QLatin1Char(' '));
QString formBaseClass;
src/plugins/designer/settingsmanager.cpp
+2 -2
View File
@@ -43,8 +43,8 @@ using namespace Designer::Internal;
static inline QSettings *coreSettings()
{
if (const Core::ICore *core = Core::ICore::instance())
return core->settings();
if (Core::ICore::instance())
return Core::ICore::settings();
return 0;
}
src/plugins/fakevim/fakevimplugin.cpp
+19 -22
View File
@@ -194,7 +194,7 @@ public:
{ return QIcon(_(Constants::SETTINGS_CATEGORY_FAKEVIM_ICON)); }
QWidget *createPage(QWidget *parent);
void apply() { m_group.apply(ICore::instance()->settings()); }
void apply() { m_group.apply(ICore::settings()); }
void finish() { m_group.finish(); }
virtual bool matches(const QString &) const;
@@ -380,7 +380,7 @@ QWidget *FakeVimExCommandsPage::createPage(QWidget *parent)
void FakeVimExCommandsPage::initialize()
{
ActionManager *am = ICore::instance()->actionManager();
ActionManager *am = ICore::actionManager();
QTC_ASSERT(am, return);
QMap<QString, QTreeWidgetItem *> sections;
@@ -929,7 +929,7 @@ FakeVimPluginPrivate::~FakeVimPluginPrivate()
void FakeVimPluginPrivate::onCoreAboutToClose()
{
// Don't attach to editors anymore.
disconnect(ICore::instance()->editorManager(), SIGNAL(editorOpened(Core::IEditor*)),
disconnect(ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor*)),
this, SLOT(editorOpened(Core::IEditor*)));
}
@@ -939,9 +939,8 @@ void FakeVimPluginPrivate::aboutToShutdown()
bool FakeVimPluginPrivate::initialize()
{
Core::ICore *core = Core::ICore::instance();
EditorManager *editorManager = core->editorManager();
ActionManager *actionManager = core->actionManager();
EditorManager *editorManager = ICore::editorManager();
ActionManager *actionManager = ICore::actionManager();
QTC_ASSERT(actionManager, return false);
//m_wordCompletion = new WordCompletion;
@@ -991,7 +990,7 @@ bool FakeVimPluginPrivate::initialize()
connect(act, SIGNAL(triggered()), SLOT(userActionTriggered()));
}
connect(core, SIGNAL(coreAboutToClose()), this, SLOT(onCoreAboutToClose()));
connect(ICore::instance(), SIGNAL(coreAboutToClose()), this, SLOT(onCoreAboutToClose()));
// EditorManager
connect(editorManager, SIGNAL(editorAboutToClose(Core::IEditor*)),
@@ -1024,9 +1023,7 @@ void FakeVimPluginPrivate::userActionTriggered()
if (!key)
return;
QString cmd = userCommandMap().value(key);
Core::ICore *core = Core::ICore::instance();
EditorManager *editorManager = core->editorManager();
IEditor *editor = editorManager->currentEditor();
IEditor *editor = ICore::editorManager()->currentEditor();
FakeVimHandler *handler = m_editorToHandler[editor];
if (handler)
handler->handleInput(cmd);
@@ -1040,7 +1037,7 @@ static const char idKey[] = "Command";
void FakeVimPluginPrivate::writeSettings()
{
QSettings *settings = ICore::instance()->settings();
QSettings *settings = ICore::settings();
theFakeVimSettings()->writeSettings(settings);
@@ -1088,7 +1085,7 @@ void FakeVimPluginPrivate::writeSettings()
void FakeVimPluginPrivate::readSettings()
{
QSettings *settings = ICore::instance()->settings();
QSettings *settings = ICore::settings();
theFakeVimSettings()->readSettings(settings);
@@ -1134,14 +1131,14 @@ void FakeVimPluginPrivate::maybeReadVimRc()
void FakeVimPluginPrivate::showSettingsDialog()
{
ICore::instance()->showOptionsDialog(
ICore::showOptionsDialog(
_(Constants::SETTINGS_CATEGORY),
_(Constants::SETTINGS_ID));
}
void FakeVimPluginPrivate::triggerAction(const Id &id)
{
Core::ActionManager *am = ICore::instance()->actionManager();
Core::ActionManager *am = ICore::actionManager();
QTC_ASSERT(am, return);
Core::Command *cmd = am->command(id);
QTC_ASSERT(cmd, qDebug() << "UNKNOWN CODE: " << id.name(); return);
@@ -1152,7 +1149,7 @@ void FakeVimPluginPrivate::triggerAction(const Id &id)
void FakeVimPluginPrivate::setActionChecked(const Id &id, bool check)
{
Core::ActionManager *am = ICore::instance()->actionManager();
Core::ActionManager *am = ICore::actionManager();
QTC_ASSERT(am, return);
Core::Command *cmd = am->command(id);
QTC_ASSERT(cmd, return);
@@ -1260,7 +1257,7 @@ void FakeVimPluginPrivate::windowCommand(int key)
void FakeVimPluginPrivate::moveSomewhere(DistFunction f)
{
EditorManager *editorManager = ICore::instance()->editorManager();
EditorManager *editorManager = ICore::editorManager();
IEditor *editor = editorManager->currentEditor();
QWidget *w = editor->widget();
QPlainTextEdit *pe =
@@ -1500,7 +1497,7 @@ void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
const QString fileName = handler->currentFileName();
if (editor && editor->file()->fileName() == fileName) {
// Handle that as a special case for nicer interaction with core
Core::ICore::instance()->fileManager()->saveFile(editor->file());
ICore::fileManager()->saveFile(editor->file());
// Check result by reading back.
QFile file3(fileName);
file3.open(QIODevice::ReadOnly);
@@ -1515,7 +1512,7 @@ void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
}
} else if (cmd.matches("wa", "wall")) {
// :w[all]
FileManager *fm = ICore::instance()->fileManager();
FileManager *fm = ICore::fileManager();
QList<IFile *> toSave = fm->modifiedFiles();
QList<IFile *> failed = fm->saveModifiedFilesSilently(toSave);
if (failed.isEmpty())
@@ -1592,7 +1589,7 @@ void FakeVimPluginPrivate::handleDelayedQuit(bool forced, Core::IEditor *editor)
{
// This tries to simulate vim behaviour. But the models of vim and
// Qt Creator core do not match well...
EditorManager *editorManager = ICore::instance()->editorManager();
EditorManager *editorManager = ICore::editorManager();
if (editorManager->hasSplitter()) {
triggerAction(Core::Constants::REMOVE_CURRENT_SPLIT);
} else {
@@ -1605,7 +1602,7 @@ void FakeVimPluginPrivate::handleDelayedQuit(bool forced, Core::IEditor *editor)
void FakeVimPluginPrivate::handleDelayedQuitAll(bool forced)
{
triggerAction(Core::Constants::REMOVE_ALL_SPLITS);
ICore::instance()->editorManager()->closeAllEditors(!forced);
ICore::editorManager()->closeAllEditors(!forced);
}
void FakeVimPluginPrivate::moveToMatchingParenthesis(bool *moved, bool *forward,
@@ -1711,7 +1708,7 @@ void FakeVimPluginPrivate::changeSelection
int FakeVimPluginPrivate::currentFile() const
{
EditorManager *editorManager = ICore::instance()->editorManager();
EditorManager *editorManager = ICore::editorManager();
OpenEditorsModel *model = editorManager->openedEditorsModel();
IEditor *editor = editorManager->currentEditor();
return model->indexOf(editor).row();
@@ -1719,7 +1716,7 @@ int FakeVimPluginPrivate::currentFile() const
void FakeVimPluginPrivate::switchToFile(int n)
{
EditorManager *editorManager = ICore::instance()->editorManager();
EditorManager *editorManager = ICore::editorManager();
Core::OpenEditorsModel *model = editorManager->openedEditorsModel();
int size = model->rowCount();
QTC_ASSERT(size, return);
src/plugins/find/findplugin.cpp
+4 -4
View File
@@ -196,7 +196,7 @@ void FindPlugin::openFindDialog(IFindFilter *filter)
void FindPlugin::setupMenu()
{
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::ActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT);
Core::ActionContainer *mfind = am->createMenu(Constants::M_FIND);
medit->addMenu(mfind, Core::Constants::G_EDIT_FIND);
@@ -230,7 +230,7 @@ void FindPlugin::setupMenu()
void FindPlugin::setupFilterMenuItems()
{
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
QList<IFindFilter*> findInterfaces =
ExtensionSystem::PluginManager::instance()->getObjects<IFindFilter>();
Core::Command *cmd;
@@ -302,7 +302,7 @@ bool FindPlugin::hasFindFlag(Find::FindFlag flag)
void FindPlugin::writeSettings()
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String("Find"));
settings->setValue(QLatin1String("Backward"), hasFindFlag(Find::FindBackward));
settings->setValue(QLatin1String("CaseSensitively"), hasFindFlag(Find::FindCaseSensitively));
@@ -317,7 +317,7 @@ void FindPlugin::writeSettings()
void FindPlugin::readSettings()
{
QSettings *settings = Core::ICore::instance()->settings();
QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String("Find"));
bool block = blockSignals(true);
setBackward(settings->value(QLatin1String("Backward"), false).toBool());

Some files were not shown because too many files have changed in this diff Show More