10 files changed, 15 insertions, 21 deletions

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 59b8e9b142..dbe3a5c9e7 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -855,7 +855,7 @@ AndroidConfigurations &AndroidConfigurations::instance(QObject *parent)
 
 void AndroidConfigurations::save()
 {
-    QSettings *settings = Core::ICore::instance()->settings();
+    QSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_config.save(*settings);
     settings->endGroup();
@@ -874,7 +874,7 @@ AndroidConfigurations::AndroidConfigurations(QObject *parent)
 void AndroidConfigurations::load()
 {
     bool saveSettings = false;
-    QSettings *settings = Core::ICore::instance()->settings();
+    QSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_config = AndroidConfig(*settings);
 
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index 67f7ab10e1..e337acd361 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -908,7 +908,7 @@ void AndroidPackageCreationStep::certificatePassword()
 
 void AndroidPackageCreationStep::showInGraphicalShell()
 {
-    Core::FileUtils::showInGraphicalShell(Core::ICore::instance()->mainWindow(), m_apkPathSigned.toString());
+    Core::FileUtils::showInGraphicalShell(Core::ICore::mainWindow(), m_apkPathSigned.toString());
 }
 
 void AndroidPackageCreationStep::raiseError(const QString &shortMsg,
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 2cdc2511bf..8f57b95117 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -287,23 +287,18 @@
 
 #include <utils/hostosinfo.h>
 
-#include <QDir>
 #include <QCoreApplication>
 #include <QDebug>
-
+#include <QDir>
 #include <QStatusBar>
 
+using namespace Core::Internal;
+
 namespace Core {
 
 // The Core Singleton
 static ICore *m_instance = 0;
-
-namespace Internal {
 static MainWindow *m_mainwindow;
-} // namespace Internal
-
-using namespace Core::Internal;
-
 
 ICore *ICore::instance()
 {
diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp
index 2ec682dfa3..27f84d55be 100644
--- a/src/plugins/git/gerrit/gerritdialog.cpp
+++ b/src/plugins/git/gerrit/gerritdialog.cpp
@@ -233,7 +233,7 @@ void GerritDialog::updateCompletions(const QString &query)
     queries.removeAll(query);
     queries.prepend(query);
     m_queryModel->setStringList(queries);
-    m_parameters->saveQueries(Core::ICore::instance()->settings());
+    m_parameters->saveQueries(Core::ICore::settings());
 }
 
 GerritDialog::~GerritDialog()
diff --git a/src/plugins/git/gerrit/gerritoptionspage.cpp b/src/plugins/git/gerrit/gerritoptionspage.cpp
index 70c6174335..456b1edf6d 100644
--- a/src/plugins/git/gerrit/gerritoptionspage.cpp
+++ b/src/plugins/git/gerrit/gerritoptionspage.cpp
@@ -73,7 +73,7 @@ void GerritOptionsPage::apply()
             else
                 newParameters.setPortFlagBySshType();
             *m_parameters = newParameters;
-            m_parameters->toSettings(Core::ICore::instance()->settings());
+            m_parameters->toSettings(Core::ICore::settings());
         }
     }
 }
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index 81f5f880a0..df424fb368 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -273,7 +273,7 @@ GerritPlugin::~GerritPlugin()
 
 bool GerritPlugin::initialize(ActionContainer *ac)
 {
-    m_parameters->fromSettings(ICore::instance()->settings());
+    m_parameters->fromSettings(ICore::settings());
 
     QAction *openViewAction = new QAction(tr("Gerrit..."), this);
 
@@ -364,7 +364,7 @@ void GerritPlugin::openView()
             QMessageBox::warning(0, tr("Error"),
                     tr("Invalid Gerrit configuration. Host, user and ssh binary are mandatory."));
             const Id group = VcsBase::Constants::VCS_SETTINGS_CATEGORY;
-            if (!ICore::instance()->showOptionsDialog(group, "Gerrit"))
+            if (!ICore::showOptionsDialog(group, "Gerrit"))
                 return;
         }
         GerritDialog *gd = new GerritDialog(m_parameters, ICore::mainWindow());
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 8e9c9fff6c..0bc0ffdba0 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -100,8 +100,8 @@ QmlJSEditorPlugin::QmlJSEditorPlugin() :
     m_reformatFileAction(0),
     m_currentEditor(0),
     m_jsonManager(new Utils::JsonSchemaManager(
-            QStringList() << Core::ICore::instance()->userResourcePath() + QLatin1String("/json/")
-                          << Core::ICore::instance()->resourcePath() + QLatin1String("/json/")))
+            QStringList() << Core::ICore::userResourcePath() + QLatin1String("/json/")
+                          << Core::ICore::resourcePath() + QLatin1String("/json/")))
 {
     m_instance = this;
 }
diff --git a/src/plugins/qmlprojectmanager/qmlapp.cpp b/src/plugins/qmlprojectmanager/qmlapp.cpp
index edffa2c3ed..fd3998a08a 100644
--- a/src/plugins/qmlprojectmanager/qmlapp.cpp
+++ b/src/plugins/qmlprojectmanager/qmlapp.cpp
@@ -52,7 +52,7 @@ static QStringList binaryFiles()
 
 QString QmlApp::templateRootDirectory()
 {
-    return Core::ICore::instance()->resourcePath() + QLatin1String("/templates/qml/");
+    return Core::ICore::resourcePath() + QLatin1String("/templates/qml/");
 }
 
 TemplateInfo::TemplateInfo()
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index fc43e5e053..350bd821bb 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -619,7 +619,7 @@ void TargetSetupPage::updateVisibility()
 
 void TargetSetupPage::openOptions()
 {
-    Core::ICore::instance()->showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
+    Core::ICore::showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
                                                ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID,
                                                this);
 }
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 98320aa3d6..0dc48d4d97 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -376,8 +376,7 @@ QStringList BaseFileFind::replaceAll(const QString &text,
 
     // Query the user for permissions
     if (!roFiles.isEmpty()) {
-        Core::Internal::ReadOnlyFilesDialog roDialog(roFiles.toList(),
-                                                     ICore::instance()->mainWindow());
+        Core::Internal::ReadOnlyFilesDialog roDialog(roFiles.toList(), ICore::mainWindow());
         roDialog.setShowFailWarning(true, tr("Aborting replace."));
         if (roDialog.exec() == Core::Internal::ReadOnlyFilesDialog::RO_Cancel)
             return QStringList();