Update terminology for dependency properties for aliases

Change "Requires" to "Required" and use plural form for the dependency
properties, to be more uniform with the dependency properties for
components.

Change-Id: Iccb36701bc32ebafd27914272225ad1615c5f9fa
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

4 files changed, 18 insertions, 18 deletions

diff --git a/src/libs/installer/componentalias.cpp b/src/libs/installer/componentalias.cpp
index 87ead7e1f..85797ca33 100644
--- a/src/libs/installer/componentalias.cpp
+++ b/src/libs/installer/componentalias.cpp
@@ -245,10 +245,10 @@ bool AliasFinder::parseXml(AliasSource source)
                     && tag2 != scDescription
                     && tag2 != scVersion
                     && tag2 != scVirtual
-                    && tag2 != scRequiresComponent
-                    && tag2 != scRequiresAlias
-                    && tag2 != scOptionalComponent
-                    && tag2 != scOptionalAlias) {
+                    && tag2 != scRequiredComponents
+                    && tag2 != scRequiredAliases
+                    && tag2 != scOptionalComponents
+                    && tag2 != scOptionalAliases) {
                 qCWarning(lcInstallerInstallLog) << "Unexpected element name:" << tag2;
                 continue;
             }
@@ -424,10 +424,10 @@ QList<Component *> ComponentAlias::components()
 {
     if (m_components.isEmpty()) {
         const QStringList componentList = QInstaller::splitStringWithComma(
-            m_variables.value(scRequiresComponent));
+            m_variables.value(scRequiredComponents));
 
         const QStringList optionalComponentList = QInstaller::splitStringWithComma(
-            m_variables.value(scOptionalComponent));
+            m_variables.value(scOptionalComponents));
 
         addRequiredComponents(componentList, false);
         addRequiredComponents(optionalComponentList, true);
@@ -444,10 +444,10 @@ QList<ComponentAlias *> ComponentAlias::aliases()
 {
     if (m_aliases.isEmpty()) {
         const QStringList aliasList = QInstaller::splitStringWithComma(
-            m_variables.value(scRequiresAlias));
+            m_variables.value(scRequiredAliases));
 
         const QStringList optionalAliasList = QInstaller::splitStringWithComma(
-            m_variables.value(scOptionalAlias));
+            m_variables.value(scOptionalAliases));
 
         addRequiredAliases(aliasList, false);
         addRequiredAliases(optionalAliasList, true);
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index 6afd732a0..e69d1bd4d 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -61,10 +61,10 @@ static const QLatin1String scTreeName("TreeName");
 static const QLatin1String scAutoTreeName("AutoTreeName");
 static const QLatin1String scDependencies("Dependencies");
 static const QLatin1String scAlias("Alias");
-static const QLatin1String scRequiresAlias("RequiresAlias");
-static const QLatin1String scRequiresComponent("RequiresComponent");
-static const QLatin1String scOptionalAlias("OptionalAlias");
-static const QLatin1String scOptionalComponent("OptionalComponent");
+static const QLatin1String scRequiredAliases("RequiredAliases");
+static const QLatin1String scRequiredComponents("RequiredComponents");
+static const QLatin1String scOptionalAliases("OptionalAliases");
+static const QLatin1String scOptionalComponents("OptionalComponents");
 static const QLatin1String scLocalDependencies("LocalDependencies");
 static const QLatin1String scAutoDependOn("AutoDependOn");
 static const QLatin1String scNewComponent("NewComponent");
diff --git a/src/libs/installer/loggingutils.cpp b/src/libs/installer/loggingutils.cpp
index a9c96e0c9..9a36720dd 100644
--- a/src/libs/installer/loggingutils.cpp
+++ b/src/libs/installer/loggingutils.cpp
@@ -392,11 +392,11 @@ void LoggingHandler::printAliasInformation(const QList<ComponentAlias *> &aliase
         if (verboseLevel() == VerbosityLevel::Detailed)
             stream << "Virtual: " << alias->value(scVirtual) << Qt::endl;
 
-        stream << "Components: " << alias->value(scRequiresComponent) << Qt::endl;
-        stream << "Required aliases: " << alias->value(scRequiresAlias) << Qt::endl;
+        stream << "Components: " << alias->value(scRequiredComponents) << Qt::endl;
+        stream << "Required aliases: " << alias->value(scRequiredAliases) << Qt::endl;
 
-        stream << "Optional components: " << alias->value(scOptionalComponent) << Qt::endl;
-        stream << "Optional aliases: " << alias->value(scOptionalAlias) << Qt::endl;
+        stream << "Optional components: " << alias->value(scOptionalComponents) << Qt::endl;
+        stream << "Optional aliases: " << alias->value(scOptionalAliases) << Qt::endl;
 
         if (sortedAliases.indexOf(alias) != (sortedAliases.count() - 1))
             stream << "========================================" << Qt::endl;
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 2590564a7..fd2e9abd4 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -461,8 +461,8 @@ bool PackageManagerCorePrivate::buildComponentAliases()
     for (auto *alias : qAsConst(m_componentAliases)) {
         aliasGraph.addNode(alias->name());
         aliasGraph.addEdges(alias->name(),
-            QInstaller::splitStringWithComma(alias->value(scRequiresAlias)) <<
-            QInstaller::splitStringWithComma(alias->value(scOptionalAlias)));
+            QInstaller::splitStringWithComma(alias->value(scRequiredAliases)) <<
+            QInstaller::splitStringWithComma(alias->value(scOptionalAliases)));
 
         if (!m_core->componentByName(alias->name())) {
             // Name ok, select for sanity check calculation