From 8d12fd07e2e07ae3bd360556fd8397d117139ef2 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 3 Feb 2022 11:24:56 +0100 Subject: [PATCH] CMakePM: Rename "Additional CMake parameters" to "... options" CMake documentation calls them Options, and we should use the same terminology. See https://cmake.org/cmake/help/v3.22/manual/cmake.1.html?#options Change-Id: Ibb8ed9dd5a830290770a7fa89e7e5e1ce2d8c74a Reviewed-by: Leena Miettinen Reviewed-by: Alessandro Portale --- .../cmakebuildconfiguration.cpp | 46 +++++++++---------- .../cmakebuildconfiguration.h | 4 +- .../cmakeprojectmanager/cmakeconfigitem.cpp | 4 +- .../cmakeprojectmanager/cmakeconfigitem.h | 2 +- .../cmakekitinformation.cpp | 10 ++-- .../cmakeprojectmanager/fileapireader.cpp | 4 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index bd605f7c2d9..dac88ee842b 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -345,7 +345,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) cmakeConfiguration, Row { bc->aspect(), - bc->aspect() + bc->aspect() }, m_reconfigureButton, } @@ -533,9 +533,9 @@ void CMakeBuildSettingsWidget::batchEditConfiguration() return expander->expand(s); }); const bool isInitial = isInitialConfiguration(); - QStringList unknownArguments; + QStringList unknownOptions; CMakeConfig config = CMakeConfig::fromArguments(isInitial ? lines : expandedLines, - unknownArguments); + unknownOptions); for (auto &ci : config) ci.isInitial = isInitial; @@ -698,10 +698,10 @@ void CMakeBuildSettingsWidget::updateButtonState() m_resetButton->setEnabled(m_configModel->hasChanges(isInitial) && !isParsing); m_buildConfiguration->aspect()->setVisible(isInitialConfiguration()); - m_buildConfiguration->aspect()->setVisible(!isInitialConfiguration()); + m_buildConfiguration->aspect()->setVisible(!isInitialConfiguration()); m_buildConfiguration->aspect()->setEnabled(!isParsing); - m_buildConfiguration->aspect()->setEnabled(!isParsing); + m_buildConfiguration->aspect()->setEnabled(!isParsing); // Update label and text boldness of the reconfigure button QFont reconfigureButtonFont = m_reconfigureButton->font(); @@ -1092,7 +1092,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id) auto initialCMakeArgumentsAspect = addAspect(); initialCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); }); - auto additionalCMakeArgumentsAspect = addAspect(); + auto additionalCMakeArgumentsAspect = addAspect(); additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); }); macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG, @@ -1392,7 +1392,7 @@ void CMakeBuildConfiguration::setInitialCMakeArguments(const QStringList &args) QStringList CMakeBuildConfiguration::additionalCMakeArguments() const { - return ProcessArgs::splitArgs(aspect()->value()); + return ProcessArgs::splitArgs(aspect()->value()); } void CMakeBuildConfiguration::setAdditionalCMakeArguments(const QStringList &args) @@ -1404,7 +1404,7 @@ void CMakeBuildConfiguration::setAdditionalCMakeArguments(const QStringList &arg [](const QString &s) { return !s.isEmpty(); }); - aspect()->setValue( + aspect()->setValue( ProcessArgs::joinArgs(nonEmptyAdditionalArguments)); } @@ -1413,13 +1413,13 @@ void CMakeBuildConfiguration::filterConfigArgumentsFromAdditionalCMakeArguments( // On iOS the %{Ios:DevelopmentTeam:Flag} evalues to something like // -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM:STRING=MAGICSTRING // which is already part of the CMake variables and should not be also - // in the addtional CMake parameters + // in the addtional CMake options const QStringList arguments = ProcessArgs::splitArgs( - aspect()->value()); - QStringList unknownArguments; - const CMakeConfig config = CMakeConfig::fromArguments(arguments, unknownArguments); + aspect()->value()); + QStringList unknownOptions; + const CMakeConfig config = CMakeConfig::fromArguments(arguments, unknownOptions); - aspect()->setValue(ProcessArgs::joinArgs(unknownArguments)); + aspect()->setValue(ProcessArgs::joinArgs(unknownOptions)); } void CMakeBuildConfiguration::setError(const QString &message) @@ -1675,7 +1675,7 @@ const QStringList InitialCMakeArgumentsAspect::allValues() const return initialCMakeArguments; } -void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringList &additionalArguments) +void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringList &additionalOptions) { QStringList arguments = values.split('\n', Qt::SkipEmptyParts); for (QString &arg: arguments) { @@ -1686,13 +1686,13 @@ void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringLis if (arg.startsWith("-T")) arg.replace("-T", "-DCMAKE_GENERATOR_TOOLSET:STRING="); } - m_cmakeConfiguration = CMakeConfig::fromArguments(arguments, additionalArguments); + m_cmakeConfiguration = CMakeConfig::fromArguments(arguments, additionalOptions); for (CMakeConfigItem &ci : m_cmakeConfiguration) ci.isInitial = true; - // Display the unknown arguments in "Additional CMake parameters" - const QString additionalArgumentsValue = ProcessArgs::joinArgs(additionalArguments); - BaseAspect::setValueQuietly(additionalArgumentsValue); + // Display the unknown arguments in "Additional CMake Options" + const QString additionalOptionsValue = ProcessArgs::joinArgs(additionalOptions); + BaseAspect::setValueQuietly(additionalOptionsValue); } void InitialCMakeArgumentsAspect::setCMakeConfiguration(const CMakeConfig &config) @@ -1717,18 +1717,18 @@ void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect() { setSettingsKey("CMake.Initial.Parameters"); - setLabelText(tr("Additional CMake parameters:")); + setLabelText(tr("Additional CMake options:")); setDisplayStyle(LineEditDisplay); } // ---------------------------------------------------------------------- -// - AdditionalCMakeParametersAspect: +// - AdditionalCMakeOptionsAspect: // ---------------------------------------------------------------------- -AdditionalCMakeArgumentsAspect::AdditionalCMakeArgumentsAspect() +AdditionalCMakeOptionsAspect::AdditionalCMakeOptionsAspect() { - setSettingsKey("CMake.Additional.Parameters"); - setLabelText(tr("Additional CMake parameters:")); + setSettingsKey("CMake.Additional.Options"); + setLabelText(tr("Additional CMake options:")); setDisplayStyle(LineEditDisplay); } diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h index 4f6b909592e..2ac05c33d3a 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h @@ -164,12 +164,12 @@ public: void toMap(QVariantMap &map) const final; }; -class AdditionalCMakeArgumentsAspect final : public Utils::StringAspect +class AdditionalCMakeOptionsAspect final : public Utils::StringAspect { Q_OBJECT public: - AdditionalCMakeArgumentsAspect(); + AdditionalCMakeOptionsAspect(); }; class SourceDirectoryAspect final : public Utils::StringAspect diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp index a2eabe627ab..9347d84eccb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp @@ -310,7 +310,7 @@ static CMakeConfigItem unsetItemFromString(const QString &input) return item; } -CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unknownArguments) +CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unknownOptions) { CMakeConfig result; bool inSet = false; @@ -343,7 +343,7 @@ CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unk continue; } - unknownArguments.append(i); + unknownOptions.append(i); } return result; } diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h index 056a31ac986..10a8d8b7174 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h @@ -91,7 +91,7 @@ public: const QList &toList() const { return *this; } - static CMakeConfig fromArguments(const QStringList &list, QStringList &unknownArguments); + static CMakeConfig fromArguments(const QStringList &list, QStringList &unknownOptions); static CMakeConfig fromFile(const Utils::FilePath &input, QString *errorMessage); QByteArray valueOf(const QByteArray &key) const; diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 14783dcf4e9..dcf50d5df10 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -942,7 +942,7 @@ private: m_additionalEditor = new QLineEdit; auto additionalLabel = new QLabel(m_dialog); - additionalLabel->setText(tr("Additional CMake parameters: ")); + additionalLabel->setText(tr("Additional CMake options: ")); auto additionalChooser = new VariableChooser(m_dialog); additionalChooser->addSupportedWidget(m_additionalEditor); @@ -984,16 +984,16 @@ private: QTC_ASSERT(m_editor, return); KitGuard guard(kit()); - QStringList unknownArguments; + QStringList unknownOptions; const CMakeConfig config = CMakeConfig::fromArguments(m_editor->toPlainText().split('\n'), - unknownArguments); + unknownOptions); CMakeConfigurationKitAspect::setConfiguration(kit(), config); QString additionalConfiguration = m_additionalEditor->text(); - if (!unknownArguments.isEmpty()) { + if (!unknownOptions.isEmpty()) { if (!additionalConfiguration.isEmpty()) additionalConfiguration += " "; - additionalConfiguration += ProcessArgs::joinArgs(unknownArguments); + additionalConfiguration += ProcessArgs::joinArgs(unknownOptions); } CMakeConfigurationKitAspect::setAdditionalConfiguration(kit(), additionalConfiguration); } diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index 3233dbe1922..aa50147aab4 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -325,10 +325,10 @@ void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &conf QTC_CHECK(buildDir.ensureWritableDir()); QByteArray contents; - QStringList unknownArguments; + QStringList unknownOptions; contents.append("# This file is managed by Qt Creator, do not edit!\n\n"); contents.append( - transform(CMakeConfig::fromArguments(configurationArguments, unknownArguments).toList(), + transform(CMakeConfig::fromArguments(configurationArguments, unknownOptions).toList(), [](const CMakeConfigItem &item) { return item.toCMakeSetLine(nullptr); }) .join('\n') .toUtf8());