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

ProjectExplorer: Remove now-unused RunControl::runConfiguration

Browse Source 
Change-Id: I312277813763d264dc7904042bbe6005350c3870
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-04-13 17:55:24 +02:00
parent c21774f0a7
commit 62f6c1e1d6
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -310,7 +310,6 @@ public:
IDevice::ConstPtr device; IDevice::ConstPtr device;
Utils::Icon icon; Utils::Icon icon;
const MacroExpander *macroExpander = nullptr; const MacroExpander *macroExpander = nullptr;
QPointer<RunConfiguration> runConfiguration; // Not owned. Avoid use.
AspectContainerData aspectData; AspectContainerData aspectData;
QString buildKey; QString buildKey;
QMap<Utils::Id, QVariantMap> settingsData; QMap<Utils::Id, QVariantMap> settingsData;
@@ -399,8 +398,6 @@ void RunControl::copyFromRunControl(RunControl *runControl)
void RunControl::setRunConfiguration(RunConfiguration *runConfig) void RunControl::setRunConfiguration(RunConfiguration *runConfig)
{ {
QTC_ASSERT(runConfig, return); QTC_ASSERT(runConfig, return);
QTC_CHECK(!d->runConfiguration);
d->runConfiguration = runConfig;
d->runConfigId = runConfig->id(); d->runConfigId = runConfig->id();
d->runnable = runConfig->runnable(); d->runnable = runConfig->runnable();
d->displayName = runConfig->expandedDisplayName(); d->displayName = runConfig->expandedDisplayName();
@@ -928,11 +925,6 @@ IDevice::ConstPtr RunControl::device() const
return d->device; return d->device;
} }
RunConfiguration *RunControl::runConfiguration() const
{
return d->runConfiguration.data();
}
Target *RunControl::target() const Target *RunControl::target() const
{ {
return d->target; return d->target;

1
src/plugins/projectexplorer/runcontrol.h
View File

@@ -225,7 +225,6 @@ public:
void setApplicationProcessHandle(const Utils::ProcessHandle &handle); void setApplicationProcessHandle(const Utils::ProcessHandle &handle);
IDeviceConstPtr device() const; IDeviceConstPtr device() const;
RunConfiguration *runConfiguration() const; // FIXME: Remove.
// FIXME: Try to cut down to amount of functions. // FIXME: Try to cut down to amount of functions.
Target *target() const; Target *target() const;
Project *project() const; Project *project() const;