From 2525ff3c711c8b88f931f8f70ffbd68c8c086d92 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 6 Jan 2011 18:34:29 +0100 Subject: [PATCH] debugger: try to reduce s60devicerunconfiguration dependencies --- .../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 12 ++++-------- .../qt4projectmanager/qt-s60/s60devicerunconfiguration.h | 4 ---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 89efb168c4..59ccf0553a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -777,12 +777,13 @@ static inline QString symbolFileFromExecutable(const QString &executable) } // Create start parameters from run configuration -Debugger::DebuggerStartParameters S60DeviceDebugRunControl::s60DebuggerStartParams(const S60DeviceRunConfiguration *rc) +static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceRunConfiguration *rc) { Debugger::DebuggerStartParameters sp; QTC_ASSERT(rc, return sp); - const S60DeployConfiguration *activeDeployConf = qobject_cast(rc->qt4Target()->activeDeployConfiguration()); + const S60DeployConfiguration *activeDeployConf = + qobject_cast(rc->qt4Target()->activeDeployConfiguration()); const QString debugFileName = QString::fromLatin1("%1:\\sys\\bin\\%2.exe") .arg(activeDeployConf->installationDrive()).arg(rc->targetName()); @@ -804,8 +805,7 @@ Debugger::DebuggerStartParameters S60DeviceDebugRunControl::s60DebuggerStartPara S60DeviceDebugRunControl::S60DeviceDebugRunControl(S60DeviceRunConfiguration *rc, const QString &) : - Debugger::DebuggerRunControl(rc, Debugger::GdbEngineType, - S60DeviceDebugRunControl::s60DebuggerStartParams(rc)) + Debugger::DebuggerRunControl(rc, Debugger::GdbEngineType, s60DebuggerStartParams(rc)) { if (startParameters().symbolFileName.isEmpty()) { const QString msg = tr("Warning: Cannot locate the symbol file belonging to %1."). @@ -832,7 +832,3 @@ void S60DeviceDebugRunControl::start() emit appendMessage(this, tr("Launching debugger..."), false); Debugger::DebuggerRunControl::start(); } - -S60DeviceDebugRunControl::~S60DeviceDebugRunControl() -{ -} diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index bf052ea1d1..67a144a11a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -203,11 +203,7 @@ class S60DeviceDebugRunControl : public Debugger::DebuggerRunControl public: explicit S60DeviceDebugRunControl(S60DeviceRunConfiguration *runConfiguration, const QString &mode); - virtual ~S60DeviceDebugRunControl(); virtual void start(); - -private: - static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceRunConfiguration *rc); }; } // namespace Internal -- 2.11.0