ProjectExplorer: Replace RunConfiguration::doAdditionalSetup

... by an explicit update() call. This is what effectively done in
most cases, and should be harmless and reasonably cheap in most other
cases.

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

14 files changed, 1 insertions, 40 deletions

diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index edf8a82c50..dfbf594a16 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -102,11 +102,6 @@ Tasks QdbRunConfiguration::checkForIssues() const
     return tasks;
 }
 
-void QdbRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
-{
-    updateTargetInformation();
-}
-
 void QdbRunConfiguration::updateTargetInformation()
 {
     const BuildTargetInfo bti = buildTargetInfo();
diff --git a/src/plugins/boot2qt/qdbrunconfiguration.h b/src/plugins/boot2qt/qdbrunconfiguration.h
index 72e5fa2eb4..1361428e3f 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.h
+++ b/src/plugins/boot2qt/qdbrunconfiguration.h
@@ -47,7 +47,6 @@ public:
 
 private:
     ProjectExplorer::Tasks checkForIssues() const override;
-    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
     void updateTargetInformation();
     QString defaultDisplayName() const;
 };
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 7f7f20e7c5..674710df57 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -303,11 +303,6 @@ void IosDeviceTypeAspect::setDeviceType(const IosDeviceType &deviceType)
     m_deviceType = deviceType;
 }
 
-void IosRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
-{
-    update();
-}
-
 IosDeviceTypeAspect::IosDeviceTypeAspect(IosRunConfiguration *runConfiguration)
     : m_runConfiguration(runConfiguration)
 {
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index 72b2ef0177..c71b048723 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -50,8 +50,6 @@ public:
     QString disabledReason() const override;
     IosDeviceType deviceType() const;
 
-    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
-
 private:
     bool isEnabled() const final;
 
diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
index 49a807b424..0c23f72019 100644
--- a/src/plugins/projectexplorer/desktoprunconfiguration.cpp
+++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
@@ -149,11 +149,6 @@ bool DesktopRunConfiguration::fromMap(const QVariantMap &map)
     return true;
 }
 
-void DesktopRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
-{
-    updateTargetInformation();
-}
-
 Utils::FilePath DesktopRunConfiguration::executableToRun(const BuildTargetInfo &targetInfo) const
 {
     const FilePath appInBuildDir = targetInfo.targetFilePath;
diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.h b/src/plugins/projectexplorer/desktoprunconfiguration.h
index 065014edf7..3f6a389dee 100644
--- a/src/plugins/projectexplorer/desktoprunconfiguration.h
+++ b/src/plugins/projectexplorer/desktoprunconfiguration.h
@@ -41,7 +41,6 @@ protected:
     DesktopRunConfiguration(Target *target, Core::Id id, Kind kind);
 
 private:
-    void doAdditionalSetup(const RunConfigurationCreationInfo &info) final;
     bool fromMap(const QVariantMap &map) final;
 
     void updateTargetInformation();
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 21b5bb02b9..bd9607b529 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -550,7 +550,7 @@ RunConfiguration *RunConfigurationCreationInfo::create(Target *target) const
         return nullptr;
 
     rc->m_buildKey = buildKey;
-    rc->doAdditionalSetup(*this);
+    rc->update();
     rc->setDisplayName(displayName);
 
     return rc;
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 46cacae1f4..021a9b92df 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -186,8 +186,6 @@ protected:
     using Updater = std::function<void()>;
     void setUpdater(const Updater &updater);
 
-    virtual void doAdditionalSetup(const RunConfigurationCreationInfo &) {}
-
     Task createConfigurationIssue(const QString &description) const;
 
 private:
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index 17a5595948..1b498b025b 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -289,11 +289,6 @@ PythonRunConfiguration::PythonRunConfiguration(Target *target, Core::Id id)
     connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 }
 
-void PythonRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
-{
-    update();
-}
-
 void PythonRunConfiguration::updateLanguageServer()
 {
     using namespace LanguageClient;
diff --git a/src/plugins/python/pythonrunconfiguration.h b/src/plugins/python/pythonrunconfiguration.h
index 8c00aabf53..ba3611bf6b 100644
--- a/src/plugins/python/pythonrunconfiguration.h
+++ b/src/plugins/python/pythonrunconfiguration.h
@@ -45,7 +45,6 @@ public:
     QString interpreter() const;
 
 private:
-    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) final;
     void updateLanguageServer();
 
     bool supportsDebugger() const;
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 7ea647c373..edd6ccffcc 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -88,11 +88,6 @@ Runnable QnxRunConfiguration::runnable() const
     return r;
 }
 
-void QnxRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
-{
-    updateTargetInformation();
-}
-
 void QnxRunConfiguration::updateTargetInformation()
 {
     const BuildTargetInfo bti = buildTargetInfo();
diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h
index eaa0980d50..17d20b84b5 100644
--- a/src/plugins/qnx/qnxrunconfiguration.h
+++ b/src/plugins/qnx/qnxrunconfiguration.h
@@ -48,7 +48,6 @@ public:
 
 private:
     ProjectExplorer::Runnable runnable() const override;
-    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
 
     void updateTargetInformation();
 };
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 020ac87691..b64075deae 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -75,11 +75,6 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Core::I
     connect(target, &Target::kitChanged, this, &RunConfiguration::update);
 }
 
-void RemoteLinuxRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
-{
-    updateTargetInformation();
-}
-
 Runnable RemoteLinuxRunConfiguration::runnable() const
 {
     Runnable r = RunConfiguration::runnable();
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index ddf943d491..b16925cfda 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -40,7 +40,6 @@ public:
     RemoteLinuxRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
 private:
-    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
     ProjectExplorer::Runnable runnable() const override;
     void updateTargetInformation();
 };