From 776fd73e30f202c133e88a8b97fb3758a2480664 Mon Sep 17 00:00:00 2001
From: hjk <qthjk@ovi.com>
Date: Tue, 14 Aug 2012 17:54:01 +0200
Subject: [PATCH] debugger: don't store active languages twice
Change-Id: I6517b42b4cfd0d2d919fa2971c3ea0995443cbf3
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/cdb/cdbengine.cpp | 2 +-
src/plugins/debugger/debuggerengine.cpp | 17 ++---------------
src/plugins/debugger/debuggerengine.h | 3 ---
src/plugins/debugger/debuggerplugin.cpp | 4 ++--
src/plugins/debugger/gdb/gdbengine.cpp | 2 +-
src/plugins/debugger/lldb/ipcenginehost.cpp | 2 +-
src/plugins/debugger/pdb/pdbengine.cpp | 2 +-
src/plugins/debugger/qml/qmlcppengine.cpp | 2 +-
src/plugins/debugger/qml/qmlengine.cpp | 2 +-
src/plugins/debugger/script/scriptengine.cpp | 2 +-
10 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 343967874cc..1904c20f578 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -428,7 +428,7 @@ static inline Utils::SavedAction *theAssemblerAction()
CdbEngine::CdbEngine(const DebuggerStartParameters &sp,
DebuggerEngine *masterEngine, const OptionsPtr &options) :
- DebuggerEngine(sp, CppLanguage, masterEngine),
+ DebuggerEngine(sp, masterEngine),
m_creatorExtPrefix("<qtcreatorcdbext>|"),
m_tokenPrefix("<token>"),
m_options(options),
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 969474966bf..4c4021ecd37 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -155,13 +155,11 @@ class DebuggerEnginePrivate : public QObject
public:
DebuggerEnginePrivate(DebuggerEngine *engine,
DebuggerEngine *masterEngine,
- DebuggerLanguages languages,
const DebuggerStartParameters &sp)
: m_engine(engine),
m_masterEngine(masterEngine),
m_runControl(0),
m_startParameters(sp),
- m_languages(languages),
m_state(DebuggerNotReady),
m_lastGoodState(DebuggerNotReady),
m_targetState(DebuggerNotReady),
@@ -183,8 +181,6 @@ public:
connect(&m_locationTimer, SIGNAL(timeout()), SLOT(resetLocation()));
}
- ~DebuggerEnginePrivate() {}
-
public slots:
void doSetupEngine();
void doSetupInferior();
@@ -282,7 +278,6 @@ public:
DebuggerRunControl *m_runControl; // Not owned.
DebuggerStartParameters m_startParameters;
- DebuggerLanguages m_languages;
// The current state.
DebuggerState m_state;
@@ -336,12 +331,9 @@ public:
//////////////////////////////////////////////////////////////////////
DebuggerEngine::DebuggerEngine(const DebuggerStartParameters &startParameters,
- DebuggerLanguages languages,
DebuggerEngine *parentEngine)
- : d(new DebuggerEnginePrivate(this, parentEngine, languages, startParameters))
-{
- d->m_inferiorPid = 0;
-}
+ : d(new DebuggerEnginePrivate(this, parentEngine, startParameters))
+{}
DebuggerEngine::~DebuggerEngine()
{
@@ -1277,11 +1269,6 @@ DebuggerEngine *DebuggerEngine::masterEngine() const
return d->m_masterEngine;
}
-DebuggerLanguages DebuggerEngine::languages() const
-{
- return d->m_languages;
-}
-
QString DebuggerEngine::toFileInProject(const QUrl &fileUrl)
{
// make sure file finder is properly initialized
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 2b7fdbdc0e3..b87c7b5f6ef 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -140,7 +140,6 @@ class DEBUGGER_EXPORT DebuggerEngine : public QObject
public:
explicit DebuggerEngine(const DebuggerStartParameters &sp,
- DebuggerLanguages languages,
DebuggerEngine *parentEngine = 0);
virtual ~DebuggerEngine();
@@ -266,8 +265,6 @@ public:
bool isMasterEngine() const;
DebuggerEngine *masterEngine() const;
- DebuggerLanguages languages() const;
-
virtual bool setupQmlStep(bool /*on*/) { return false; }
virtual void readyToExecuteQmlStep() {}
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 0fe1bf0e5fd..b6c6ea57459 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -479,7 +479,7 @@ class DummyEngine : public DebuggerEngine
Q_OBJECT
public:
- DummyEngine() : DebuggerEngine(DebuggerStartParameters(), AnyLanguage) {}
+ DummyEngine() : DebuggerEngine(DebuggerStartParameters()) {}
~DummyEngine() {}
void setupEngine() {}
@@ -2002,7 +2002,7 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
engine->watchHandler()->rebuildModel();
- mainWindow()->setEngineDebugLanguages(engine->languages());
+ mainWindow()->setEngineDebugLanguages(engine->startParameters().languages);
mainWindow()->setCurrentEngine(engine);
}
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 8d3dab54ce4..30da068c8c3 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -238,7 +238,7 @@ private:
GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters,
DebuggerEngine *masterEngine)
- : DebuggerEngine(startParameters, CppLanguage, masterEngine)
+ : DebuggerEngine(startParameters, masterEngine)
{
setObjectName(_("GdbEngine"));
diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp
index d0046a2b880..31e2b5321c9 100644
--- a/src/plugins/debugger/lldb/ipcenginehost.cpp
+++ b/src/plugins/debugger/lldb/ipcenginehost.cpp
@@ -64,7 +64,7 @@ namespace Debugger {
namespace Internal {
IPCEngineHost::IPCEngineHost (const DebuggerStartParameters &startParameters)
- : DebuggerEngine(startParameters, CppLanguage)
+ : DebuggerEngine(startParameters)
, m_localGuest(0)
, m_nextMessagePayloadSize(0)
, m_cookie(1)
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 7f2c0426c2b..58c348e00a3 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -88,7 +88,7 @@ namespace Internal {
///////////////////////////////////////////////////////////////////////
PdbEngine::PdbEngine(const DebuggerStartParameters &startParameters)
- : DebuggerEngine(startParameters, AnyLanguage)
+ : DebuggerEngine(startParameters)
{
setObjectName(QLatin1String("PdbEngine"));
}
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index cba83a2e439..b3577998e42 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -110,7 +110,7 @@ QmlCppEnginePrivate::QmlCppEnginePrivate(QmlCppEngine *parent,
QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp,
DebuggerEngineType slaveEngineType,
QString *errorMessage)
- : DebuggerEngine(sp, DebuggerLanguages(CppLanguage) | QmlLanguage), d(new QmlCppEnginePrivate(this, sp))
+ : DebuggerEngine(sp), d(new QmlCppEnginePrivate(this, sp))
{
setObjectName(QLatin1String("QmlCppEngine"));
d->m_cppEngine = DebuggerRunControlFactory::createEngine(slaveEngineType, sp, this, errorMessage);
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 8c68ecc8050..e4530f464d3 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -268,7 +268,7 @@ public:
QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters,
DebuggerEngine *masterEngine)
- : DebuggerEngine(startParameters, QmlLanguage, masterEngine)
+ : DebuggerEngine(startParameters, masterEngine)
, m_adapter(this)
, m_inspectorAdapter(&m_adapter, this)
, m_retryOnConnectFail(false)
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index e1cc8d0e155..2d6b9d5da38 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -203,7 +203,7 @@ void ScriptAgent::scriptUnload(qint64 scriptId)
///////////////////////////////////////////////////////////////////////
ScriptEngine::ScriptEngine(const DebuggerStartParameters &startParameters)
- : DebuggerEngine(startParameters, AnyLanguage)
+ : DebuggerEngine(startParameters)
{
setObjectName(QLatin1String("ScriptEngine"));
}
--
GitLab