From 634e4e5485a52ecfe78f33609b8035ae390c6d28 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 17 Sep 2009 14:38:15 +0200
Subject: [PATCH] debugger: cleanup
---
src/plugins/debugger/debuggermanager.cpp | 2 +-
src/plugins/debugger/debuggerrunner.cpp | 6 +++---
src/plugins/debugger/gdb/gdbengine.cpp | 2 +-
src/plugins/debugger/gdb/gdbengine.h | 2 +-
src/plugins/debugger/idebuggerengine.h | 3 ++-
src/plugins/debugger/script/scriptengine.cpp | 2 +-
src/plugins/debugger/script/scriptengine.h | 2 +-
src/plugins/debugger/tcf/tcfengine.cpp | 2 +-
src/plugins/debugger/tcf/tcfengine.h | 2 +-
9 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 43f7335147b..7779050817c 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -899,7 +899,7 @@ void DebuggerManager::exitDebugger()
emit debuggingFinished();
}
-QSharedPointer<DebuggerStartParameters> DebuggerManager::startParameters() const
+DebuggerStartParametersPtr DebuggerManager::startParameters() const
{
return m_startParameters;
}
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 6a61cbf5df1..f64b54998ba 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -85,7 +85,7 @@ RunConfigurationPtr DebuggerRunner::createDefaultRunConfiguration(const QString
RunControl *DebuggerRunner::run(RunConfigurationPtr runConfiguration,
const QString &mode,
- const QSharedPointer<DebuggerStartParameters> &sp)
+ const DebuggerStartParametersPtr &sp)
{
QTC_ASSERT(mode == ProjectExplorer::Constants::DEBUGMODE, return 0);
ApplicationRunConfigurationPtr rc =
@@ -97,7 +97,7 @@ RunControl *DebuggerRunner::run(RunConfigurationPtr runConfiguration,
RunControl *DebuggerRunner::run(RunConfigurationPtr runConfiguration,
const QString &mode)
{
- const QSharedPointer<DebuggerStartParameters> sp(new DebuggerStartParameters);
+ const DebuggerStartParametersPtr sp(new DebuggerStartParameters);
sp->startMode = StartInternal;
return run(runConfiguration, mode, sp);
}
@@ -119,7 +119,7 @@ QWidget *DebuggerRunner::configurationWidget(RunConfigurationPtr runConfiguratio
DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
- const QSharedPointer<DebuggerStartParameters> &startParameters,
+ const DebuggerStartParametersPtr &startParameters,
QSharedPointer<ApplicationRunConfiguration> runConfiguration)
: RunControl(runConfiguration),
m_startParameters(startParameters),
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 7165a6d3fd1..07d5524505a 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1543,7 +1543,7 @@ int GdbEngine::currentFrame() const
return qq->stackHandler()->currentIndex();
}
-void GdbEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> &sp)
+void GdbEngine::startDebugger(const DebuggerStartParametersPtr &sp)
{
m_startParameters = sp;
// This should be set by the constructor or in exitDebugger().
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 78ea4029a53..35ab5da73a8 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -144,7 +144,7 @@ private:
void shutdown();
void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos);
- void startDebugger(const QSharedPointer<DebuggerStartParameters> &sp);
+ void startDebugger(const DebuggerStartParametersPtr &sp);
Q_SLOT void startDebugger2();
void exitDebugger();
void exitDebugger2();
diff --git a/src/plugins/debugger/idebuggerengine.h b/src/plugins/debugger/idebuggerengine.h
index 7ae53804a23..de2e7c5facc 100644
--- a/src/plugins/debugger/idebuggerengine.h
+++ b/src/plugins/debugger/idebuggerengine.h
@@ -52,6 +52,7 @@ class MemoryViewAgent;
struct StackFrame;
class Symbol;
class WatchData;
+typedef QSharedPointer<DebuggerStartParameters> DebuggerStartParametersPtr;
class IDebuggerEngine : public QObject
{
@@ -62,7 +63,7 @@ public:
virtual void shutdown() = 0;
virtual void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos) = 0;
- virtual void startDebugger(const QSharedPointer<DebuggerStartParameters> &startParameters) = 0;
+ virtual void startDebugger(const DebuggerStartParametersPtr &startParameters) = 0;
virtual void exitDebugger() = 0;
virtual void detachDebugger() {}
virtual void updateWatchData(const WatchData &data) = 0;
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index 45742e96798..d73dc189b62 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -217,7 +217,7 @@ void ScriptEngine::exitDebugger()
qq->notifyInferiorExited();
}
-void ScriptEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> &sp)
+void ScriptEngine::startDebugger(const DebuggerStartParametersPtr &sp)
{
if (!m_scriptEngine)
m_scriptEngine = new QScriptEngine(this);
diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h
index 32e8d3fe4b1..3340f13f83b 100644
--- a/src/plugins/debugger/script/scriptengine.h
+++ b/src/plugins/debugger/script/scriptengine.h
@@ -75,7 +75,7 @@ private:
void shutdown();
void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos);
- void startDebugger(const QSharedPointer<DebuggerStartParameters> &sp);
+ void startDebugger(const DebuggerStartParametersPtr &sp);
void exitDebugger();
diff --git a/src/plugins/debugger/tcf/tcfengine.cpp b/src/plugins/debugger/tcf/tcfengine.cpp
index bcadf3c9540..fe0eebf96a9 100644
--- a/src/plugins/debugger/tcf/tcfengine.cpp
+++ b/src/plugins/debugger/tcf/tcfengine.cpp
@@ -220,7 +220,7 @@ void TcfEngine::exitDebugger()
qq->notifyInferiorExited();
}
-void TcfEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> &sp)
+void TcfEngine::startDebugger(const DebuggerStartParametersPtr &sp)
{
qq->notifyInferiorRunningRequested();
const int pos = sp->remoteChannel.indexOf(QLatin1Char(':'));
diff --git a/src/plugins/debugger/tcf/tcfengine.h b/src/plugins/debugger/tcf/tcfengine.h
index 4487fffd3de..11dcd866d75 100644
--- a/src/plugins/debugger/tcf/tcfengine.h
+++ b/src/plugins/debugger/tcf/tcfengine.h
@@ -82,7 +82,7 @@ private:
void shutdown();
void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos);
- void startDebugger(const QSharedPointer<DebuggerStartParameters> &sp);
+ void startDebugger(const DebuggerStartParametersPtr &sp);
void exitDebugger();
void continueInferior();
--
GitLab