From ff38e32443b49a6bcae78235c1164a4ae71ae7ae Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 18 Nov 2024 16:23:36 +0100 Subject: [PATCH] Standardize parameter name for KitAspect::addToInnerLayout Call it 'layout' Change-Id: I57c4e569d3d6026fe84b0f4f8c384c6164262be9 Reviewed-by: Christian Kandeler --- .../cmakeprojectmanager/cmakekitaspect.cpp | 12 ++++++------ .../mesonprojectmanager/toolkitaspectwidget.cpp | 4 ++-- .../devicesupport/devicekitaspects.cpp | 16 ++++++++-------- src/plugins/projectexplorer/kitaspects.cpp | 10 +++++----- .../projectexplorer/toolchainkitaspect.cpp | 14 +++++++------- src/plugins/qbsprojectmanager/qbskitaspect.cpp | 6 +++--- .../qmakeprojectmanager/qmakekitaspect.cpp | 4 ++-- src/plugins/qtsupport/qtkitaspect.cpp | 14 +++++++------- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp index 637f6a16300..849154940dc 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp @@ -348,11 +348,11 @@ private: // KitAspectWidget interface void makeReadOnly() override { m_changeButton->setEnabled(false); } - void addToInnerLayout(Layouting::Layout &parent) override + void addToInnerLayout(Layouting::Layout &layout) override { addMutableAction(m_label); - parent.addItem(m_label); - parent.addItem(m_changeButton); + layout.addItem(m_label); + layout.addItem(m_changeButton); } void refresh() override @@ -859,11 +859,11 @@ public: private: // KitAspectWidget interface - void addToInnerLayout(Layouting::Layout &parent) override + void addToInnerLayout(Layouting::Layout &layout) override { addMutableAction(m_summaryLabel); - parent.addItem(m_summaryLabel); - parent.addItem(m_manageButton); + layout.addItem(m_summaryLabel); + layout.addItem(m_manageButton); } void makeReadOnly() override diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp b/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp index 79189470790..21a5f740bbb 100644 --- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp +++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp @@ -41,10 +41,10 @@ private: void makeReadOnly() final { m_toolsComboBox->setEnabled(false); } - void addToInnerLayout(Layouting::Layout &parent) final + void addToInnerLayout(Layouting::Layout &layout) final { addMutableAction(m_toolsComboBox); - parent.addItem(m_toolsComboBox); + layout.addItem(m_toolsComboBox); } void refresh() final diff --git a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp index e3c6d03d910..33dde8b3578 100644 --- a/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp @@ -95,20 +95,20 @@ public: private: Id settingsPageItemToPreselect() const override { return DeviceAspect::deviceId(kit()); } - void addToInnerLayout(Layouting::Layout &parentItem) override + void addToInnerLayout(Layouting::Layout &layout) override { if (const QList embedded = aspectsToEmbed(); !embedded.isEmpty()) { - Layouting::Layout layout(new QHBoxLayout); - layout.addItem(Tr::tr("Type:")); - embedded.first()->addToInnerLayout(layout); - layout.addItem(Tr::tr("Device:")); - KitAspect::addToInnerLayout(layout); + Layouting::Layout box(new QHBoxLayout); + box.addItem(Tr::tr("Type:")); + embedded.first()->addToInnerLayout(box); + box.addItem(Tr::tr("Device:")); + KitAspect::addToInnerLayout(box); QSizePolicy p = comboBoxes().first()->sizePolicy(); p.setHorizontalStretch(1); comboBoxes().first()->setSizePolicy(p); - parentItem.addItem(layout); + layout.addItem(box); } else { - KitAspect::addToInnerLayout(parentItem); + KitAspect::addToInnerLayout(layout); } } }; diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp index 89505f6c48a..fdbb0d63272 100644 --- a/src/plugins/projectexplorer/kitaspects.cpp +++ b/src/plugins/projectexplorer/kitaspects.cpp @@ -53,10 +53,10 @@ public: private: void makeReadOnly() override { m_chooser->setReadOnly(true); } - void addToInnerLayout(Layouting::Layout &builder) override + void addToInnerLayout(Layouting::Layout &layout) override { addMutableAction(m_chooser); - builder.addItem(Layouting::Span(2, m_chooser)); + layout.addItem(Layouting::Span(2, m_chooser)); } void refresh() override @@ -218,11 +218,11 @@ public: } private: - void addToInnerLayout(Layouting::Layout &builder) override + void addToInnerLayout(Layouting::Layout &layout) override { addMutableAction(m_mainWidget); - builder.addItem(m_mainWidget); - builder.addItem(m_manageButton); + layout.addItem(m_mainWidget); + layout.addItem(m_manageButton); } void makeReadOnly() override { m_manageButton->setEnabled(false); } diff --git a/src/plugins/projectexplorer/toolchainkitaspect.cpp b/src/plugins/projectexplorer/toolchainkitaspect.cpp index 6e0cc7cb53d..cd8db8f27b1 100644 --- a/src/plugins/projectexplorer/toolchainkitaspect.cpp +++ b/src/plugins/projectexplorer/toolchainkitaspect.cpp @@ -107,26 +107,26 @@ public: } private: - void addToInnerLayout(Layouting::Layout &builder) override + void addToInnerLayout(Layouting::Layout &layout) override { const auto mainWidget = createSubWidget(); mainWidget->setContentsMargins(0, 0, 0, 0); - const auto layout = new QGridLayout(mainWidget); - layout->setContentsMargins(0, 0, 0, 0); - layout->setColumnStretch(1, 2); + const auto grid = new QGridLayout(mainWidget); + grid->setContentsMargins(0, 0, 0, 0); + grid->setColumnStretch(1, 2); int row = 0; const QList cbList = comboBoxes(); QTC_ASSERT(cbList.size() == m_sortedLanguageCategories.size(), return); for (const LanguageCategory &lc : std::as_const(m_sortedLanguageCategories)) { - layout->addWidget( + grid->addWidget( new QLabel(ToolchainManager::displayNameOfLanguageCategory(lc) + ':'), row, 0); - layout->addWidget(cbList.at(row), row, 1); + grid->addWidget(cbList.at(row), row, 1); ++row; } addMutableAction(mainWidget); - builder.addItem(mainWidget); + layout.addItem(mainWidget); } QList m_sortedLanguageCategories; diff --git a/src/plugins/qbsprojectmanager/qbskitaspect.cpp b/src/plugins/qbsprojectmanager/qbskitaspect.cpp index e2700c5dec8..4de4e92e25d 100644 --- a/src/plugins/qbsprojectmanager/qbskitaspect.cpp +++ b/src/plugins/qbsprojectmanager/qbskitaspect.cpp @@ -35,11 +35,11 @@ private: void makeReadOnly() override { m_changeButton->setEnabled(false); } void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); } - void addToInnerLayout(Layouting::Layout &parent) override + void addToInnerLayout(Layouting::Layout &layout) override { addMutableAction(m_contentLabel); - parent.addItem(m_contentLabel); - parent.addItem(m_changeButton); + layout.addItem(m_contentLabel); + layout.addItem(m_changeButton); } void changeProperties() diff --git a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp index 0f4658acc8a..34d7ddfbd3b 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp @@ -44,10 +44,10 @@ public: ~QmakeKitAspectImpl() override { delete m_lineEdit; } private: - void addToInnerLayout(Layouting::Layout &parent) override + void addToInnerLayout(Layouting::Layout &layout) override { addMutableAction(m_lineEdit); - parent.addItem(m_lineEdit); + layout.addItem(m_lineEdit); } void makeReadOnly() override { m_lineEdit->setEnabled(false); } diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp index 14cfe626324..b738278db4f 100644 --- a/src/plugins/qtsupport/qtkitaspect.cpp +++ b/src/plugins/qtsupport/qtkitaspect.cpp @@ -84,19 +84,19 @@ public: } private: - void addToInnerLayout(Layouting::Layout &parentItem) override + void addToInnerLayout(Layouting::Layout &layout) override { if (const QList embedded = aspectsToEmbed(); !embedded.isEmpty()) { - Layouting::Layout layout(new QHBoxLayout); - KitAspect::addToInnerLayout(layout); + Layouting::Layout box(new QHBoxLayout); + KitAspect::addToInnerLayout(box); QSizePolicy p = comboBoxes().first()->sizePolicy(); p.setHorizontalStretch(2); comboBoxes().first()->setSizePolicy(p); - layout.addItem(Tr::tr("Mkspec:")); - embedded.first()->addToInnerLayout(layout); - parentItem.addItem(layout); + box.addItem(Tr::tr("Mkspec:")); + embedded.first()->addToInnerLayout(box); + layout.addItem(box); } else { - KitAspect::addToInnerLayout(parentItem); + KitAspect::addToInnerLayout(layout); } } };