From 1688d1e1c7af6d8a431dedb1042d4f15c55fd12b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 18 Nov 2010 17:35:22 +0100
Subject: [PATCH] debugger: remove unused DebuggerEngine::{set,is}Active
---
src/plugins/debugger/debuggerengine.cpp | 13 -------------
src/plugins/debugger/debuggerengine.h | 2 --
src/plugins/debugger/debuggerplugin.cpp | 12 +++---------
3 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 6b0a80f385d..a8178820ac2 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -181,7 +181,6 @@ public:
DebuggerEnginePrivate(DebuggerEngine *engine, const DebuggerStartParameters &sp)
: m_engine(engine),
m_runControl(0),
- m_isActive(false),
m_startParameters(sp),
m_state(DebuggerNotReady),
m_lastGoodState(DebuggerNotReady),
@@ -247,7 +246,6 @@ public:
DebuggerEngine *m_engine; // Not owned.
DebuggerRunControl *m_runControl; // Not owned.
- bool m_isActive;
DebuggerStartParameters m_startParameters;
@@ -1083,17 +1081,6 @@ bool DebuggerEngine::isReverseDebugging() const
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.
void DebuggerEngine::quitDebugger()
{
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 71d2efe20ee..116781597e7 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -268,8 +268,6 @@ public:
void notifyInferiorPid(qint64 pid);
qint64 inferiorPid() 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);
// Convenience
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 6e8458d5209..00fb6463d18 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -868,7 +868,7 @@ public:
~DebuggerPluginPrivate();
bool initialize(const QStringList &arguments, QString *errorMessage);
- void connectEngine(DebuggerEngine *engine, bool notify = true);
+ void connectEngine(DebuggerEngine *engine);
void disconnectEngine() { connectEngine(0); }
DebuggerEngine *currentEngine() const { return m_currentEngine; }
@@ -1959,7 +1959,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
SLOT(languagesChanged(Debugger::DebuggerLanguages)));
setInitialState();
- connectEngine(0, false);
+ connectEngine(0);
connect(sessionManager(),
SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
@@ -2446,7 +2446,7 @@ public:
};
-void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine, bool notify)
+void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
{
static DummyEngine dummyEngine;
@@ -2458,9 +2458,6 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine, bool notify)
m_currentEngine = engine;
- if (notify)
- engine->setActive(false);
-
m_localsWindow->setModel(engine->localsModel());
m_modulesWindow->setModel(engine->modulesModel());
m_registerWindow->setModel(engine->registerModel());
@@ -2471,9 +2468,6 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine, bool notify)
m_threadBox->setModel(engine->threadsModel());
m_threadBox->setModelColumn(ThreadData::NameColumn);
m_watchersWindow->setModel(engine->watchersModel());
-
- if (notify)
- engine->setActive(true);
}
static void changeFontSize(QWidget *widget, qreal size)
--
GitLab