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

4
src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp
View File

@@ -48,7 +48,7 @@ void MesonToolKitAspect::fix(ProjectExplorer::Kit *k)
setup(k);
}
ProjectExplorer::KitAspect::ItemList MesonToolKitAspect::toUserOutput(
ProjectExplorer::KitAspectFactory::ItemList MesonToolKitAspect::toUserOutput(
const ProjectExplorer::Kit *k) const
{
const auto tool = mesonTool(k);
@@ -57,7 +57,7 @@ ProjectExplorer::KitAspect::ItemList MesonToolKitAspect::toUserOutput(
return {{Tr::tr("Meson"), Tr::tr("Unconfigured")}};
}
ProjectExplorer::KitAspectWidget *MesonToolKitAspect::createConfigWidget(ProjectExplorer::Kit *k) const
ProjectExplorer::KitAspect *MesonToolKitAspect::createKitAspect(ProjectExplorer::Kit *k) const
{
QTC_ASSERT(k, return nullptr);
return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Meson};

4
src/plugins/mesonprojectmanager/mesontoolkitaspect.h
View File

@@ -11,7 +11,7 @@
namespace MesonProjectManager {
namespace Internal {
class MesonToolKitAspect final : public ProjectExplorer::KitAspect
class MesonToolKitAspect final : public ProjectExplorer::KitAspectFactory
{
public:
MesonToolKitAspect();
@@ -20,7 +20,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 *) const final;
ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *) const final;
static void setMesonTool(ProjectExplorer::Kit *kit, Utils::Id id);
static Utils::Id mesonToolId(const ProjectExplorer::Kit *kit);

4
src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp
View File

@@ -48,7 +48,7 @@ void NinjaToolKitAspect::fix(ProjectExplorer::Kit *k)
setup(k);
}
ProjectExplorer::KitAspect::ItemList NinjaToolKitAspect::toUserOutput(
ProjectExplorer::KitAspectFactory::ItemList NinjaToolKitAspect::toUserOutput(
const ProjectExplorer::Kit *k) const
{
const auto tool = ninjaTool(k);
@@ -57,7 +57,7 @@ ProjectExplorer::KitAspect::ItemList NinjaToolKitAspect::toUserOutput(
return {{Tr::tr("Ninja"), Tr::tr("Unconfigured")}};
}
ProjectExplorer::KitAspectWidget *NinjaToolKitAspect::createConfigWidget(ProjectExplorer::Kit *k) const
ProjectExplorer::KitAspect *NinjaToolKitAspect::createKitAspect(ProjectExplorer::Kit *k) const
{
QTC_ASSERT(k, return nullptr);
return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Ninja};

4
src/plugins/mesonprojectmanager/ninjatoolkitaspect.h
View File

@@ -11,7 +11,7 @@
namespace MesonProjectManager {
namespace Internal {
class NinjaToolKitAspect final : public ProjectExplorer::KitAspect
class NinjaToolKitAspect final : public ProjectExplorer::KitAspectFactory
{
public:
NinjaToolKitAspect();
@@ -20,7 +20,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 *) const final;
ProjectExplorer::KitAspect *createKitAspect(ProjectExplorer::Kit *) const final;
static void setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id);
static Utils::Id ninjaToolId(const ProjectExplorer::Kit *kit);

4
src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp
View File

@@ -13,9 +13,9 @@ namespace MesonProjectManager {
namespace Internal {
ToolKitAspectWidget::ToolKitAspectWidget(ProjectExplorer::Kit *kit,
const ProjectExplorer::KitAspect *ki,
const ProjectExplorer::KitAspectFactory *ki,
ToolType type)
: ProjectExplorer::KitAspectWidget(kit, ki)
: ProjectExplorer::KitAspect(kit, ki)
, m_toolsComboBox(createSubWidget<QComboBox>())
, m_manageButton(createManageButton(Constants::SettingsPage::TOOLS_ID))
, m_type{type}

4
src/plugins/mesonprojectmanager/toolkitaspectwidget.h
View File

@@ -15,13 +15,13 @@
namespace MesonProjectManager {
namespace Internal {
class ToolKitAspectWidget final : public ProjectExplorer::KitAspectWidget
class ToolKitAspectWidget final : public ProjectExplorer::KitAspect
{
public:
enum class ToolType { Meson, Ninja };
ToolKitAspectWidget(ProjectExplorer::Kit *kit,
const ProjectExplorer::KitAspect *ki,
const ProjectExplorer::KitAspectFactory *ki,
ToolType type);
~ToolKitAspectWidget();