diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 8dac62a4ed8..aa930eb595e 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -635,7 +635,7 @@ void TestRunner::debugTests() } auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE); - runControl->setRunConfiguration(config->runConfiguration()); + runControl->copyDataFromRunConfiguration(config->runConfiguration()); QStringList omitted; Runnable inferior = config->runnable(); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 6a291750200..8c63e86cba2 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2388,7 +2388,7 @@ void DebuggerUnitTests::testStateMachine() QVERIFY(rc); auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE); - runControl->setRunConfiguration(rc); + runControl->copyDataFromRunConfiguration(rc); auto debugger = new DebuggerRunTool(runControl); debugger->setInferior(rc->runnable()); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index a4e5e932fdd..d383ec69de9 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -584,7 +584,7 @@ void DebuggerRunTool::start() connect(m_engine, &DebuggerEngine::attachToCoreRequested, this, [this](const QString &coreFile) { auto rc = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE); - rc->copyFromRunControl(runControl()); + rc->copyDataFromRunControl(runControl()); auto name = QString(tr("%1 - Snapshot %2").arg(runControl()->displayName()).arg(++d->snapshotCounter)); auto debugger = new DebuggerRunTool(rc); debugger->setStartMode(AttachToCore); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 19e7caf0c1f..9f1626cb578 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2732,7 +2732,7 @@ void ProjectExplorerPluginPrivate::executeRunConfiguration(RunConfiguration *run } auto runControl = new RunControl(runMode); - runControl->setRunConfiguration(runConfiguration); + runControl->copyDataFromRunConfiguration(runConfiguration); // A user needed interaction may have cancelled the run // (by example asking for a process pid or server url). diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 5b0454e743e..070b9c4b110 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -389,13 +389,13 @@ RunControl::RunControl(Utils::Id mode) : { } -void RunControl::copyFromRunControl(RunControl *runControl) +void RunControl::copyDataFromRunControl(RunControl *runControl) { QTC_ASSERT(runControl, return); d->copyData(runControl->d.get()); } -void RunControl::setRunConfiguration(RunConfiguration *runConfig) +void RunControl::copyDataFromRunConfiguration(RunConfiguration *runConfig) { QTC_ASSERT(runConfig, return); d->runConfigId = runConfig->id(); diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h index bcd29792122..fc4189fd532 100644 --- a/src/plugins/projectexplorer/runcontrol.h +++ b/src/plugins/projectexplorer/runcontrol.h @@ -193,11 +193,11 @@ public: explicit RunControl(Utils::Id mode); ~RunControl() override; - void setRunConfiguration(RunConfiguration *runConfig); void setTarget(Target *target); void setKit(Kit *kit); - void copyFromRunControl(RunControl *runControl); + void copyDataFromRunConfiguration(RunConfiguration *runConfig); + void copyDataFromRunControl(RunControl *runControl); void initiateStart(); void initiateReStart(); diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp index c37b5abf152..aa730e281a3 100644 --- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp +++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp @@ -82,7 +82,7 @@ QmlPreviewRunner::QmlPreviewRunner(const QmlPreviewRunnerSetting &settings) this->connect(runControl(), &ProjectExplorer::RunControl::stopped, [this]() { auto rc = new ProjectExplorer::RunControl(ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE); - rc->copyFromRunControl(runControl()); + rc->copyDataFromRunControl(runControl()); ProjectExplorer::ProjectExplorerPlugin::startRunControl(rc); }); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index f944d3b18b9..3c4f75c62c5 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -564,7 +564,7 @@ ProjectExplorer::RunControl *QmlProfilerTool::attachToWaitingApplication() d->m_viewContainer->perspective()->select(); auto runControl = new RunControl(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE); - runControl->setRunConfiguration(SessionManager::startupRunConfiguration()); + runControl->copyDataFromRunConfiguration(SessionManager::startupRunConfiguration()); auto profiler = new QmlProfilerRunner(runControl); profiler->setServerUrl(serverUrl); diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index 6e9e701142d..527476bc53a 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -253,7 +253,7 @@ void QnxAttachDebugSupport::showProcessesDialog() } auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE); - runControl->setRunConfiguration(runConfig); + runControl->copyDataFromRunConfiguration(runConfig); auto debugger = new QnxAttachDebugSupport(runControl); debugger->setStartMode(AttachToRemoteServer); debugger->setCloseMode(DetachAtClose); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 692a7f5833f..a44beb02243 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -283,7 +283,7 @@ CallgrindToolPrivate::CallgrindToolPrivate() return; m_perspective.select(); auto runControl = new RunControl(CALLGRIND_RUN_MODE); - runControl->setRunConfiguration(runConfig); + runControl->copyDataFromRunConfiguration(runConfig); runControl->createMainWorker(); const auto runnable = dlg.runnable(); runControl->setRunnable(runnable); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 760209df094..d66892b0173 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -709,7 +709,7 @@ MemcheckToolPrivate::MemcheckToolPrivate() TaskHub::clearTasks(Debugger::Constants::ANALYZERTASK_ID); m_perspective.select(); RunControl *rc = new RunControl(MEMCHECK_RUN_MODE); - rc->setRunConfiguration(runConfig); + rc->copyDataFromRunConfiguration(runConfig); rc->createMainWorker(); const auto runnable = dlg.runnable(); rc->setRunnable(runnable);