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

ProjectExplorer: Code cosmetics in desktoprunconfiguration.cpp

Browse Source 
Change-Id: If5ccd9369817a2f87c7ad3b87b88e8705e110d25
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-03 14:42:58 +02:00
parent ebd8d520fc
commit a13eeae6f3
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/projectexplorer/desktoprunconfiguration.cpp
View File

@@ -40,8 +40,6 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <QFileInfo>
using namespace Utils; using namespace Utils;
namespace ProjectExplorer { namespace ProjectExplorer {
@@ -54,17 +52,17 @@ class DesktopRunConfiguration : public RunConfiguration
protected: protected:
enum Kind { Qmake, Qbs, CMake }; // FIXME: Remove enum Kind { Qmake, Qbs, CMake }; // FIXME: Remove
DesktopRunConfiguration(Target *target, Utils::Id id, Kind kind); DesktopRunConfiguration(Target *target, Id id, Kind kind);
private: private:
void updateTargetInformation(); void updateTargetInformation();
Utils::FilePath executableToRun(const BuildTargetInfo &targetInfo) const; FilePath executableToRun(const BuildTargetInfo &targetInfo) const;
const Kind m_kind; const Kind m_kind;
}; };
DesktopRunConfiguration::DesktopRunConfiguration(Target *target, Utils::Id id, Kind kind) DesktopRunConfiguration::DesktopRunConfiguration(Target *target, Id id, Kind kind)
: RunConfiguration(target, id), m_kind(kind) : RunConfiguration(target, id), m_kind(kind)
{ {
auto envAspect = addAspect<LocalEnvironmentAspect>(target); auto envAspect = addAspect<LocalEnvironmentAspect>(target);
@@ -150,7 +148,7 @@ void DesktopRunConfiguration::updateTargetInformation()
} }
} }
Utils::FilePath DesktopRunConfiguration::executableToRun(const BuildTargetInfo &targetInfo) const FilePath DesktopRunConfiguration::executableToRun(const BuildTargetInfo &targetInfo) const
{ {
const FilePath appInBuildDir = targetInfo.targetFilePath; const FilePath appInBuildDir = targetInfo.targetFilePath;
const DeploymentData deploymentData = target()->deploymentData(); const DeploymentData deploymentData = target()->deploymentData();
@@ -171,7 +169,7 @@ Utils::FilePath DesktopRunConfiguration::executableToRun(const BuildTargetInfo &
class DesktopQmakeRunConfiguration final : public DesktopRunConfiguration class DesktopQmakeRunConfiguration final : public DesktopRunConfiguration
{ {
public: public:
DesktopQmakeRunConfiguration(Target *target, Utils::Id id) DesktopQmakeRunConfiguration(Target *target, Id id)
: DesktopRunConfiguration(target, id, Qmake) : DesktopRunConfiguration(target, id, Qmake)
{} {}
}; };
@@ -179,7 +177,7 @@ public:
class QbsRunConfiguration final : public DesktopRunConfiguration class QbsRunConfiguration final : public DesktopRunConfiguration
{ {
public: public:
QbsRunConfiguration(Target *target, Utils::Id id) QbsRunConfiguration(Target *target, Id id)
: DesktopRunConfiguration(target, id, Qbs) : DesktopRunConfiguration(target, id, Qbs)
{} {}
}; };
@@ -187,7 +185,7 @@ public:
class CMakeRunConfiguration final : public DesktopRunConfiguration class CMakeRunConfiguration final : public DesktopRunConfiguration
{ {
public: public:
CMakeRunConfiguration(Target *target, Utils::Id id) CMakeRunConfiguration(Target *target, Id id)
: DesktopRunConfiguration(target, id, CMake) : DesktopRunConfiguration(target, id, CMake)
{} {}
}; };