feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Analyzer: Merge duplicated display name members

Browse Source 
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>
This commit is contained in:
hjk
2016-01-21 18:19:23 +01:00
parent 6e28e7f029
commit a32b69ac93
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/analyzerbase/analyzerruncontrol.cpp
View File

@@ -53,7 +53,7 @@ AnalyzerRunControl::AnalyzerRunControl(RunConfiguration *runConfiguration, Core:
setIcon(Icons::ANALYZER_CONTROL_START); setIcon(Icons::ANALYZER_CONTROL_START);
if (runConfiguration) { if (runConfiguration) {
m_displayName = runConfiguration->displayName(); setDisplayName(runConfiguration->displayName());
if (auto aspect = runConfiguration->extraAspect<WorkingDirectoryAspect>()) if (auto aspect = runConfiguration->extraAspect<WorkingDirectoryAspect>())
m_workingDirectory = aspect->workingDirectory().toString(); m_workingDirectory = aspect->workingDirectory().toString();
if (m_workingDirectory.isEmpty()) if (m_workingDirectory.isEmpty())
@@ -118,16 +118,6 @@ bool AnalyzerRunControl::isRunning() const
return m_isRunning; 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) void AnalyzerRunControl::setWorkingDirectory(const QString &workingDirectory)
{ {
m_workingDirectory = workingDirectory; m_workingDirectory = workingDirectory;

4
src/plugins/analyzerbase/analyzerruncontrol.h
View File

@@ -29,7 +29,6 @@
#include "analyzerstartparameters.h" #include "analyzerstartparameters.h"
#include <projectexplorer/applicationlauncher.h>
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <utils/outputformat.h> #include <utils/outputformat.h>
@@ -69,9 +68,7 @@ public:
void start(); void start();
StopResult stop(); StopResult stop();
bool isRunning() const; bool isRunning() const;
QString displayName() const;
void setDisplayName(const QString &displayName);
QString workingDirectory() const; QString workingDirectory() const;
void setWorkingDirectory(const QString &workingDirectory); void setWorkingDirectory(const QString &workingDirectory);
@@ -93,7 +90,6 @@ protected:
bool m_isRunning; bool m_isRunning;
private: private:
QString m_displayName; // Default to runConfig->displayName, unless overridden by setDisplayName
QString m_workingDirectory; QString m_workingDirectory;
}; };
} // namespace Analyzer } // namespace Analyzer

5
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -556,6 +556,11 @@ QString RunControl::displayName() const
return m_displayName; return m_displayName;
} }
void RunControl::setDisplayName(const QString &displayName)
{
m_displayName = displayName;
}
void RunControl::setIcon(const Utils::Icon &icon) void RunControl::setIcon(const Utils::Icon &icon)
{ {
m_icon = icon; m_icon = icon;

4
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -350,9 +350,11 @@ public:
virtual bool promptToStop(bool *optionalPrompt = 0) const; virtual bool promptToStop(bool *optionalPrompt = 0) const;
virtual StopResult stop() = 0; virtual StopResult stop() = 0;
virtual bool isRunning() const = 0; virtual bool isRunning() const = 0;
virtual QString displayName() const;
virtual bool supportsReRunning() const { return true; } virtual bool supportsReRunning() const { return true; }
virtual QString displayName() const;
void setDisplayName(const QString &displayName);
void setIcon(const Utils::Icon &icon); void setIcon(const Utils::Icon &icon);
Utils::Icon icon() const; Utils::Icon icon() const;