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

Utils: Remove one LayoutBuilder::addRow() overload

Browse Source 
The flexibility here is getting in the way later when trying to
remove the dependency on aspects.

Change-Id: I7221e80f2067292c7c80aead8f6d739fb7878f7e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-04-24 17:06:32 +02:00
parent dad415b884
commit b7ca84c5ee
13 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/layoutbuilder.cpp
View File

@@ -341,17 +341,6 @@ LayoutBuilder &LayoutBuilder::finishRow()
return *this;
}
/*!
This starts a new row containing the \a item. The row can be further extended by
other items using \c addItem() or \c addItems().
\sa finishRow(), addItem(), addItems()
*/
LayoutBuilder &LayoutBuilder::addRow(const LayoutItem &item)
{
return finishRow().addItem(item);
}
/*!
This starts a new row containing \a items. The row can be further extended by
other items using \c addItem() or \c addItems().

1
src/libs/utils/layoutbuilder.h
View File

@@ -188,7 +188,6 @@ public:
LayoutBuilder &addItems(const LayoutItems &items);
LayoutBuilder &finishRow();
LayoutBuilder &addRow(const LayoutItem &item);
LayoutBuilder &addRow(const LayoutItems &items);
LayoutType layoutType() const { return m_layoutType; }

4
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -603,8 +603,8 @@ QWidget *AndroidDeployQtStep::createConfigWidget()
});
Layouting::Form builder;
builder.addRow(m_uninstallPreviousPackage);
builder.addRow(installCustomApkButton);
builder.addRow({m_uninstallPreviousPackage});
builder.addRow({installCustomApkButton});
builder.attachTo(widget, Layouting::WithoutMargins);
return widget;

10
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -560,17 +560,17 @@ QWidget *CMakeBuildStep::createConfigWidget()
envWidget->setBaseEnvironmentText(baseEnvironmentText());
});
builder.addRow(clearBox);
builder.addRow(envWidget);
builder.addRow({clearBox});
builder.addRow({envWidget});
};
Layouting::Form builder;
builder.addRow(m_cmakeArguments);
builder.addRow(m_toolArguments);
builder.addRow({m_cmakeArguments});
builder.addRow({m_toolArguments});
builder.addRow({Tr::tr("Stage for installation:"), Layouting::Row{m_useStaging, m_stagingDir}});
if (m_useiOSAutomaticProvisioningUpdates)
builder.addRow(m_useiOSAutomaticProvisioningUpdates);
builder.addRow({m_useiOSAutomaticProvisioningUpdates});
builder.addRow({new QLabel(Tr::tr("Targets:")), frame});

2
src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp
View File

@@ -107,7 +107,7 @@ QWidget *CMakeInstallStep::createConfigWidget()
setDisplayName(Tr::tr("Install", "ConfigWidget display name."));
Layouting::Form builder;
builder.addRow(m_cmakeArguments);
builder.addRow({m_cmakeArguments});
auto widget = builder.emerge(Layouting::WithoutMargins);

2
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -114,7 +114,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q)
}
form.addRow({empty, m_showShortcutsInContextMenus});
form.addRow(Row{m_resetWarningsButton, st});
form.addRow({Row{m_resetWarningsButton, st}});
form.addRow({Tr::tr("Text codec for tools:"), m_codecBox, st});
Column{Group{title(Tr::tr("User Interface")), form}}.attachTo(this);

15
src/plugins/coreplugin/systemsettings.cpp
View File

@@ -170,19 +170,18 @@ public:
{Tr::tr("When files are externally modified:"), Span(2, Row{m_reloadBehavior, st})});
form.addRow(
{m_autoSaveCheckBox, Span(2, Row{Tr::tr("Interval:"), m_autoSaveInterval, st})});
form.addRow(Span(3, m_autoSaveRefactoringCheckBox));
form.addRow({Span(3, m_autoSaveRefactoringCheckBox)});
form.addRow({m_autoSuspendCheckBox,
Span(2, Row{autoSuspendLabel, m_autoSuspendMinDocumentCount, st})});
form.addRow(Span(3, Row{m_warnBeforeOpeningBigFiles, m_bigFilesLimitSpinBox, st}));
form.addRow(Span(3,
form.addRow({Span(3, Row{m_warnBeforeOpeningBigFiles, m_bigFilesLimitSpinBox, st})});
form.addRow({Span(3,
Row{Tr::tr("Maximum number of entries in \"Recent Files\":"),
m_maxRecentFilesSpinBox,
st}));
form.addRow(m_askBeforeExitCheckBox);
st})});
form.addRow({m_askBeforeExitCheckBox});
#ifdef ENABLE_CRASHPAD
form.addRow(
Span(3, Row{m_enableCrashReportingCheckBox, helpCrashReportingButton, st}));
form.addRow(Span(3, Row{m_clearCrashReportsButton, m_crashReportsSizeText, st}));
form.addRow({Span(3, Row{m_enableCrashReportingCheckBox, helpCrashReportingButton, st})});
form.addRow({Span(3, Row{m_clearCrashReportsButton, m_crashReportsSizeText, st})});
#endif
Column {

6
src/plugins/debugger/debuggerrunconfigurationaspect.cpp
View File

@@ -48,7 +48,7 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
setConfigWidgetCreator([this] {
Layouting::Grid builder;
builder.addRow(m_cppAspect);
builder.addRow({m_cppAspect});
auto info = new QLabel(
Tr::tr("<a href=\""
"qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"
@@ -57,11 +57,11 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
connect(info, &QLabel::linkActivated, [](const QString &link) {
Core::HelpManager::showHelpUrl(link);
});
builder.addRow(m_overrideStartupAspect);
builder.addRow({m_overrideStartupAspect});
static const QString env = qtcEnvironmentVariable("QTC_DEBUGGER_MULTIPROCESS");
if (env.toInt())
builder.addRow(m_multiProcessAspect);
builder.addRow({m_multiProcessAspect});
auto details = new DetailsWidget;
details->setState(DetailsWidget::Expanded);

2
src/plugins/debugger/debuggersourcepathmappingwidget.cpp
View File

@@ -496,7 +496,7 @@ void SourcePathMapAspect::addToLayout(Layouting::LayoutBuilder &builder)
QTC_CHECK(!d->m_widget);
d->m_widget = createSubWidget<DebuggerSourcePathMappingWidget>();
d->m_widget->setSourcePathMap(value());
builder.addRow(d->m_widget.data());
builder.addRow({d->m_widget.data()});
}
QVariant SourcePathMapAspect::volatileValue() const

8
src/plugins/projectexplorer/makestep.cpp
View File

@@ -318,12 +318,12 @@ CommandLine MakeStep::effectiveMakeCommand(MakeCommandType type) const
QWidget *MakeStep::createConfigWidget()
{
Layouting::Form builder;
builder.addRow(m_makeCommandAspect);
builder.addRow(m_userArgumentsAspect);
builder.addRow({m_makeCommandAspect});
builder.addRow({m_userArgumentsAspect});
builder.addRow({m_userJobCountAspect, m_overrideMakeflagsAspect, m_nonOverrideWarning});
if (m_disablingForSubDirsSupported)
builder.addRow(m_disabledForSubdirsAspect);
builder.addRow(m_buildTargetsAspect);
builder.addRow({m_disabledForSubdirsAspect});
builder.addRow({m_buildTargetsAspect});
auto widget = builder.emerge(Layouting::WithoutMargins);

12
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -659,23 +659,23 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step)
installDirChooser->setExpectedKind(PathChooser::Directory);
Layouting::Form builder;
builder.addRow(m_qbsStep->m_buildVariant);
builder.addRow(m_qbsStep->m_selectedAbis);
builder.addRow(m_qbsStep->m_maxJobCount);
builder.addRow({m_qbsStep->m_buildVariant});
builder.addRow({m_qbsStep->m_selectedAbis});
builder.addRow({m_qbsStep->m_maxJobCount});
builder.addRow({QbsProjectManager::Tr::tr("Properties:"), propertyEdit});
builder.addRow(QbsProjectManager::Tr::tr("Flags:"));
builder.addRow({QbsProjectManager::Tr::tr("Flags:")});
m_qbsStep->m_keepGoing->addToLayout(builder);
m_qbsStep->m_showCommandLines->addToLayout(builder);
m_qbsStep->m_forceProbes->addToLayout(builder);
builder.addRow(QbsProjectManager::Tr::tr("Installation flags:"));
builder.addRow({QbsProjectManager::Tr::tr("Installation flags:")});
m_qbsStep->m_install->addToLayout(builder);
m_qbsStep->m_cleanInstallDir->addToLayout(builder);
builder.addItem(defaultInstallDirCheckBox);
builder.addRow({QbsProjectManager::Tr::tr("Installation directory:"), installDirChooser});
builder.addRow(m_qbsStep->m_commandLine);
builder.addRow({m_qbsStep->m_commandLine});
builder.attachTo(this, Layouting::WithoutMargins);
propertyEdit->setToolTip(QbsProjectManager::Tr::tr("Properties to pass to the project."));

2
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -174,7 +174,7 @@ QWidget *QbsInstallStep::createConfigWidget()
Layouting::Form builder;
builder.addRow({Tr::tr("Install root:"), installRootValueLabel});
builder.addRow(Tr::tr("Flags:"));
builder.addRow({Tr::tr("Flags:")});
m_dryRun->addToLayout(builder);
m_keepGoing->addToLayout(builder);
m_cleanInstallRoot->addToLayout(builder);

6
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -481,9 +481,9 @@ QWidget *QMakeStep::createConfigWidget()
abisListWidget = new QListWidget;
Layouting::Form builder;
builder.addRow(m_buildType);
builder.addRow(m_userArgs);
builder.addRow(m_effectiveCall);
builder.addRow({m_buildType});
builder.addRow({m_userArgs});
builder.addRow({m_effectiveCall});
builder.addRow({abisLabel, abisListWidget});
auto widget = builder.emerge(Layouting::WithoutMargins);