From cbfd3203461f08c3a1d1f7766461a6b75f98259e Mon Sep 17 00:00:00 2001 From: hjk <qtc-committer@nokia.com> Date: Fri, 11 Jun 2010 16:16:14 +0200 Subject: [PATCH] debugger: remove unused member and code cosmetics --- src/plugins/debugger/debuggermanager.cpp | 2 +- src/plugins/debugger/debuggermanager.h | 1 - src/plugins/debugger/debuggerrunner.cpp | 30 ++++++------------------ 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp index 65442aac131..73d19dc00c1 100644 --- a/src/plugins/debugger/debuggermanager.cpp +++ b/src/plugins/debugger/debuggermanager.cpp @@ -183,7 +183,7 @@ DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &p) nospace << "executable=" << p.executable << " coreFile=" << p.coreFile << " processArgs=" << p.processArgs.join(sep) << " environment=<" << p.environment.size() << " variables>" - << " workingDir=" << p.workingDirectory << " buildDir=" << p.buildDirectory + << " workingDir=" << p.workingDirectory << " attachPID=" << p.attachPID << " useTerminal=" << p.useTerminal << " remoteChannel=" << p.remoteChannel << " remoteArchitecture=" << p.remoteArchitecture diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h index 74be97a9c65..0f10b3f3397 100644 --- a/src/plugins/debugger/debuggermanager.h +++ b/src/plugins/debugger/debuggermanager.h @@ -113,7 +113,6 @@ public: QStringList processArgs; QStringList environment; QString workingDirectory; - QString buildDirectory; qint64 attachPID; bool useTerminal; QString crashParameter; // for AttachCrashedExternal diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 665877e7986..200eab0ed26 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -45,14 +45,11 @@ #include <QtGui/QTextDocument> +using namespace ProjectExplorer; + namespace Debugger { namespace Internal { -using ProjectExplorer::BuildConfiguration; -using ProjectExplorer::RunConfiguration; -using ProjectExplorer::RunControl; -using ProjectExplorer::LocalApplicationRunConfiguration; - //////////////////////////////////////////////////////////////////////// // // DebuggerRunControlFactory @@ -89,26 +86,13 @@ static DebuggerStartParametersPtr localStartParameters(RunConfiguration *runConf sp->environment = rc->environment().toStringList(); sp->workingDirectory = rc->workingDirectory(); sp->processArgs = rc->commandLineArguments(); - - switch (sp->toolChainType) { - case ProjectExplorer::ToolChain::UNKNOWN: - case ProjectExplorer::ToolChain::INVALID: - sp->toolChainType = rc->toolChainType(); - break; - default: - break; - } - if (rc->target()->project()) { - BuildConfiguration *bc = rc->target()->activeBuildConfiguration(); - if (bc) - sp->buildDirectory = bc->buildDirectory(); - } + sp->toolChainType = rc->toolChainType(); sp->useTerminal = rc->runMode() == LocalApplicationRunConfiguration::Console; sp->dumperLibrary = rc->dumperLibrary(); sp->dumperLibraryLocations = rc->dumperLibraryLocations(); - QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt( - rc->environment()); + // Find qtInstallPath. + QString qmakePath = DebuggingHelperLibrary::findSystemQt(rc->environment()); if (!qmakePath.isEmpty()) { QProcess proc; QStringList args; @@ -153,7 +137,7 @@ QWidget *DebuggerRunControlFactory::createConfigurationWidget(RunConfiguration * DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager, const DebuggerStartParametersPtr &startParameters, - ProjectExplorer::RunConfiguration *runConfiguration) + RunConfiguration *runConfiguration) : RunControl(runConfiguration, ProjectExplorer::Constants::DEBUGMODE), m_startParameters(startParameters), m_manager(manager), @@ -162,7 +146,7 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager, init(); if (m_startParameters->environment.empty()) - m_startParameters->environment = ProjectExplorer::Environment().toStringList(); + m_startParameters->environment = ProjectExplorer::Environment().toStringList(); m_startParameters->useTerminal = false; } -- GitLab