From 5b97ddd3e4ad4a6d44f0d055e7ec5d91b46612b9 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 13 Jan 2009 16:43:11 +0100
Subject: [PATCH] Fixes: - ScriptManagerInterface --> ScriptManager
---
src/plugins/coreplugin/coreimpl.cpp | 2 +-
src/plugins/coreplugin/coreimpl.h | 2 +-
src/plugins/coreplugin/coreplugin.pro | 2 +-
src/plugins/coreplugin/icore.cpp | 2 +-
src/plugins/coreplugin/icore.h | 4 ++--
src/plugins/coreplugin/mainwindow.cpp | 2 +-
src/plugins/coreplugin/mainwindow.h | 6 +++---
.../coreplugin/scriptmanager/scriptmanager.cpp | 2 +-
.../{scriptmanagerinterface.h => scriptmanager.h} | 12 ++++++------
.../coreplugin/scriptmanager/scriptmanager_p.h | 4 ++--
.../qtscripteditor/qtscripteditoractionhandler.cpp | 4 ++--
11 files changed, 21 insertions(+), 21 deletions(-)
rename src/plugins/coreplugin/scriptmanager/{scriptmanagerinterface.h => scriptmanager.h} (89%)
diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp
index 8d500dcd8e7..4ac2f0d7381 100644
--- a/src/plugins/coreplugin/coreimpl.cpp
+++ b/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();
}
diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h
index 01c29e4656d..f658a90ee4f 100644
--- a/src/plugins/coreplugin/coreimpl.h
+++ b/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;
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index b7dc0a1be19..3823b96e45a 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/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 \
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 5cdc3733dd0..e5c84fe17a3 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -106,7 +106,7 @@
*/
/*!
- \fn ScriptManagerInterface *ICore::scriptManager() const
+ \fn ScriptManager *ICore::scriptManager() const
\internal
*/
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index 4a138b4baae..d48baab7367 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/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;
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index a2c264b2263..0910e7f882e 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/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;
}
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 2fe06cd76f7..da6c3ceabf1 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/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;
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index 8e18fa9a852..3ef59d372a5 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/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)
{
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h b/src/plugins/coreplugin/scriptmanager/scriptmanager.h
similarity index 89%
rename from src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h
rename to src/plugins/coreplugin/scriptmanager/scriptmanager.h
index d8273ac9584..cc0a06816b7 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanagerinterface.h
+++ b/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
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
index ab4a2276e4d..5ab1e8d69c5 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
+++ b/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
diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
index 0ed9105c181..a33a1206158 100644
--- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp
+++ b/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;
--
GitLab