forked from qt-creator/qt-creator
ProjectExplorer: Rename KitInformation to KitAspect
The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -35,11 +35,11 @@ namespace CMakeProjectManager {
|
||||
|
||||
class CMakeTool;
|
||||
|
||||
class CMAKE_EXPORT CMakeKitInformation : public ProjectExplorer::KitInformation
|
||||
class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
CMakeKitInformation();
|
||||
CMakeKitAspect();
|
||||
|
||||
static Core::Id id();
|
||||
|
||||
@@ -47,24 +47,24 @@ public:
|
||||
static CMakeTool *cmakeTool(const ProjectExplorer::Kit *k);
|
||||
static void setCMakeTool(ProjectExplorer::Kit *k, const Core::Id id);
|
||||
|
||||
// KitInformation interface
|
||||
// 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::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
|
||||
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
|
||||
|
||||
void addToMacroExpander(ProjectExplorer::Kit *k, Utils::MacroExpander *expander) const final;
|
||||
|
||||
QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const final;
|
||||
};
|
||||
|
||||
class CMAKE_EXPORT CMakeGeneratorKitInformation : public ProjectExplorer::KitInformation
|
||||
class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
CMakeGeneratorKitInformation();
|
||||
CMakeGeneratorKitAspect();
|
||||
|
||||
static QString generator(const ProjectExplorer::Kit *k);
|
||||
static QString extraGenerator(const ProjectExplorer::Kit *k);
|
||||
@@ -78,21 +78,21 @@ public:
|
||||
const QString &extraGenerator, const QString &platform, const QString &toolset);
|
||||
static QStringList generatorArguments(const ProjectExplorer::Kit *k);
|
||||
|
||||
// KitInformation interface
|
||||
// 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::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
|
||||
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
|
||||
};
|
||||
|
||||
class CMAKE_EXPORT CMakeConfigurationKitInformation : public ProjectExplorer::KitInformation
|
||||
class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
CMakeConfigurationKitInformation();
|
||||
CMakeConfigurationKitAspect();
|
||||
|
||||
static CMakeConfig configuration(const ProjectExplorer::Kit *k);
|
||||
static void setConfiguration(ProjectExplorer::Kit *k, const CMakeConfig &config);
|
||||
@@ -102,13 +102,13 @@ public:
|
||||
|
||||
static CMakeConfig defaultConfiguration(const ProjectExplorer::Kit *k);
|
||||
|
||||
// KitInformation interface
|
||||
// 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::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
|
||||
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final;
|
||||
};
|
||||
|
||||
} // namespace CMakeProjectManager
|
||||
|
||||
Reference in New Issue
Block a user