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

Standardize parameter name for KitAspect::addToInnerLayout

Browse Source 
Call it 'layout'

Change-Id: I57c4e569d3d6026fe84b0f4f8c384c6164262be9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2024-11-18 16:23:36 +01:00
parent 42eacb967d
commit ff38e32443
8 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
View File

@@ -348,11 +348,11 @@ private:
// KitAspectWidget interface // KitAspectWidget interface
void makeReadOnly() override { m_changeButton->setEnabled(false); } void makeReadOnly() override { m_changeButton->setEnabled(false); }
void addToInnerLayout(Layouting::Layout &parent) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
addMutableAction(m_label); addMutableAction(m_label);
parent.addItem(m_label); layout.addItem(m_label);
parent.addItem(m_changeButton); layout.addItem(m_changeButton);
} }
void refresh() override void refresh() override
@@ -859,11 +859,11 @@ public:
private: private:
// KitAspectWidget interface // KitAspectWidget interface
void addToInnerLayout(Layouting::Layout &parent) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
addMutableAction(m_summaryLabel); addMutableAction(m_summaryLabel);
parent.addItem(m_summaryLabel); layout.addItem(m_summaryLabel);
parent.addItem(m_manageButton); layout.addItem(m_manageButton);
} }
void makeReadOnly() override void makeReadOnly() override

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

@@ -41,10 +41,10 @@ private:
void makeReadOnly() final { m_toolsComboBox->setEnabled(false); } void makeReadOnly() final { m_toolsComboBox->setEnabled(false); }
void addToInnerLayout(Layouting::Layout &parent) final void addToInnerLayout(Layouting::Layout &layout) final
{ {
addMutableAction(m_toolsComboBox); addMutableAction(m_toolsComboBox);
parent.addItem(m_toolsComboBox); layout.addItem(m_toolsComboBox);
} }
void refresh() final void refresh() final

16
src/plugins/projectexplorer/devicesupport/devicekitaspects.cpp
View File

@@ -95,20 +95,20 @@ public:
private: private:
Id settingsPageItemToPreselect() const override { return DeviceAspect::deviceId(kit()); } Id settingsPageItemToPreselect() const override { return DeviceAspect::deviceId(kit()); }
void addToInnerLayout(Layouting::Layout &parentItem) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
if (const QList<KitAspect *> embedded = aspectsToEmbed(); !embedded.isEmpty()) { if (const QList<KitAspect *> embedded = aspectsToEmbed(); !embedded.isEmpty()) {
Layouting::Layout layout(new QHBoxLayout); Layouting::Layout box(new QHBoxLayout);
layout.addItem(Tr::tr("Type:")); box.addItem(Tr::tr("Type:"));
embedded.first()->addToInnerLayout(layout); embedded.first()->addToInnerLayout(box);
layout.addItem(Tr::tr("Device:")); box.addItem(Tr::tr("Device:"));
KitAspect::addToInnerLayout(layout); KitAspect::addToInnerLayout(box);
QSizePolicy p = comboBoxes().first()->sizePolicy(); QSizePolicy p = comboBoxes().first()->sizePolicy();
p.setHorizontalStretch(1); p.setHorizontalStretch(1);
comboBoxes().first()->setSizePolicy(p); comboBoxes().first()->setSizePolicy(p);
parentItem.addItem(layout); layout.addItem(box);
} else { } else {
KitAspect::addToInnerLayout(parentItem); KitAspect::addToInnerLayout(layout);
} }
} }
}; };

10
src/plugins/projectexplorer/kitaspects.cpp
View File

@@ -53,10 +53,10 @@ public:
private: private:
void makeReadOnly() override { m_chooser->setReadOnly(true); } void makeReadOnly() override { m_chooser->setReadOnly(true); }
void addToInnerLayout(Layouting::Layout &builder) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
addMutableAction(m_chooser); addMutableAction(m_chooser);
builder.addItem(Layouting::Span(2, m_chooser)); layout.addItem(Layouting::Span(2, m_chooser));
} }
void refresh() override void refresh() override
@@ -218,11 +218,11 @@ public:
} }
private: private:
void addToInnerLayout(Layouting::Layout &builder) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
addMutableAction(m_mainWidget); addMutableAction(m_mainWidget);
builder.addItem(m_mainWidget); layout.addItem(m_mainWidget);
builder.addItem(m_manageButton); layout.addItem(m_manageButton);
} }
void makeReadOnly() override { m_manageButton->setEnabled(false); } void makeReadOnly() override { m_manageButton->setEnabled(false); }

14
src/plugins/projectexplorer/toolchainkitaspect.cpp
View File

@@ -107,26 +107,26 @@ public:
} }
private: private:
void addToInnerLayout(Layouting::Layout &builder) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
const auto mainWidget = createSubWidget<QWidget>(); const auto mainWidget = createSubWidget<QWidget>();
mainWidget->setContentsMargins(0, 0, 0, 0); mainWidget->setContentsMargins(0, 0, 0, 0);
const auto layout = new QGridLayout(mainWidget); const auto grid = new QGridLayout(mainWidget);
layout->setContentsMargins(0, 0, 0, 0); grid->setContentsMargins(0, 0, 0, 0);
layout->setColumnStretch(1, 2); grid->setColumnStretch(1, 2);
int row = 0; int row = 0;
const QList<QComboBox *> cbList = comboBoxes(); const QList<QComboBox *> cbList = comboBoxes();
QTC_ASSERT(cbList.size() == m_sortedLanguageCategories.size(), return); QTC_ASSERT(cbList.size() == m_sortedLanguageCategories.size(), return);
for (const LanguageCategory &lc : std::as_const(m_sortedLanguageCategories)) { for (const LanguageCategory &lc : std::as_const(m_sortedLanguageCategories)) {
layout->addWidget( grid->addWidget(
new QLabel(ToolchainManager::displayNameOfLanguageCategory(lc) + ':'), row, 0); new QLabel(ToolchainManager::displayNameOfLanguageCategory(lc) + ':'), row, 0);
layout->addWidget(cbList.at(row), row, 1); grid->addWidget(cbList.at(row), row, 1);
++row; ++row;
} }
addMutableAction(mainWidget); addMutableAction(mainWidget);
builder.addItem(mainWidget); layout.addItem(mainWidget);
} }
QList<LanguageCategory> m_sortedLanguageCategories; QList<LanguageCategory> m_sortedLanguageCategories;

6
src/plugins/qbsprojectmanager/qbskitaspect.cpp
View File

@@ -35,11 +35,11 @@ private:
void makeReadOnly() override { m_changeButton->setEnabled(false); } void makeReadOnly() override { m_changeButton->setEnabled(false); }
void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); } void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); }
void addToInnerLayout(Layouting::Layout &parent) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
addMutableAction(m_contentLabel); addMutableAction(m_contentLabel);
parent.addItem(m_contentLabel); layout.addItem(m_contentLabel);
parent.addItem(m_changeButton); layout.addItem(m_changeButton);
} }
void changeProperties() void changeProperties()

4
src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
View File

@@ -44,10 +44,10 @@ public:
~QmakeKitAspectImpl() override { delete m_lineEdit; } ~QmakeKitAspectImpl() override { delete m_lineEdit; }
private: private:
void addToInnerLayout(Layouting::Layout &parent) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
addMutableAction(m_lineEdit); addMutableAction(m_lineEdit);
parent.addItem(m_lineEdit); layout.addItem(m_lineEdit);
} }
void makeReadOnly() override { m_lineEdit->setEnabled(false); } void makeReadOnly() override { m_lineEdit->setEnabled(false); }

14
src/plugins/qtsupport/qtkitaspect.cpp
View File

@@ -84,19 +84,19 @@ public:
} }
private: private:
void addToInnerLayout(Layouting::Layout &parentItem) override void addToInnerLayout(Layouting::Layout &layout) override
{ {
if (const QList<KitAspect *> embedded = aspectsToEmbed(); !embedded.isEmpty()) { if (const QList<KitAspect *> embedded = aspectsToEmbed(); !embedded.isEmpty()) {
Layouting::Layout layout(new QHBoxLayout); Layouting::Layout box(new QHBoxLayout);
KitAspect::addToInnerLayout(layout); KitAspect::addToInnerLayout(box);
QSizePolicy p = comboBoxes().first()->sizePolicy(); QSizePolicy p = comboBoxes().first()->sizePolicy();
p.setHorizontalStretch(2); p.setHorizontalStretch(2);
comboBoxes().first()->setSizePolicy(p); comboBoxes().first()->setSizePolicy(p);
layout.addItem(Tr::tr("Mkspec:")); box.addItem(Tr::tr("Mkspec:"));
embedded.first()->addToInnerLayout(layout); embedded.first()->addToInnerLayout(box);
parentItem.addItem(layout); layout.addItem(box);
} else { } else {
KitAspect::addToInnerLayout(parentItem); KitAspect::addToInnerLayout(layout);
} }
} }
}; };