From dc839df59be8f167b938f3cbb49887ce381367db Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 25 Jul 2022 17:56:47 +0200 Subject: [PATCH] Utils: Introduce a Layouting::empty item A bit more explicit than the current mix of Space() and asserting {}. Change-Id: Ia296b1d23294dfccd1e33827e136b821a4d2c6fe Reviewed-by: Qt CI Bot Reviewed-by: Eike Ziller Reviewed-by: Alessandro Portale --- src/libs/utils/aspects.cpp | 2 +- src/libs/utils/filewizardpage.cpp | 2 +- src/libs/utils/layoutbuilder.cpp | 1 + src/libs/utils/layoutbuilder.h | 3 ++- src/plugins/android/androidsettingswidget.cpp | 1 - src/plugins/beautifier/clangformat/clangformatoptionspage.cpp | 1 - src/plugins/coreplugin/generalsettings.cpp | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 760b78c6a25..4e6b6459fae 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1491,7 +1491,7 @@ void SelectionAspect::addToLayout(LayoutBuilder &builder) button->setChecked(i == value()); button->setEnabled(option.enabled); button->setToolTip(option.tooltip); - builder.addItems({{}, button}); + builder.addItems({Layouting::empty, button}); d->m_buttons.append(button); d->m_buttonGroup->addButton(button, i); if (isAutoApply()) { diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp index 1b0dd064f77..38e3300d1d3 100644 --- a/src/libs/utils/filewizardpage.cpp +++ b/src/libs/utils/filewizardpage.cpp @@ -75,7 +75,7 @@ FileWizardPage::FileWizardPage(QWidget *parent) : using namespace Layouting; Form { - Space(), d->m_defaultSuffixLabel, br, + empty, d->m_defaultSuffixLabel, br, tr("File name:"), d->m_nameLineEdit, br, tr("Path:"), d->m_pathChooser }.attachTo(this); diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp index 12145624050..e3d17e7ff6d 100644 --- a/src/libs/utils/layoutbuilder.cpp +++ b/src/libs/utils/layoutbuilder.cpp @@ -511,6 +511,7 @@ LayoutBuilder::Setter title(const QString &title, BoolAspect *checker) LayoutBuilder::Break br; LayoutBuilder::Stretch st; +LayoutBuilder::Space empty(0); } // Layouting } // Utils diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h index 68cf663d6db..31642f3dac1 100644 --- a/src/libs/utils/layoutbuilder.h +++ b/src/libs/utils/layoutbuilder.h @@ -117,7 +117,7 @@ public: class QTCREATOR_UTILS_EXPORT Space : public LayoutItem { public: - explicit Space(int space = 0); + explicit Space(int space); }; class QTCREATOR_UTILS_EXPORT Span : public LayoutItem @@ -226,6 +226,7 @@ using Break = LayoutBuilder::Break; // FIXME: Remove QTCREATOR_UTILS_EXPORT extern LayoutBuilder::Break br; QTCREATOR_UTILS_EXPORT extern LayoutBuilder::Stretch st; +QTCREATOR_UTILS_EXPORT extern LayoutBuilder::Space empty; } // Layouting } // Utils diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 35ab12be027..cb143ad961d 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -353,7 +353,6 @@ AndroidSettingsWidget::AndroidSettingsWidget() downloadNdkToolButton->setIcon(downloadIcon); using namespace Layouting; - const Space empty; Column { Group { diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index aa389aaa66d..9dd3abc64d9 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -109,7 +109,6 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings * useCustomizedStyle->setChecked(true); using namespace Utils::Layouting; - const Space empty; Form { m_usePredefinedStyle, m_predefinedStyle, br, diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 91dc8108850..5e6373ea96b 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -124,7 +124,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q) if (!Utils::HostOsInfo::isMacHost()) { auto dpiCheckbox = new QCheckBox(tr("Enable high DPI scaling")); - form.addRow({Space(), dpiCheckbox}); + form.addRow({empty, dpiCheckbox}); const bool defaultValue = Utils::HostOsInfo::isWindowsHost(); dpiCheckbox->setChecked(ICore::settings()->value(settingsKeyDPI, defaultValue).toBool()); connect(dpiCheckbox, &QCheckBox::toggled, this, [defaultValue](bool checked) { @@ -135,7 +135,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q) }); } - form.addRow({Space(), m_showShortcutsInContextMenus}); + form.addRow({empty, m_showShortcutsInContextMenus}); form.addRow(Row{m_resetWarningsButton, st}); form.addRow({tr("Text codec for tools:"), m_codecBox, st}); Column{Group{Title(tr("User Interface")), form}}.attachTo(this);