Merge commit 'origin/master'

6 files changed, 18 insertions, 30 deletions

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 77092e343e..e4bedc5bd0 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -361,7 +361,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
             this, SLOT(updateActions()));
     connect(this, SIGNAL(currentEditorChanged(Core::IEditor*)),
             this, SLOT(updateEditorHistory()));
-    m_d->m_splitter = new EditorSplitter(m_d->m_core);
+    m_d->m_splitter = new EditorSplitter;
     connect(m_d->m_splitter, SIGNAL(closeRequested(Core::IEditor *)),
             this, SLOT(closeEditor(Core::IEditor *)));
     connect(m_d->m_splitter, SIGNAL(editorGroupsChanged()),
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
index 5ff9832ec0..0b02e14d73 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
@@ -51,10 +51,9 @@
 using namespace Core;
 using namespace Core::Internal;
 
-EditorSplitter::EditorSplitter(ICore *core, QWidget *parent)
+EditorSplitter::EditorSplitter(QWidget *parent)
   : QWidget(parent),
-    m_curGroup(0),
-    m_core(core)
+    m_curGroup(0)
 {
     registerActions();
     createRootGroup();
@@ -69,9 +68,9 @@ void EditorSplitter::registerActions()
 {
     QList<int> gc = QList<int>() << Constants::C_GLOBAL_ID;
     const QList<int> editorManagerContext =
-            QList<int>() << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER);
+            QList<int>() << ICore::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER);
 
-    ActionManager *am = m_core->actionManager();
+    ActionManager *am = ICore::instance()->actionManager();
     ActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW);
     Command *cmd;
 
@@ -538,13 +537,13 @@ QWidget *EditorSplitter::recreateGroupTree(QWidget *node)
 
 void EditorSplitter::saveCurrentLayout()
 {
-    QSettings *settings = m_core->settings();
+    QSettings *settings = ICore::instance()->settings();
     settings->setValue("EditorManager/Splitting", saveState());
 }
 
 void EditorSplitter::restoreDefaultLayout()
 {
-    QSettings *settings = m_core->settings();
+    QSettings *settings = ICore::instance()->settings();
     if (settings->contains("EditorManager/Splitting"))
         restoreState(settings->value("EditorManager/Splitting").toByteArray());
 }
@@ -656,12 +655,12 @@ EditorGroup *EditorSplitter::createGroup()
             this, SLOT(updateActions()));
     connect(group, SIGNAL(editorAdded(Core::IEditor *)),
             this, SLOT(updateActions()));
-    m_core->addContextObject(group->contextObject());
+    ICore::instance()->addContextObject(group->contextObject());
     return group;
 }
 
 void EditorSplitter::deleteGroup(EditorGroup *group)
 {
-    m_core->removeContextObject(group->contextObject());
+    ICore::instance()->removeContextObject(group->contextObject());
     delete group;
 }
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.h b/src/plugins/coreplugin/editormanager/editorsplitter.h
index 94aac2df23..aeff22a2ed 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.h
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.h
@@ -45,7 +45,6 @@
 namespace Core {
 
 class EditorGroup;
-class ICore;
 class IEditor;
 
 namespace Internal {
@@ -55,7 +54,7 @@ class EditorSplitter : public QWidget
     Q_OBJECT
 
 public:
-    EditorSplitter(ICore *core, QWidget *parent = 0);
+    explicit EditorSplitter(QWidget *parent = 0);
     ~EditorSplitter();
 
     void setCurrentGroup(Core::EditorGroup *group);
@@ -114,7 +113,6 @@ private:
 
     QWidget *m_root;
     EditorGroup *m_curGroup;
-    ICore *m_core;
 
     QAction *m_horizontalSplitAction;
     QAction *m_verticalSplitAction;
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 97648813d0..91c2756d31 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -120,7 +120,7 @@ MainWindow::MainWindow() :
     m_editorManager(0),
     m_fileManager(new FileManager(this)),
     m_progressManager(new ProgressManagerPrivate()),
-    m_scriptManager(new ScriptManagerPrivate(this, m_coreImpl)),
+    m_scriptManager(new ScriptManagerPrivate(this)),
     m_variableManager(new VariableManager(this)),
     m_vcsManager(new VCSManager()),
     m_viewManager(0),
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index 937af4f66a..74f04c2a46 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
@@ -181,10 +181,8 @@ static QScriptValue fileBox(QScriptContext *context, QScriptEngine *engine)
 namespace Core {
 namespace Internal {
 
-ScriptManagerPrivate::ScriptManagerPrivate(QObject *parent, ICore *core)  :
-    ScriptManager(parent),
-    m_core(core),
-    m_initialized(false)
+ScriptManagerPrivate::ScriptManagerPrivate(QObject *parent)
+   : ScriptManager(parent), m_initialized(false)
 {
 }
 
@@ -250,7 +248,6 @@ void ScriptManagerPrivate::ensureEngineInitialized()
 {
     if (m_initialized)
         return;
-    QTC_ASSERT(m_core, return);
     // register QObjects that occur as properties
     SharedTools::registerQObject<QMainWindow>(m_engine);
     SharedTools::registerQObject<QStatusBar>(m_engine);
@@ -274,7 +271,7 @@ void ScriptManagerPrivate::ensureEngineInitialized()
 //    SharedTools::registerQObjectInterface<Core::ICore, CorePrototype>(m_engine);
 
     // Make "core" available
-    m_engine.globalObject().setProperty(QLatin1String("core"), qScriptValueFromValue(&m_engine, m_core));
+    m_engine.globalObject().setProperty(QLatin1String("core"), qScriptValueFromValue(&m_engine, Core::ICore::instance()));
 
     // CLASSIC:  registerInterfaceWithDefaultPrototype<Core::MessageManager, MessageManagerPrototype>(m_engine);
 
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
index e05778a832..b8acddf90d 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
@@ -37,13 +37,9 @@
 #include <coreplugin/scriptmanager/scriptmanager.h>
 
 #include <QtCore/QObject>
-#include <QtCore/QList>
 #include <QtScript/QScriptEngine>
 
 namespace Core {
-
-class ICore;
-
 namespace Internal {
 
 class ScriptManagerPrivate : public Core::ScriptManager
@@ -51,12 +47,11 @@ class ScriptManagerPrivate : public Core::ScriptManager
     Q_OBJECT
 
 public:
-    ScriptManagerPrivate(QObject *parent, ICore *core);
-
-    virtual QScriptEngine &scriptEngine();
+    explicit ScriptManagerPrivate(QObject *parent);
 
-    virtual bool runScript(const QString &script, QString *errorMessage, Stack *stack);
-    virtual bool runScript(const QString &script, QString *errorMessage);
+    QScriptEngine &scriptEngine();
+    bool runScript(const QString &script, QString *errorMessage, Stack *stack);
+    bool runScript(const QString &script, QString *errorMessage);
 
     static QString engineError(QScriptEngine &scriptEngine);
 
@@ -64,7 +59,6 @@ private:
     void ensureEngineInitialized();
 
     QScriptEngine m_engine;
-    ICore *m_core;
     bool m_initialized;
 };