debugger: don't store active languages twice

Change-Id: I6517b42b4cfd0d2d919fa2971c3ea0995443cbf3
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-08-14 17:54:01 +02:00
parent e481b1ad27
commit 776fd73e30
10 changed files with 11 additions and 27 deletions

View File

@@ -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