feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Store some aspect data by value in the RunControl

Browse Source 
Change-Id: Idb7e119b5b0b483ce91efeb21fb415b654cfed4f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-08-27 16:44:42 +02:00
parent c9c214057e
commit 758986ea0e
12 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -58,11 +58,7 @@ ValgrindToolRunner::ValgrindToolRunner(RunControl *runControl)
runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
setSupportsReRunning(false);
m_settings =
qobject_cast<ValgrindBaseSettings *>(runControl->settings(ANALYZER_VALGRIND_SETTINGS));
if (!m_settings)
m_settings = ValgrindGlobalSettings::instance();
m_settings.fromMap(runControl->settingsData(ANALYZER_VALGRIND_SETTINGS));
}
void ValgrindToolRunner::start()
@@ -81,7 +77,7 @@ void ValgrindToolRunner::start()
emit outputReceived(tr("Command line arguments: %1").arg(runnable().debuggeeArgs), DebugFormat);
#endif
CommandLine valgrind{m_settings->valgrindExecutable()};
CommandLine valgrind{m_settings.valgrindExecutable()};
valgrind.addArgs(genericToolArguments());
valgrind.addArgs(toolArguments());
@@ -125,9 +121,9 @@ FilePath ValgrindToolRunner::executable() const
QStringList ValgrindToolRunner::genericToolArguments() const
{
QTC_ASSERT(m_settings, return QStringList());
QString smcCheckValue;
switch (m_settings->selfModifyingCodeDetection()) {
switch (m_settings.selfModifyingCodeDetection()) {
case ValgrindBaseSettings::DetectSmcNo:
smcCheckValue = "none";
break;
@@ -178,7 +174,7 @@ void ValgrindToolRunner::receiveProcessOutput(const QString &output, OutputForma
void ValgrindToolRunner::receiveProcessError(const QString &message, QProcess::ProcessError error)
{
if (error == QProcess::FailedToStart) {
const QString valgrind = m_settings->valgrindExecutable();
const QString valgrind = m_settings.valgrindExecutable();
if (!valgrind.isEmpty())
appendMessage(tr("Error: \"%1\" could not be started: %2").arg(valgrind, message), ErrorMessageFormat);
else