Fixes: - ScriptManagerInterface --> ScriptManager

src/plugins/coreplugin/coreimpl.cpp

@@ -99,7 +99,7 @@ ProgressManager *CoreImpl::progressManager() const
     return m_mainwindow->progressManager();
 }
 
-ScriptManagerInterface *CoreImpl::scriptManager() const
+ScriptManager *CoreImpl::scriptManager() const
 {
     return m_mainwindow->scriptManager();
 }

src/plugins/coreplugin/coreimpl.h

@@ -63,7 +63,7 @@ public:
     ExtensionSystem::PluginManager *pluginManager() const;
     EditorManager *editorManager() const;
     ProgressManager *progressManager() const;
-    ScriptManagerInterface *scriptManager() const;
+    ScriptManager *scriptManager() const;
     VariableManager *variableManager() const;
     VCSManager *vcsManager() const;
     ModeManager *modeManager() const;

src/plugins/coreplugin/coreplugin.pro

@@ -132,7 +132,7 @@ HEADERS += mainwindow.h \
     versiondialog.h \
     scriptmanager/metatypedeclarations.h \
     scriptmanager/qworkbench_wrapper.h \
-    scriptmanager/scriptmanagerinterface.h \
+    scriptmanager/scriptmanager.h \
     scriptmanager/scriptmanager_p.h \
     core_global.h \
     basemode.h \

src/plugins/coreplugin/icore.cpp

@@ -106,7 +106,7 @@
 */
 
 /*!
-    \fn ScriptManagerInterface *ICore::scriptManager() const
+    \fn ScriptManager *ICore::scriptManager() const
     \internal
 */
 

src/plugins/coreplugin/icore.h

@@ -58,7 +58,7 @@ class IEditor;
 class UniqueIDManager;
 class EditorManager;
 class ProgressManager;
-class ScriptManagerInterface;
+class ScriptManager;
 class VariableManager;
 class IContext;
 class VCSManager;
@@ -88,7 +88,7 @@ public:
     virtual ExtensionSystem::PluginManager *pluginManager() const = 0;
     virtual EditorManager *editorManager() const = 0;
     virtual ProgressManager *progressManager() const = 0;
-    virtual ScriptManagerInterface *scriptManager() const = 0;
+    virtual ScriptManager *scriptManager() const = 0;
     virtual VariableManager *variableManager() const = 0;
     virtual VCSManager *vcsManager() const = 0;
     virtual ModeManager *modeManager() const = 0;

src/plugins/coreplugin/mainwindow.cpp

@@ -850,7 +850,7 @@ ProgressManager *MainWindow::progressManager() const
     return m_progressManager;
 }
 
-ScriptManagerInterface *MainWindow::scriptManager() const
+ScriptManager *MainWindow::scriptManager() const
 {
      return m_scriptManager;
 }

src/plugins/coreplugin/mainwindow.h

@@ -66,7 +66,7 @@ class MimeDatabase;
 class ModeManager;
 class ProgressManager;
 class RightPaneWidget;
-class ScriptManagerInterface;
+class ScriptManager;
 class UniqueIDManager;
 class VariableManager;
 class VCSManager;
@@ -112,7 +112,7 @@ public:
     ExtensionSystem::PluginManager *pluginManager() const;
     Core::EditorManager *editorManager() const;
     Core::ProgressManager *progressManager() const;
-    Core::ScriptManagerInterface *scriptManager() const;
+    Core::ScriptManager *scriptManager() const;
     Core::VariableManager *variableManager() const;
     Core::ModeManager *modeManager() const;
     Core::MimeDatabase *mimeDatabase() const;
@@ -181,7 +181,7 @@ private:
     FileManager *m_fileManager;
     MessageManager *m_messageManager;
     ProgressManagerPrivate *m_progressManager;
-    ScriptManagerInterface *m_scriptManager;
+    ScriptManager *m_scriptManager;
     VariableManager *m_variableManager;
     VCSManager *m_vcsManager;
     ViewManager *m_viewManager;

src/plugins/coreplugin/scriptmanager/scriptmanager.cpp

@@ -183,7 +183,7 @@ namespace Core {
 namespace Internal {
 
 ScriptManagerPrivate::ScriptManagerPrivate(QObject *parent, ICore *core)  :
-    ScriptManagerInterface(parent),
+    ScriptManager(parent),
     m_core(core),
     m_initialized(false)
 {

src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h → src/plugins/coreplugin/scriptmanager/scriptmanager.h

@@ -31,8 +31,8 @@
 **
 ***************************************************************************/
 
-#ifndef SCRIPTMANAGERINTERFACE_H
-#define SCRIPTMANAGERINTERFACE_H
+#ifndef SCRIPTMANAGER_H
+#define SCRIPTMANAGER_H
 
 #include <coreplugin/core_global.h>
 
@@ -47,7 +47,7 @@ namespace Core {
  * Qt Creator's interfaces and allows for running scripts.
  * @{todo} Should it actually manage script files, too? */
 
-class CORE_EXPORT ScriptManagerInterface : public QObject
+class CORE_EXPORT ScriptManager : public QObject
 {
     Q_OBJECT
 public:
@@ -60,8 +60,8 @@ public:
     };
     typedef QList<StackFrame> Stack;
 
-    ScriptManagerInterface(QObject *parent = 0) : QObject(parent) {}
-    virtual ~ScriptManagerInterface() { }
+    ScriptManager(QObject *parent = 0) : QObject(parent) {}
+    virtual ~ScriptManager() { }
 
     // Access the engine (for plugins to wrap additional interfaces).
     virtual QScriptEngine &scriptEngine() = 0;
@@ -73,4 +73,4 @@ public:
 
 } // namespace Core
 
-#endif // SCRIPTMANAGERINTERFACE_H
+#endif // SCRIPTMANAGER_H

src/plugins/coreplugin/scriptmanager/scriptmanager_p.h

@@ -34,7 +34,7 @@
 #ifndef SCRIPTMANAGER_P_H
 #define SCRIPTMANAGER_P_H
 
-#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
+#include <coreplugin/scriptmanager/scriptmanager.h>
 #include <coreplugin/icore.h>
 
 #include <QtCore/QObject>
@@ -44,7 +44,7 @@
 namespace Core {
 namespace Internal {
 
-class ScriptManagerPrivate : public Core::ScriptManagerInterface
+class ScriptManagerPrivate : public Core::ScriptManager
 {
     Q_OBJECT
 

src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp

@@ -36,7 +36,7 @@
 #include "qtscripteditor.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/scriptmanager/scriptmanagerinterface.h>
+#include <coreplugin/scriptmanager/scriptmanager.h>
 
 #include <QtGui/QAction>
 #include <QtGui/QMessageBox>
@@ -79,7 +79,7 @@ void QtScriptEditorActionHandler::updateActions(UpdateMode um)
 
 void QtScriptEditorActionHandler::run()
 {
-    typedef Core::ScriptManagerInterface::Stack Stack;
+    typedef Core::ScriptManager::Stack Stack;
     if (!currentEditor())
         return;