ProjectExplorer: Use Kit instead of Target in ExecutableAspect

Change-Id: I8fe34a0fe4c61d5f52fa53718b3c872d16b6e842
Reviewed-by: hjk <[email protected]>

14 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp
index 18242457436..2b01fe58460 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -27,7 +27,7 @@ public:
     explicit BareMetalRunConfiguration(BuildConfiguration *bc, Id id)
         : RunConfiguration(bc, id)
     {
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
         executable.setPlaceHolderText(Tr::tr("Unknown"));
 
         setUpdater([this] {
@@ -47,7 +47,7 @@ public:
     explicit BareMetalCustomRunConfiguration(BuildConfiguration *bc, Id id)
         : RunConfiguration(bc, id)
     {
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
         executable.setSettingsKey("BareMetal.CustomRunConfig.Executable");
         executable.setPlaceHolderText(Tr::tr("Unknown"));
         executable.setReadOnly(false);
diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index f8f871feba4..ae1559ae711 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -35,7 +35,7 @@ public:
     {
         setDefaultDisplayName(Tr::tr("Run on Boot to Qt Device"));
 
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
         executable.setSettingsKey("QdbRunConfig.RemoteExecutable");
         executable.setLabelText(Tr::tr("Executable on device:"));
         executable.setPlaceHolderText(Tr::tr("Remote path not set"));
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 4d282e3799d..d6884e5e991 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -60,7 +60,7 @@ static IosDeviceType toIosDeviceType(const SimulatorInfo &device)
 IosRunConfiguration::IosRunConfiguration(BuildConfiguration *bc, Id id)
     : RunConfiguration(bc, id), iosDeviceType(this, this)
 {
-    executable.setDeviceSelector(bc->target(), ExecutableAspect::RunDevice);
+    executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
 
     setUpdater([this] {
         IDevice::ConstPtr dev = RunDeviceKitAspect::device(kit());
diff --git a/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
index a74c535cd5b..2603537aa5d 100644
--- a/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
@@ -29,7 +29,7 @@ public:
     {
         environment.setSupportForBuildEnvironment(bc);
 
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
 
         workingDir.setEnvironment(&environment);
 
diff --git a/src/plugins/nim/project/nimblerunconfiguration.cpp b/src/plugins/nim/project/nimblerunconfiguration.cpp
index 2aee49934c6..29d0b677260 100644
--- a/src/plugins/nim/project/nimblerunconfiguration.cpp
+++ b/src/plugins/nim/project/nimblerunconfiguration.cpp
@@ -27,7 +27,7 @@ public:
     {
         environment.setSupportForBuildEnvironment(bc);
 
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
 
         setUpdater([this] {
             BuildTargetInfo bti = buildTargetInfo();
@@ -66,7 +66,7 @@ public:
         setDisplayName(Tr::tr("Nimble Test"));
         setDefaultDisplayName(Tr::tr("Nimble Test"));
 
-        executable.setDeviceSelector(target(), ExecutableAspect::BuildDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::BuildDevice);
         executable.setExecutable(Nim::nimblePathFromKit(kit()));
 
         arguments.setArguments("test");
diff --git a/src/plugins/nim/project/nimrunconfiguration.cpp b/src/plugins/nim/project/nimrunconfiguration.cpp
index 6f29a69eee3..fb06105842f 100644
--- a/src/plugins/nim/project/nimrunconfiguration.cpp
+++ b/src/plugins/nim/project/nimrunconfiguration.cpp
@@ -29,7 +29,7 @@ public:
     {
         environment.setSupportForBuildEnvironment(bc);
 
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
 
         setDisplayName(Tr::tr("Current Build Target"));
         setDefaultDisplayName(Tr::tr("Current Build Target"));
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 7cf56bc3e87..3cb225e1a30 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -23,7 +23,7 @@ CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(BuildConfigur
 {
     environment.setSupportForBuildEnvironment(bc);
 
-    executable.setDeviceSelector(target(), ExecutableAspect::HostDevice);
+    executable.setDeviceSelector(kit(), ExecutableAspect::HostDevice);
     executable.setSettingsKey("ProjectExplorer.CustomExecutableRunConfiguration.Executable");
     executable.setReadOnly(false);
     executable.setHistoryCompleter("Qt.CustomExecutable.History");
diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
index 7ebc2983273..bb76f11b660 100644
--- a/src/plugins/projectexplorer/desktoprunconfiguration.cpp
+++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
@@ -30,7 +30,7 @@ protected:
     {
         environment.setSupportForBuildEnvironment(bc);
 
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
 
         workingDir.setEnvironment(&environment);
 
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index c09ce563241..587f5d4a023 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -516,14 +516,14 @@ ExecutableAspect::ExecutableAspect(AspectContainer *container)
     \internal
 */
 
-static IDevice::ConstPtr executionDevice(Target *target,
+static IDevice::ConstPtr executionDevice(const Kit *k,
                                          ExecutableAspect::ExecutionDeviceSelector selector)
 {
-    if (target) {
+    if (k) {
         if (selector == ExecutableAspect::RunDevice)
-            return RunDeviceKitAspect::device(target->kit());
+            return RunDeviceKitAspect::device(k);
         if (selector == ExecutableAspect::BuildDevice)
-            return BuildDeviceKitAspect::device(target->kit());
+            return BuildDeviceKitAspect::device(k);
     }
     return DeviceManager::defaultDesktopDevice();
 }
@@ -534,12 +534,12 @@ ExecutableAspect::~ExecutableAspect()
     m_alternativeExecutable = nullptr;
 }
 
-void ExecutableAspect::setDeviceSelector(Target *target, ExecutionDeviceSelector selector)
+void ExecutableAspect::setDeviceSelector(Kit *kit, ExecutionDeviceSelector selector)
 {
-    m_target = target;
+    m_kit = kit;
     m_selector = selector;
 
-    const IDevice::ConstPtr dev = executionDevice(m_target, m_selector);
+    const IDevice::ConstPtr dev = executionDevice(m_kit, m_selector);
     const OsType osType = dev ? dev->osType() : HostOsInfo::hostOs();
 
     m_executable.setDisplayFilter([osType](const QString &pathName) {
@@ -623,7 +623,7 @@ FilePath ExecutableAspect::executable() const
             ? (*m_alternativeExecutable)()
             : m_executable();
 
-    if (const IDevice::ConstPtr dev = executionDevice(m_target, m_selector))
+    if (const IDevice::ConstPtr dev = executionDevice(m_kit, m_selector))
         exe = dev->rootPath().withNewMappedPath(exe);
 
     return exe;
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index 3b79d24a675..0807700e8d1 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -162,7 +162,7 @@ public:
     Utils::FilePath executable() const;
     void setExecutable(const Utils::FilePath &executable);
 
-    void setDeviceSelector(Target *target, ExecutionDeviceSelector selector);
+    void setDeviceSelector(Kit *kit, ExecutionDeviceSelector selector);
     void setSettingsKey(const Utils::Key &key);
     void makeOverridable(const Utils::Key &overridingKey, const Utils::Key &useOverridableKey);
     void addToLayoutImpl(Layouting::Layout &parent) override;
@@ -187,7 +187,7 @@ private:
 
     Utils::FilePathAspect m_executable;
     Utils::FilePathAspect *m_alternativeExecutable = nullptr;
-    Target *m_target = nullptr;
+    Kit *m_kit = nullptr;
     ExecutionDeviceSelector m_selector = RunDevice;
 };
 
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 8c8a9e7931f..bdc05936f79 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -29,7 +29,7 @@ public:
     QnxRunConfiguration(BuildConfiguration *bc, Id id)
         : RunConfiguration(bc, id)
     {
-        executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+        executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
         executable.setLabelText(Tr::tr("Executable on device:"));
         executable.setPlaceHolderText(Tr::tr("Remote path not set"));
         executable.makeOverridable("RemoteLinux.RunConfig.AlternateRemoteExecutable",
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 65265cee466..7e049d15f64 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -83,7 +83,7 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent, Id id) : MakeStep(parent
         rootPath = FilePath::fromString(tmpDir.path());
     }
 
-    m_makeBinary.setDeviceSelector(parent->target(), ExecutableAspect::BuildDevice);
+    m_makeBinary.setDeviceSelector(kit(), ExecutableAspect::BuildDevice);
     m_makeBinary.setSettingsKey("RemoteLinux.MakeInstall.Make");
     m_makeBinary.setReadOnly(false);
     m_makeBinary.setLabelText(Tr::tr("Command:"));
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
index 72ea04cbd0b..855fb9c567a 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -41,7 +41,7 @@ RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(BuildConfig
 {
     environment.setDeviceSelector(target(), EnvironmentAspect::RunDevice);
 
-    executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+    executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
     executable.setSettingsKey("RemoteLinux.CustomRunConfig.RemoteExecutable");
     executable.setLabelText(Tr::tr("Remote executable:"));
     executable.setReadOnly(false);
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index e3446ba5b4e..0005d16beb9 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -43,7 +43,7 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(BuildConfiguration *bc,
 {
     environment.setDeviceSelector(target(), EnvironmentAspect::RunDevice);
 
-    executable.setDeviceSelector(target(), ExecutableAspect::RunDevice);
+    executable.setDeviceSelector(kit(), ExecutableAspect::RunDevice);
     executable.setLabelText(Tr::tr("Executable on device:"));
     executable.setPlaceHolderText(Tr::tr("Remote path not set"));
     executable.makeOverridable("RemoteLinux.RunConfig.AlternateRemoteExecutable",