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

CMake: Slim down CMakeStep interface

Browse Source 
Change-Id: Ia2cce411647e434a9edd7ef2b66a187bad6d8c12
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-08 15:20:30 +02:00
parent 4964d0bf81
commit bd31ba0e09
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -161,11 +161,6 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) :
this, &CMakeBuildStep::handleBuildTargetsChanges);
}
CMakeBuildConfiguration *CMakeBuildStep::cmakeBuildConfiguration() const
{
return static_cast<CMakeBuildConfiguration *>(buildConfiguration());
}
void CMakeBuildStep::handleBuildTargetsChanges(bool success)
{
if (!success)
@@ -201,7 +196,7 @@ bool CMakeBuildStep::fromMap(const QVariantMap &map)
bool CMakeBuildStep::init()
{
bool canInit = true;
CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
BuildConfiguration *bc = buildConfiguration();
QTC_ASSERT(bc, return false);
if (!bc->isEnabled()) {
emit addTask(BuildSystemTask(Task::Error,

8
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -39,19 +39,13 @@ class StringAspect;
namespace CMakeProjectManager {
namespace Internal {
class CMakeBuildConfiguration;
class CMakeBuildStepFactory;
class CMakeBuildStep : public ProjectExplorer::AbstractProcessStep
{
Q_OBJECT
friend class CMakeBuildStepFactory;
public:
CMakeBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
QStringList buildTargets() const;
bool buildsBuildTarget(const QString &target) const;
void setBuildTargets(const QStringList &target);
@@ -78,8 +72,6 @@ protected:
bool fromMap(const QVariantMap &map) override;
private:
void ctor(ProjectExplorer::BuildStepList *bsl);
bool init() override;
void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
void doRun() override;