diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index d87ab4bb036c8b23924a06fb97540a202fb74b01..b7dc0a1be196d6cf9642a7afa0a53e35bd057633 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -133,7 +133,7 @@ HEADERS += mainwindow.h \ scriptmanager/metatypedeclarations.h \ scriptmanager/qworkbench_wrapper.h \ scriptmanager/scriptmanagerinterface.h \ - scriptmanager/scriptmanager.h \ + scriptmanager/scriptmanager_p.h \ core_global.h \ basemode.h \ baseview.h \ diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index ce1517194942c1a1ad06fdcb2c0961f112303637..a2c264b2263cd19a166e2c753512ccc35e651680 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -54,7 +54,7 @@ #include "shortcutsettings.h" #include "vcsmanager.h" -#include "scriptmanager.h" +#include "scriptmanager_p.h" #include "settingsdialog.h" #include "stylehelper.h" #include "variablemanager.h" @@ -119,7 +119,7 @@ MainWindow::MainWindow() : m_editorManager(0), m_fileManager(new FileManager(m_coreImpl, this)), m_progressManager(new ProgressManagerPrivate()), - m_scriptManager(new ScriptManager(this, m_coreImpl)), + m_scriptManager(new ScriptManagerPrivate(this, m_coreImpl)), 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 084888c4dd2dc1228f9c16a4cdeab556ec9dfc39..8e18fa9a85261995b7315b6180622b0a731f9913 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp @@ -31,7 +31,7 @@ ** ***************************************************************************/ -#include "scriptmanager.h" +#include "scriptmanager_p.h" #include "qworkbench_wrapper.h" #include "metatypedeclarations.h" @@ -177,19 +177,19 @@ static QScriptValue fileBox(QScriptContext *context, QScriptEngine *engine) engine->toScriptValue(rc) : engine->toScriptValue(rc.front()); } -// ------ ScriptManager +// ------ ScriptManagerPrivate namespace Core { namespace Internal { -ScriptManager::ScriptManager(QObject *parent, ICore *core) : +ScriptManagerPrivate::ScriptManagerPrivate(QObject *parent, ICore *core) : ScriptManagerInterface(parent), m_core(core), m_initialized(false) { } -QScriptEngine &ScriptManager::scriptEngine() +QScriptEngine &ScriptManagerPrivate::scriptEngine() { ensureEngineInitialized(); return m_engine; @@ -200,7 +200,7 @@ QScriptEngine &ScriptManager::scriptEngine() // demoProjectExplorer()@:237 // <anonymous>()@:276 // <global>()@:0" -static void parseBackTrace(const QStringList &backTrace, ScriptManager::Stack &stack) +static void parseBackTrace(const QStringList &backTrace, ScriptManagerPrivate::Stack &stack) { const QChar at = QLatin1Char('@'); const QChar colon = QLatin1Char(':'); @@ -213,7 +213,7 @@ static void parseBackTrace(const QStringList &backTrace, ScriptManager::Stack &s if (colonPos == -1) continue; - ScriptManager::StackFrame frame; + ScriptManagerPrivate::StackFrame frame; frame.function = line.left(atPos); frame.fileName = line.mid(atPos + 1, colonPos - atPos - 1); frame.lineNumber = line.right(line.size() - colonPos - 1).toInt(); @@ -221,13 +221,13 @@ static void parseBackTrace(const QStringList &backTrace, ScriptManager::Stack &s } } -bool ScriptManager::runScript(const QString &script, QString *errorMessage) +bool ScriptManagerPrivate::runScript(const QString &script, QString *errorMessage) { Stack stack; return runScript(script, errorMessage, &stack); } -bool ScriptManager::runScript(const QString &script, QString *errorMessage, Stack *stack) +bool ScriptManagerPrivate::runScript(const QString &script, QString *errorMessage, Stack *stack) { ensureEngineInitialized(); stack->clear(); @@ -247,7 +247,7 @@ bool ScriptManager::runScript(const QString &script, QString *errorMessage, Stac return !failed; } -void ScriptManager::ensureEngineInitialized() +void ScriptManagerPrivate::ensureEngineInitialized() { if (m_initialized) return; @@ -304,7 +304,7 @@ void ScriptManager::ensureEngineInitialized() m_initialized = true; } -QString ScriptManager::engineError(QScriptEngine &scriptEngine) +QString ScriptManagerPrivate::engineError(QScriptEngine &scriptEngine) { QScriptValue error = scriptEngine.evaluate(QLatin1String("Error")); if (error.isValid()) diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.h b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h similarity index 90% rename from src/plugins/coreplugin/scriptmanager/scriptmanager.h rename to src/plugins/coreplugin/scriptmanager/scriptmanager_p.h index 305da45ca3ad282478172232312386ac04e567d7..ab4a2276e4de33bcf6c57dd84d356c52b6ca818b 100644 --- a/src/plugins/coreplugin/scriptmanager/scriptmanager.h +++ b/src/plugins/coreplugin/scriptmanager/scriptmanager_p.h @@ -31,8 +31,8 @@ ** ***************************************************************************/ -#ifndef SCRIPTMANAGER_H -#define SCRIPTMANAGER_H +#ifndef SCRIPTMANAGER_P_H +#define SCRIPTMANAGER_P_H #include <coreplugin/scriptmanager/scriptmanagerinterface.h> #include <coreplugin/icore.h> @@ -44,12 +44,12 @@ namespace Core { namespace Internal { -class ScriptManager : public Core::ScriptManagerInterface +class ScriptManagerPrivate : public Core::ScriptManagerInterface { Q_OBJECT public: - ScriptManager(QObject *parent, ICore *core); + ScriptManagerPrivate(QObject *parent, ICore *core); virtual QScriptEngine &scriptEngine(); @@ -69,4 +69,4 @@ private: } // namespace Internal } // namespace Core -#endif // SCRIPTMANAGER_H +#endif // SCRIPTMANAGER_P_H