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

ProjectExplorer: Drop KitAspect::defaultValue()

Browse Source 
The functionality of this function overlapped with KitAspect::setup(),
leading to unclear responsibilities and resulting in bugs such as the
one fixed by 776d54e435.
Therefore, we drop the defaultValue() function, merging its
implementation with setup() where applicable.

Change-Id: Iefa9c3df8b76e97ddf9ad388516621f7ea6558d4
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-03-12 16:50:39 +01:00
parent e80d83cb20
commit d4565be655
17 changed files with 29 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -245,12 +245,6 @@ void CMakeKitAspect::setCMakeTool(Kit *k, const Core::Id id)
k->setValue(TOOL_ID, toSet.toSetting());
}
QVariant CMakeKitAspect::defaultValue(const Kit *k) const
{
const Core::Id id = k ? defaultCMakeToolId() : Core::Id();
return id.toSetting();
}
QList<Task> CMakeKitAspect::validate(const Kit *k) const
{
QList<Task> result;
@@ -275,8 +269,7 @@ void CMakeKitAspect::setup(Kit *k)
void CMakeKitAspect::fix(Kit *k)
{
if (!CMakeKitAspect::cmakeTool(k))
setup(k);
setup(k);
}
KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const

9
src/plugins/cmakeprojectmanager/cmakekitinformation.h
View File

@@ -47,7 +47,6 @@ public:
static void setCMakeTool(ProjectExplorer::Kit *k, const Core::Id id);
// KitAspect interface
QVariant defaultValue(const ProjectExplorer::Kit *k) const final;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const final;
void setup(ProjectExplorer::Kit *k) final;
void fix(ProjectExplorer::Kit *k) final;
@@ -78,13 +77,15 @@ public:
static QStringList generatorArguments(const ProjectExplorer::Kit *k);
// KitAspect interface
QVariant defaultValue(const ProjectExplorer::Kit *k) const final;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const final;
void setup(ProjectExplorer::Kit *k) final;
void fix(ProjectExplorer::Kit *k) final;
void upgrade(ProjectExplorer::Kit *k) final;
ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const;
};
class CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
@@ -102,12 +103,14 @@ public:
static CMakeConfig defaultConfiguration(const ProjectExplorer::Kit *k);
// KitAspect interface
QVariant defaultValue(const ProjectExplorer::Kit *k) const final;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const final;
void setup(ProjectExplorer::Kit *k) final;
void fix(ProjectExplorer::Kit *k) final;
ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const;
};
} // namespace Internal