Utils: Settle on lowerSnakeCase for LayoutBuilder::Setter

Change-Id: Icfe487d8c7712cc8ad28f0f61e8ae4778a356fc3
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
2022-07-26 13:46:27 +02:00
parent 86b8f68f78
commit 58c5b126d3
38 changed files with 67 additions and 75 deletions

View File

@@ -481,11 +481,6 @@ Group::Group(const LayoutBuilder::Setters &setters, const LayoutBuilder &innerLa
func(widget);
}
LayoutBuilder::Setter Title(const QString &title, BoolAspect *checker)
{
return Layouting::title(title, checker);
}
LayoutBuilder::Setter title(const QString &title, BoolAspect *checker)
{
return [title, checker](QObject *target) {

View File

@@ -188,9 +188,6 @@ namespace Layouting {
QTCREATOR_UTILS_EXPORT LayoutBuilder::Setter title(const QString &title,
BoolAspect *checker = nullptr);
QTCREATOR_UTILS_EXPORT LayoutBuilder::Setter Title(const QString &title,
BoolAspect *checker = nullptr); // FIXME: Remove
class QTCREATOR_UTILS_EXPORT Group : public LayoutBuilder::LayoutItem
{
public:

View File

@@ -102,7 +102,7 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
Column {
Group {
Title(tr("Keystore")),
title(tr("Keystore")),
Form {
tr("Password:"), m_keystorePassLineEdit, br,
tr("Retype password:"), m_keystoreRetypePassLineEdit, br,
@@ -111,7 +111,7 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
},
Group {
Title(tr("Certificate")),
title(tr("Certificate")),
Form {
tr("Alias name:"), m_certificateAliasLineEdit, br,
tr("Keysize:"), m_keySizeSpinBox, br,
@@ -124,7 +124,7 @@ AndroidCreateKeystoreCertificate::AndroidCreateKeystoreCertificate(QWidget *pare
},
Group {
Title(tr("Certificate Distinguished Names")),
title(tr("Certificate Distinguished Names")),
Form {
tr("First and last name:"), m_commonNameLineEdit, br,
tr("Organizational unit (e.g. Necessitas):"), m_organizationUnitLineEdit, br,

View File

@@ -159,7 +159,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config,
applySelectionButton,
st,
Group {
Title(tr("Show Packages")),
title(tr("Show Packages")),
Column {
Row { tr("Channel:"), channelCheckbox },
obsoleteCheckBox,

View File

@@ -356,7 +356,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
Column {
Group {
Title(tr("Android Settings")),
title(tr("Android Settings")),
Grid {
tr("JDK location:"),
m_openJdkLocationPathChooser,
@@ -388,7 +388,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
}
},
Group {
Title(tr("Android OpenSSL settings (Optional)")),
title(tr("Android OpenSSL settings (Optional)")),
Grid {
tr("OpenSSL binaries location:"),
m_openSslPathChooser,

View File

@@ -154,11 +154,11 @@ CTestSettingsPage::CTestSettingsPage(CTestSettings *settings, Utils::Id settings
Row {s.stopOnFailure}, br,
Row {s.outputMode}, br,
Group {
Title(tr("Repeat tests"), &s.repeat),
title(tr("Repeat tests"), &s.repeat),
Row {s.repetitionMode, s.repetitionCount},
}, br,
Group {
Title(tr("Run in parallel"), &s.parallel),
title(tr("Run in parallel"), &s.parallel),
Column {
Row {s.jobs}, br,
Row {s.testLoad, s.threshold}

View File

@@ -133,7 +133,7 @@ QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Id settingsId)
s.limitWarnings, s.maxWarnings
},
Group {
Title(QtTestSettings::tr("Benchmark Metrics")),
title(QtTestSettings::tr("Benchmark Metrics")),
Column { s.metrics }
},
};

View File

@@ -183,7 +183,7 @@ TestSettingsWidget::TestSettingsWidget(QWidget *parent)
using namespace Utils::Layouting;
Group generalGroup {
Title(tr("General")),
title(tr("General")),
Column {
m_omitInternalMsgCB,
m_omitRunConfigWarnCB,
@@ -202,7 +202,7 @@ TestSettingsWidget::TestSettingsWidget(QWidget *parent)
};
Group activeFrameworks {
Title(tr("Active Test Frameworks")),
title(tr("Active Test Frameworks")),
Column {
m_frameworkTreeWidget,
m_frameworksWarn,

View File

@@ -106,12 +106,12 @@ BazaarSettingsPage::BazaarSettingsPage(BazaarSettings *settings)
Column {
Group {
Title(BazaarSettings::tr("Configuration")),
title(BazaarSettings::tr("Configuration")),
Row { s.binaryPath }
},
Group {
Title(BazaarSettings::tr("User")),
title(BazaarSettings::tr("User")),
Form {
s.userName,
s.userEmail
@@ -119,7 +119,7 @@ BazaarSettingsPage::BazaarSettingsPage(BazaarSettings *settings)
},
Group {
Title(BazaarSettings::tr("Miscellaneous")),
title(BazaarSettings::tr("Miscellaneous")),
Row {
s.logCount,
s.timeout,

View File

@@ -119,7 +119,7 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett
Column {
Group {
Title(tr("Configuration")),
title(tr("Configuration")),
Form {
tr("Artistic Style command:"), m_command, br,
tr("Restrict to MIME types:"), m_mime

View File

@@ -118,7 +118,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
Column {
Group {
Title(tr("Configuration")),
title(tr("Configuration")),
Form {
tr("Clang Format command:"), m_command, br,
tr("Restrict to MIME types:"), m_mime

View File

@@ -65,11 +65,11 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent)
Column {
Group {
Title(tr("Name")),
title(tr("Name")),
Column { m_name }
},
Group {
Title(tr("Value")),
title(tr("Value")),
Column {
m_editor,
m_documentationHeader,

View File

@@ -87,7 +87,7 @@ GeneralOptionsPageWidget::GeneralOptionsPageWidget(const QStringList &toolIds)
Column {
Group {
Title(tr("Automatic Formatting on File Save")),
title(tr("Automatic Formatting on File Save")),
Form {
Span(2, m_autoFormat), br,
toolLabel, m_autoFormatTool, br,

View File

@@ -123,7 +123,7 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
Column {
Group {
Title(tr("Configuration")),
title(tr("Configuration")),
Form {
tr("Uncrustify command:"), m_command, br,
tr("Restrict to MIME types:"), m_mime

View File

@@ -95,7 +95,7 @@ ClangToolsProjectSettingsWidget::ClangToolsProjectSettingsWidget(ProjectExplorer
m_runSettingsWidget,
Group {
Title(tr("Suppressed diagnostics")),
title(tr("Suppressed diagnostics")),
Row {
m_diagnosticsView,
Column {

View File

@@ -96,7 +96,7 @@ CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *sett
using namespace Layouting;
Column {
Group {
Title(::CMakeProjectManager::Internal::CMakeSpecificSettings::tr("Adding Files")),
title(::CMakeProjectManager::Internal::CMakeSpecificSettings::tr("Adding Files")),
Column { s.afterAddFileSetting }
},
s.packageManagerAutoSetup,

View File

@@ -138,7 +138,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q)
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);
Column{Group{title(tr("User Interface")), form}}.attachTo(this);
fillLanguageBox();
fillCodecBox();

View File

@@ -209,7 +209,7 @@ public:
Column {
Group {
Title(tr("System")),
title(tr("System")),
Column { form, st }
}
}.attachTo(this);

View File

@@ -105,7 +105,7 @@ CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(CppCodeModelSettings *s)
Column {
Group {
Title(tr("General")),
title(tr("General")),
Column {
m_interpretAmbiguousHeadersAsCHeaders,
m_ignorePchCheckBox,

View File

@@ -104,14 +104,14 @@ CvsSettingsPage::CvsSettingsPage(CvsSettings *settings)
Column {
Group {
Title(CvsSettings::tr("Configuration")),
title(CvsSettings::tr("Configuration")),
Form {
s.binaryPath,
s.cvsRoot
}
},
Group {
Title(CvsSettings::tr("Miscellaneous")),
title(CvsSettings::tr("Miscellaneous")),
Column {
Form {
s.timeout,

View File

@@ -198,7 +198,7 @@ CdbOptionsPageWidget::CdbOptionsPageWidget()
Column {
Row {
Group {
Title(Tr::tr("Startup")),
title(Tr::tr("Startup")),
Column {
s.cdbAdditionalArguments,
s.useCdbConsole,
@@ -207,7 +207,7 @@ CdbOptionsPageWidget::CdbOptionsPageWidget()
},
Group {
Title(Tr::tr("Various")),
title(Tr::tr("Various")),
Column {
s.ignoreFirstChanceAccessViolation,
s.cdbBreakOnCrtDbgReport,
@@ -218,12 +218,12 @@ CdbOptionsPageWidget::CdbOptionsPageWidget()
},
Group {
Title(Tr::tr("Break On")),
title(Tr::tr("Break On")),
Column { m_breakEventWidget }
},
Group {
Title(Tr::tr("Add Exceptions to Issues View")),
title(Tr::tr("Add Exceptions to Issues View")),
Column {
s.firstChanceExceptionTaskEntry,
s.secondChanceExceptionTaskEntry
@@ -281,8 +281,8 @@ CdbPathsPageWidget::CdbPathsPageWidget()
finish();
Column {
Group { Title(Tr::tr("Symbol Paths")), Column { m_symbolPaths } },
Group { Title(Tr::tr("Source Paths")), Column { m_sourcePaths } },
Group { title(Tr::tr("Symbol Paths")), Column { m_symbolPaths } },
Group { title(Tr::tr("Source Paths")), Column { m_sourcePaths } },
st
}.attachTo(this);
}

View File

@@ -77,7 +77,7 @@ public:
};
Column {
Group { Title("Behavior"), Row { col1, col2, st } },
Group { title("Behavior"), Row { col1, col2, st } },
s.sourcePathMap,
st
}.attachTo(this);
@@ -160,14 +160,14 @@ public:
label,
s.useCodeModel,
s.showThreadNames,
Group { Title(Tr::tr("Extra Debugging Helper")), Column { s.extraDumperFile } }
Group { title(Tr::tr("Extra Debugging Helper")), Column { s.extraDumperFile } }
};
Group useHelper {
Row {
left,
Group {
Title(Tr::tr("Debugging Helper Customization")),
title(Tr::tr("Debugging Helper Customization")),
Column { s.extraDumperCommands }
}
}

View File

@@ -119,7 +119,7 @@ public:
DebuggerSettings &s = *debuggerSettings();
Group extended {
Title(Tr::tr("Extended")),
title(Tr::tr("Extended")),
Column {
labelDangerous,
s.targetAsync,

View File

@@ -72,7 +72,7 @@ DockerSettingsPage::DockerSettingsPage(DockerSettings *settings)
// clang-format off
Column {
Group {
Title(Tr::tr("Configuration")),
title(Tr::tr("Configuration")),
Row { s.dockerBinaryPath }
},
st

View File

@@ -428,7 +428,7 @@ void FakeVimOptionPage::layoutPage(QWidget *widget)
s.useFakeVim,
Group {
Title(Tr::tr("Vim Behavior")),
title(Tr::tr("Vim Behavior")),
Column {
bools,
ints,
@@ -437,7 +437,7 @@ void FakeVimOptionPage::layoutPage(QWidget *widget)
},
Group {
Title(Tr::tr("Plugin Emulation")),
title(Tr::tr("Plugin Emulation")),
Column {
s.emulateVimCommentary,
s.emulateReplaceWithRegister,

View File

@@ -169,7 +169,7 @@ GitSettingsPage::GitSettingsPage(GitSettings *settings)
Column {
Group {
Title(GitSettings::tr("Configuration")),
title(GitSettings::tr("Configuration")),
Column {
Row { s.path },
s.winSetHomeEnvironment,
@@ -177,7 +177,7 @@ GitSettingsPage::GitSettingsPage(GitSettings *settings)
},
Group {
Title(GitSettings::tr("Miscellaneous")),
title(GitSettings::tr("Miscellaneous")),
Column {
Row { s.logCount, s.timeout, st },
s.pullRebase
@@ -185,12 +185,12 @@ GitSettingsPage::GitSettingsPage(GitSettings *settings)
},
Group {
Title(GitSettings::tr("Gitk")),
title(GitSettings::tr("Gitk")),
Row { s.gitkOptions }
},
Group {
Title(GitSettings::tr("Repository Browser")),
title(GitSettings::tr("Repository Browser")),
Row { s.repositoryBrowserCmd }
},

View File

@@ -78,7 +78,7 @@ MacroOptionsWidget::MacroOptionsWidget()
Column {
Group {
Title(tr("Preferences")),
title(tr("Preferences")),
Row {
m_treeWidget,
Column { m_removeButton, st },

View File

@@ -81,12 +81,12 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
Column {
Group {
Title(MercurialSettings::tr("Configuration")),
title(MercurialSettings::tr("Configuration")),
Row { s.binaryPath }
},
Group {
Title(MercurialSettings::tr("User")),
title(MercurialSettings::tr("User")),
Form {
s.userName,
s.userEmail
@@ -94,7 +94,7 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
},
Group {
Title(MercurialSettings::tr("Miscellaneous")),
title(MercurialSettings::tr("Miscellaneous")),
Row {
s.logCount,
s.timeout,

View File

@@ -142,7 +142,7 @@ NimToolsSettingsPage::NimToolsSettingsPage(NimSettings *settings)
using namespace Layouting;
Column {
Group {
Title("Nimsuggest"),
title("Nimsuggest"),
Column { settings->nimSuggestPath }
},
st

View File

@@ -266,17 +266,17 @@ PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings)
});
Group config {
Title(PerforceSettings::tr("Configuration")),
title(PerforceSettings::tr("Configuration")),
Row { s.p4BinaryPath }
};
Group environment {
Title(PerforceSettings::tr("Environment Variables"), &s.customEnv),
title(PerforceSettings::tr("Environment Variables"), &s.customEnv),
Row { s.p4Port, s.p4Client, s.p4User }
};
Group misc {
Title(PerforceSettings::tr("Miscellaneous")),
title(PerforceSettings::tr("Miscellaneous")),
Column {
Row { s.logCount, s.timeOutS, st },
s.promptToSubmit,

View File

@@ -105,7 +105,7 @@ QnxSettingsWidget::QnxSettingsWidget()
m_configsCombo,
Row { m_generateKitsCheckBox, st },
Group {
Title(Tr::tr("Configuration Information:")),
title(Tr::tr("Configuration Information:")),
Form {
Tr::tr("Name:"), m_configName, br,
Tr::tr("Version:"), m_configVersion, br,

View File

@@ -91,7 +91,7 @@ CodeGenSettingsPageWidget::CodeGenSettingsPageWidget()
Column {
Group {
Title(Tr::tr("Embedding of the UI Class")),
title(Tr::tr("Embedding of the UI Class")),
Column {
m_ptrAggregationRadioButton,
m_aggregationButton,
@@ -99,7 +99,7 @@ CodeGenSettingsPageWidget::CodeGenSettingsPageWidget()
}
},
Group {
Title(Tr::tr("Code Generation")),
title(Tr::tr("Code Generation")),
Column {
m_retranslateCheckBox,
m_includeQtModuleCheckBox,

View File

@@ -73,7 +73,7 @@ SshKeyCreationDialog::SshKeyCreationDialog(QWidget *parent)
using namespace Layouting;
Column {
Group {
Title(Tr::tr("Options")),
title(Tr::tr("Options")),
Form {
Tr::tr("Key algorithm:"), m_rsa, m_ecdsa, st, br,
Tr::tr("Key &size:"), m_comboBox, st, br,

View File

@@ -121,12 +121,12 @@ SubversionSettingsPage::SubversionSettingsPage(SubversionSettings *settings)
Column {
Group {
Title(SubversionSettings::tr("Configuration")),
title(SubversionSettings::tr("Configuration")),
Column { s.binaryPath }
},
Group {
Title(SubversionSettings::tr("Authentication"), &s.useAuthentication),
title(SubversionSettings::tr("Authentication"), &s.useAuthentication),
Form {
s.userName,
s.password,
@@ -134,7 +134,7 @@ SubversionSettingsPage::SubversionSettingsPage(SubversionSettings *settings)
},
Group {
Title(SubversionSettings::tr("Miscellaneous")),
title(SubversionSettings::tr("Miscellaneous")),
Column {
Row { s.logCount, s.timeout, st },
s.promptOnSubmit,

View File

@@ -76,11 +76,11 @@ KeywordDialog::KeywordDialog(const Keyword &keyword, const QSet<QString> &alread
m_listWidget,
Row {
Group {
Title(Tr::tr("Color")),
title(Tr::tr("Color")),
Row { m_colorEdit, m_colorButton }
},
Group {
Title(Tr::tr("Keyword")),
title(Tr::tr("Keyword")),
Column { m_keywordNameEdit }
}
},

View File

@@ -99,7 +99,7 @@ OptionsDialog::OptionsDialog(Settings *settings, const std::function<void ()> &o
Column {
Group {
Title(Tr::tr("Keywords")),
title(Tr::tr("Keywords")),
Row {
m_keywordsList,
Column {
@@ -112,7 +112,7 @@ OptionsDialog::OptionsDialog(Settings *settings, const std::function<void ()> &o
}
},
Group {
Title(Tr::tr("Scanning scope")),
title(Tr::tr("Scanning scope")),
Column {
m_scanInProjectRadioButton,
m_scanInCurrentFileRadioButton,

View File

@@ -58,7 +58,7 @@ TodoProjectSettingsWidget::TodoProjectSettingsWidget(ProjectExplorer::Project *p
Column {
Group {
Title(Tr::tr("Excluded Files")),
title(Tr::tr("Excluded Files")),
Row {
m_excludedPatternsList,
Column {

View File

@@ -99,9 +99,9 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings)
};
Column {
Group { Title(Tr::tr("Valgrind Generic Settings")), generic },
Group { Title(Tr::tr("MemCheck Memory Analysis Options")), memcheck },
Group { Title(Tr::tr("CallGrind Profiling Options")), callgrind },
Group { title(Tr::tr("Valgrind Generic Settings")), generic },
Group { title(Tr::tr("MemCheck Memory Analysis Options")), memcheck },
Group { title(Tr::tr("CallGrind Profiling Options")), callgrind },
st,
}.attachTo(this);
}