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

ProjectExplorer: Rename KitAspect related classes

Browse Source 
KitAspect -> KitAspectFactory
KitAspectWidget -> KitAspect

KitAspect::createConfigWidget() -> KitAspectFactory::createKitAspect()

Possibly not perfect yet, but closer to what it does and is.

There will be follow-ups to rename derived classes.

Change-Id: I226f6f025f1e6462c348b68663f776f5a2e8c42d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-08-10 13:00:40 +02:00
parent 26853ee7a9
commit fde372b81e
31 changed files with 201 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -651,13 +651,13 @@ void CMakeBuildSettingsWidget::kitCMakeConfiguration()
CMakeConfigurationKitAspect configurationKitAspect;
Layouting::Grid grid;
KitAspectWidget *widget = kitAspect.createConfigWidget(m_buildConfig->kit());
KitAspect *widget = kitAspect.createKitAspect(m_buildConfig->kit());
widget->setParent(dialog);
widget->addToLayoutWithLabel(grid, dialog);
widget = generatorAspect.createConfigWidget(m_buildConfig->kit());
widget = generatorAspect.createKitAspect(m_buildConfig->kit());
widget->setParent(dialog);
widget->addToLayoutWithLabel(grid, dialog);
widget = configurationKitAspect.createConfigWidget(m_buildConfig->kit());
widget = configurationKitAspect.createKitAspect(m_buildConfig->kit());
widget->setParent(dialog);
widget->addToLayoutWithLabel(grid, dialog);
grid.attachTo(dialog);

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

@@ -63,10 +63,10 @@ static Id defaultCMakeToolId()
return defaultTool ? defaultTool->id() : Id();
}
class CMakeKitAspectWidget final : public KitAspectWidget
class CMakeKitAspectWidget final : public KitAspect
{
public:
CMakeKitAspectWidget(Kit *kit, const KitAspect *ki) : KitAspectWidget(kit, ki),
CMakeKitAspectWidget(Kit *kit, const KitAspectFactory *ki) : KitAspect(kit, ki),
m_comboBox(createSubWidget<QComboBox>()),
m_manageButton(createManageButton(Constants::Settings::TOOLS_ID))
{
@@ -242,13 +242,13 @@ void CMakeKitAspect::fix(Kit *k)
setup(k);
}
KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const
KitAspectFactory::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const
{
const CMakeTool *const tool = cmakeTool(k);
return {{Tr::tr("CMake"), tool ? tool->displayName() : Tr::tr("Unconfigured")}};
}
KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const
KitAspect *CMakeKitAspect::createKitAspect(Kit *k) const
{
QTC_ASSERT(k, return nullptr);
return new CMakeKitAspectWidget(k, this);
@@ -289,16 +289,16 @@ const char EXTRA_GENERATOR_KEY[] = "ExtraGenerator";
const char PLATFORM_KEY[] = "Platform";
const char TOOLSET_KEY[] = "Toolset";
class CMakeGeneratorKitAspectWidget final : public KitAspectWidget
class CMakeGeneratorKitAspectWidget final : public KitAspect
{
public:
CMakeGeneratorKitAspectWidget(Kit *kit, const KitAspect *ki)
: KitAspectWidget(kit, ki),
CMakeGeneratorKitAspectWidget(Kit *kit, const KitAspectFactory *ki)
: KitAspect(kit, ki),
m_label(createSubWidget<ElidingLabel>()),
m_changeButton(createSubWidget<QPushButton>())
{
const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit);
connect(this, &KitAspectWidget::labelLinkActivated, this, [=](const QString &) {
connect(this, &KitAspect::labelLinkActivated, this, [=](const QString &) {
CMakeTool::openCMakeHelpUrl(tool, "%1/manual/cmake-generators.7.html");
});
@@ -798,7 +798,7 @@ void CMakeGeneratorKitAspect::upgrade(Kit *k)
}
}
KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const
KitAspectFactory::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const
{
const GeneratorInfo info = generatorInfo(k);
QString message;
@@ -814,7 +814,7 @@ KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const
return {{Tr::tr("CMake Generator"), message}};
}
KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const
KitAspect *CMakeGeneratorKitAspect::createKitAspect(Kit *k) const
{
return new CMakeGeneratorKitAspectWidget(k, this);
}
@@ -843,11 +843,11 @@ const char CMAKE_QMAKE_KEY[] = "QT_QMAKE_EXECUTABLE";
const char CMAKE_PREFIX_PATH_KEY[] = "CMAKE_PREFIX_PATH";
const char QTC_CMAKE_PRESET_KEY[] = "QTC_CMAKE_PRESET";
class CMakeConfigurationKitAspectWidget final : public KitAspectWidget
class CMakeConfigurationKitAspectWidget final : public KitAspect
{
public:
CMakeConfigurationKitAspectWidget(Kit *kit, const KitAspect *ki)
: KitAspectWidget(kit, ki),
CMakeConfigurationKitAspectWidget(Kit *kit, const KitAspectFactory *ki)
: KitAspect(kit, ki),
m_summaryLabel(createSubWidget<ElidingLabel>()),
m_manageButton(createSubWidget<QPushButton>())
{
@@ -1217,12 +1217,12 @@ void CMakeConfigurationKitAspect::fix(Kit *k)
Q_UNUSED(k)
}
KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const
KitAspectFactory::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const
{
return {{Tr::tr("CMake Configuration"), toStringList(k).join("<br>")}};
}
KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const
KitAspect *CMakeConfigurationKitAspect::createKitAspect(Kit *k) const
{
if (!k)
return nullptr;

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

@@ -13,7 +13,7 @@ namespace CMakeProjectManager {
class CMakeTool;
class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspectFactory
{
public:
CMakeKitAspect();
@@ -29,7 +29,7 @@ public:
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;
ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *k) const final;
void addToMacroExpander(ProjectExplorer::Kit *k, Utils::MacroExpander *expander) const final;
@@ -38,7 +38,7 @@ public:
static QString msgUnsupportedVersion(const QByteArray &versionString);
};
class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspectFactory
{
public:
CMakeGeneratorKitAspect();
@@ -63,14 +63,14 @@ public:
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;
ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *k) const final;
void addToBuildEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const final;
private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const;
};
class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspectFactory
{
public:
CMakeConfigurationKitAspect();
@@ -96,7 +96,7 @@ public:
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;
ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *k) const final;
private:
QVariant defaultValue(const ProjectExplorer::Kit *k) const;