From 10a6829aaf8ea15cd217d398f0bd50447d05b979 Mon Sep 17 00:00:00 2001 From: hjk <qtc-committer@nokia.com> Date: Thu, 17 Sep 2009 11:48:39 +0200 Subject: [PATCH] debugger: refactorization merge DebuggerRunControl::m_dumperLibrary{,Location} into StartParameters --- src/plugins/debugger/debuggermanager.cpp | 14 ++------------ src/plugins/debugger/debuggermanager.h | 6 +++--- src/plugins/debugger/debuggerrunner.cpp | 8 ++++---- src/plugins/debugger/debuggerrunner.h | 2 -- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp index 5222fb8c1ae..18641811395 100644 --- a/src/plugins/debugger/debuggermanager.cpp +++ b/src/plugins/debugger/debuggermanager.cpp @@ -902,16 +902,6 @@ QSharedPointer<DebuggerStartParameters> DebuggerManager::startParameters() const return m_startParameters; } -void DebuggerManager::setQtDumperLibraryName(const QString &dl) -{ - m_dumperLib = dl; -} - -void DebuggerManager::setQtDumperLibraryLocations(const QStringList &dl) -{ - m_dumperLibLocations = dl; -} - qint64 DebuggerManager::inferiorPid() const { return m_inferiorPid; @@ -1406,7 +1396,7 @@ QString DebuggerManager::qtDumperLibraryName() const { if (theDebuggerAction(UseCustomDebuggingHelperLocation)->value().toBool()) return theDebuggerAction(CustomDebuggingHelperLocation)->value().toString(); - return m_dumperLib; + return m_startParameters->dumperLibrary; } QStringList DebuggerManager::qtDumperLibraryLocations() const @@ -1416,7 +1406,7 @@ QStringList DebuggerManager::qtDumperLibraryLocations() const const QString location = tr("%1 (explicitly set in the Debugger Options)").arg(customLocation); return QStringList(location); } - return m_dumperLibLocations; + return m_startParameters->dumperLibraryLocations; } void DebuggerManager::showQtDumperLibraryWarning(const QString &details) diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h index c1979fb22da..571104cf2f1 100644 --- a/src/plugins/debugger/debuggermanager.h +++ b/src/plugins/debugger/debuggermanager.h @@ -161,6 +161,9 @@ public: QString remoteArchitecture; QString serverStartScript; int toolChainType; + + QString dumperLibrary; + QStringList dumperLibraryLocations; }; QDebug operator<<(QDebug str, const DebuggerStartParameters &); @@ -279,9 +282,6 @@ public slots: const QSharedPointer<DebuggerStartParameters> &startParameters); void exitDebugger(); - void setQtDumperLibraryName(const QString &dl); // Run Control - void setQtDumperLibraryLocations(const QStringList &dl); - void setSimpleDockWidgetArrangement(); void setBusyCursor(bool on); diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 59e9d0e451b..4de813d26dc 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -169,15 +169,15 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager, } m_startParameters->useTerminal = runConfiguration->runMode() == ApplicationRunConfiguration::Console; - m_dumperLibrary = runConfiguration->dumperLibrary(); - m_dumperLibraryLocations = runConfiguration->dumperLibraryLocations(); + m_startParameters->dumperLibrary = + runConfiguration->dumperLibrary(); + m_startParameters->dumperLibraryLocations = + runConfiguration->dumperLibraryLocations(); } void DebuggerRunControl::start() { m_running = true; - m_manager->setQtDumperLibraryName(m_dumperLibrary); - m_manager->setQtDumperLibraryLocations(m_dumperLibraryLocations); m_manager->startNewDebugger(this, m_startParameters); } diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h index 81f84588899..71ffe38f369 100644 --- a/src/plugins/debugger/debuggerrunner.h +++ b/src/plugins/debugger/debuggerrunner.h @@ -111,8 +111,6 @@ private: const QSharedPointer<DebuggerStartParameters> m_startParameters; DebuggerManager *m_manager; bool m_running; - QString m_dumperLibrary; - QStringList m_dumperLibraryLocations; }; // A default run configuration for external executables or attaching to -- GitLab