RemoteLinux: Convert to RunConfiguration::initialize(Id) signature

Change-Id: I940d96b3f6467f2898193092b4ce66b752161039
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 15 insertions, 7 deletions

diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index e5fd3816e3..0a50793e75 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -58,11 +58,13 @@ void QnxRunConfiguration::initialize(Core::Id id)
     QTC_ASSERT(project, return);
     for (const QmakeProjectManager::QmakeProFile *file : project->applicationProFiles()) {
         if (file->filePath().toString() == projectFilePath) {
-            RemoteLinuxRunConfiguration::initialize(id, file->targetInformation().target);
+            // Circumvent RemoteLinux's initialize()  FIXME: Ugly.
+            RunConfiguration::initialize(id);
+            setTargetName(file->targetInformation().target);
             return;
         }
     }
-    RemoteLinuxRunConfiguration::initialize(id, QString());
+    RemoteLinuxRunConfiguration::initialize(id);
 }
 
 Runnable QnxRunConfiguration::runnable() const
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 3195634c7a..c16c6371c4 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -79,12 +79,17 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target)
             this, &RemoteLinuxRunConfiguration::handleBuildSystemDataUpdated);
 }
 
-void RemoteLinuxRunConfiguration::initialize(Core::Id id, const QString &targetName)
+void RemoteLinuxRunConfiguration::initialize(Core::Id id)
 {
     RunConfiguration::initialize(id);
 
-    d->targetName = targetName;
+    d->targetName = id.suffixAfter(RemoteLinuxRunConfiguration::IdPrefix);
+    setDefaultDisplayName(defaultDisplayName());
+}
 
+void RemoteLinuxRunConfiguration::setTargetName(const QString &targetName)
+{
+    d->targetName = targetName;
     setDefaultDisplayName(defaultDisplayName());
 }
 
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index 9371eba983..7601343256 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -74,7 +74,8 @@ signals:
     void targetInformationChanged() const;
 
 protected:
-    void initialize(Core::Id id, const QString &targetName);
+    void initialize(Core::Id id);
+    void setTargetName(const QString &targetName);
 
     bool fromMap(const QVariantMap &map) override;
     QString defaultDisplayName();
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
index e12878ba46..5bac1b0807 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
@@ -108,13 +108,13 @@ QString RemoteLinuxRunConfigurationFactory::displayNameForId(Core::Id id) const
 
 RunConfiguration *RemoteLinuxRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
 {
-    return createHelper<RemoteLinuxRunConfiguration>(parent, id, stringFromId(id));
+    return createHelper<RemoteLinuxRunConfiguration>(parent, id);
 }
 
 RunConfiguration *RemoteLinuxRunConfigurationFactory::doRestore(Target *parent,
                                                                 const QVariantMap &)
 {
-    return createHelper<RemoteLinuxRunConfiguration>(parent, RemoteLinuxRunConfiguration::IdPrefix, QString());
+    return createHelper<RemoteLinuxRunConfiguration>(parent, RemoteLinuxRunConfiguration::IdPrefix);
 }
 
 // RemoteLinuxCustomRunConfigurationFactory