From a32b69ac93380c2c341e98f1e34750b44682f335 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Thu, 21 Jan 2016 18:19:23 +0100
Subject: [PATCH] Analyzer: Merge duplicated display name members

ProjectExplorer::RunControl::m_displayName exists, no need to
shadow it with Analyzer::AnalyzerRunControl::m_displayName

Change-Id: Iccbae658ca49c3fa2965a34a1bdf7c4a3bbd4073
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/analyzerbase/analyzerruncontrol.cpp  | 12 +-----------
 src/plugins/analyzerbase/analyzerruncontrol.h    |  4 ----
 src/plugins/projectexplorer/runconfiguration.cpp |  5 +++++
 src/plugins/projectexplorer/runconfiguration.h   |  4 +++-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp
index 75a59f19480..52cae96034d 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.cpp
+++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp
@@ -53,7 +53,7 @@ AnalyzerRunControl::AnalyzerRunControl(RunConfiguration *runConfiguration, Core:
     setIcon(Icons::ANALYZER_CONTROL_START);
 
     if (runConfiguration) {
-        m_displayName = runConfiguration->displayName();
+        setDisplayName(runConfiguration->displayName());
         if (auto aspect = runConfiguration->extraAspect<WorkingDirectoryAspect>())
             m_workingDirectory = aspect->workingDirectory().toString();
         if (m_workingDirectory.isEmpty())
@@ -118,16 +118,6 @@ bool AnalyzerRunControl::isRunning() const
     return m_isRunning;
 }
 
-QString AnalyzerRunControl::displayName() const
-{
-    return m_displayName;
-}
-
-void AnalyzerRunControl::setDisplayName(const QString &displayName)
-{
-    m_displayName = displayName;
-}
-
 void AnalyzerRunControl::setWorkingDirectory(const QString &workingDirectory)
 {
     m_workingDirectory = workingDirectory;
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/analyzerbase/analyzerruncontrol.h
index 201eaabe7ce..ebd069662d4 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.h
+++ b/src/plugins/analyzerbase/analyzerruncontrol.h
@@ -29,7 +29,6 @@
 
 #include "analyzerstartparameters.h"
 
-#include <projectexplorer/applicationlauncher.h>
 #include <projectexplorer/runconfiguration.h>
 
 #include <utils/outputformat.h>
@@ -69,9 +68,7 @@ public:
     void start();
     StopResult stop();
     bool isRunning() const;
-    QString displayName() const;
 
-    void setDisplayName(const QString &displayName);
     QString workingDirectory() const;
     void setWorkingDirectory(const QString &workingDirectory);
 
@@ -93,7 +90,6 @@ protected:
     bool m_isRunning;
 
 private:
-    QString m_displayName; // Default to runConfig->displayName, unless overridden by setDisplayName
     QString m_workingDirectory;
 };
 } // namespace Analyzer
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 764f8893445..c89c699b736 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -556,6 +556,11 @@ QString RunControl::displayName() const
     return m_displayName;
 }
 
+void RunControl::setDisplayName(const QString &displayName)
+{
+    m_displayName = displayName;
+}
+
 void RunControl::setIcon(const Utils::Icon &icon)
 {
     m_icon = icon;
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 634c7b8080e..55509f34b4e 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -350,9 +350,11 @@ public:
     virtual bool promptToStop(bool *optionalPrompt = 0) const;
     virtual StopResult stop() = 0;
     virtual bool isRunning() const = 0;
-    virtual QString displayName() const;
     virtual bool supportsReRunning() const { return true; }
 
+    virtual QString displayName() const;
+    void setDisplayName(const QString &displayName);
+
     void setIcon(const Utils::Icon &icon);
     Utils::Icon icon() const;