ProjectExplorer: Return BuildTargetInfo from availableBuildTarget()

... including build target name and display names instead of
returning QString build target names and producing display names
via displayNameForBuildTarget()

This is a mechanical intermediate step on the road to use
Target::applicationTargets().list uniformly as source of build
targets.

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

2 files changed, 6 insertions, 11 deletions

diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
index 7dd5133e6b..097586b268 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
@@ -53,19 +53,14 @@ bool RemoteLinuxRunConfigurationFactory::canCreateHelper(Target *parent, const Q
     return parent->applicationTargets().hasTarget(buildTarget);
 }
 
-QList<QString>
-  RemoteLinuxRunConfigurationFactory::availableBuildTargets(Target *parent, CreationMode) const
+QList<BuildTargetInfo> RemoteLinuxRunConfigurationFactory::availableBuildTargets(Target *parent, CreationMode) const
 {
-    return Utils::transform(parent->applicationTargets().list, [](const BuildTargetInfo &bti) {
-        return bti.targetName;
+    return Utils::transform(parent->applicationTargets().list, [](BuildTargetInfo bti) {
+        bti.displayName = bti.targetName + ' ' + tr("(on Remote Generic Linux Host)");
+        return bti;
     });
 }
 
-QString RemoteLinuxRunConfigurationFactory::displayNameForBuildTarget(const QString &buildTarget) const
-{
-    return buildTarget + ' ' + tr("(on Remote Generic Linux Host)");
-}
-
 // RemoteLinuxCustomRunConfigurationFactory
 
 RemoteLinuxCustomRunConfigurationFactory::RemoteLinuxCustomRunConfigurationFactory(QObject *parent)
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h
index 19ddfa293d..7b3c60ea05 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h
@@ -37,8 +37,8 @@ class RemoteLinuxRunConfigurationFactory : public ProjectExplorer::IRunConfigura
 public:
     explicit RemoteLinuxRunConfigurationFactory(QObject *parent = 0);
 
-    QList<QString> availableBuildTargets(ProjectExplorer::Target *parent, CreationMode mode) const override;
-    QString displayNameForBuildTarget(const QString &buildTarget) const override;
+    QList<ProjectExplorer::BuildTargetInfo>
+        availableBuildTargets(ProjectExplorer::Target *parent, CreationMode mode) const override;
 
     bool canCreateHelper(ProjectExplorer::Target *parent, const QString &suffix) const override;
 };