feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: remove unused DebuggerEngine::{set,is}Active

Browse Source
This commit is contained in:
hjk
2010-11-18 17:35:22 +01:00
parent ef2f7e3840
commit 1688d1e1c7
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/debuggerengine.cpp
View File

@@ -181,7 +181,6 @@ public:
DebuggerEnginePrivate(DebuggerEngine *engine, const DebuggerStartParameters &sp) DebuggerEnginePrivate(DebuggerEngine *engine, const DebuggerStartParameters &sp)
: m_engine(engine), : m_engine(engine),
m_runControl(0), m_runControl(0),
m_isActive(false),
m_startParameters(sp), m_startParameters(sp),
m_state(DebuggerNotReady), m_state(DebuggerNotReady),
m_lastGoodState(DebuggerNotReady), m_lastGoodState(DebuggerNotReady),
@@ -247,7 +246,6 @@ public:
DebuggerEngine *m_engine; // Not owned. DebuggerEngine *m_engine; // Not owned.
DebuggerRunControl *m_runControl; // Not owned. DebuggerRunControl *m_runControl; // Not owned.
bool m_isActive;
DebuggerStartParameters m_startParameters; DebuggerStartParameters m_startParameters;
@@ -1083,17 +1081,6 @@ bool DebuggerEngine::isReverseDebugging() const
return debuggerCore()->isReverseDebugging(); return debuggerCore()->isReverseDebugging();
} }
bool DebuggerEngine::isActive() const
{
return d->m_isActive;
}
void DebuggerEngine::setActive(bool on)
{
//qDebug() << "SETTING ACTIVE" << this << on;
d->m_isActive = on;
}
// Called by DebuggerRunControl. // Called by DebuggerRunControl.
void DebuggerEngine::quitDebugger() void DebuggerEngine::quitDebugger()
{ {

2
src/plugins/debugger/debuggerengine.h
View File

@@ -268,8 +268,6 @@ public:
void notifyInferiorPid(qint64 pid); void notifyInferiorPid(qint64 pid);
qint64 inferiorPid() const; qint64 inferiorPid() const;
bool isReverseDebugging() const; bool isReverseDebugging() const;
bool isActive() const; // True if this is the currently active engine;
void setActive(bool on); // FIXME: private?
void handleCommand(int role, const QVariant &value); void handleCommand(int role, const QVariant &value);
// Convenience // Convenience

12
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -868,7 +868,7 @@ public:
~DebuggerPluginPrivate(); ~DebuggerPluginPrivate();
bool initialize(const QStringList &arguments, QString *errorMessage); bool initialize(const QStringList &arguments, QString *errorMessage);
void connectEngine(DebuggerEngine *engine, bool notify = true); void connectEngine(DebuggerEngine *engine);
void disconnectEngine() { connectEngine(0); } void disconnectEngine() { connectEngine(0); }
DebuggerEngine *currentEngine() const { return m_currentEngine; } DebuggerEngine *currentEngine() const { return m_currentEngine; }
@@ -1959,7 +1959,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
SLOT(languagesChanged(Debugger::DebuggerLanguages))); SLOT(languagesChanged(Debugger::DebuggerLanguages)));
setInitialState(); setInitialState();
connectEngine(0, false); connectEngine(0);
connect(sessionManager(), connect(sessionManager(),
SIGNAL(startupProjectChanged(ProjectExplorer::Project*)), SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
@@ -2446,7 +2446,7 @@ public:
}; };
void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine, bool notify) void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
{ {
static DummyEngine dummyEngine; static DummyEngine dummyEngine;
@@ -2458,9 +2458,6 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine, bool notify)
m_currentEngine = engine; m_currentEngine = engine;
if (notify)
engine->setActive(false);
m_localsWindow->setModel(engine->localsModel()); m_localsWindow->setModel(engine->localsModel());
m_modulesWindow->setModel(engine->modulesModel()); m_modulesWindow->setModel(engine->modulesModel());
m_registerWindow->setModel(engine->registerModel()); m_registerWindow->setModel(engine->registerModel());
@@ -2471,9 +2468,6 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine, bool notify)
m_threadBox->setModel(engine->threadsModel()); m_threadBox->setModel(engine->threadsModel());
m_threadBox->setModelColumn(ThreadData::NameColumn); m_threadBox->setModelColumn(ThreadData::NameColumn);
m_watchersWindow->setModel(engine->watchersModel()); m_watchersWindow->setModel(engine->watchersModel());
if (notify)
engine->setActive(true);
} }
static void changeFontSize(QWidget *widget, qreal size) static void changeFontSize(QWidget *widget, qreal size)