qdoc: Fix various clang warnings

- remove unused variables
- Use QString::arg() with multiple string arguments
- Avoid detaching containers in loops

Pick-to: 6.4
Change-Id: I9b29f5a0269f288b7de862eccdcee9750248dce8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Luca Di Sera <luca.disera@qt.io>

9 files changed, 25 insertions, 20 deletions

diff --git a/src/qdoc/aggregate.cpp b/src/qdoc/aggregate.cpp
index 2d3be6c4c..3ba8faa62 100644
--- a/src/qdoc/aggregate.cpp
+++ b/src/qdoc/aggregate.cpp
@@ -662,7 +662,6 @@ void Aggregate::findAllObsoleteThings()
 {
     for (auto *node : std::as_const(m_children)) {
         if (!node->isPrivate()) {
-            QString name = node->name();
             if (node->isDeprecated()) {
                 if (node->isClassNode())
                     QDocDatabase::obsoleteClasses().insert(node->qualifyCppName(), node);
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index 64389ead9..2caa39ede 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -1585,7 +1585,7 @@ void ClangCodeParser::parseSourceFile(const Location & /*location*/, const QStri
             } else if (CodeParser::isWorthWarningAbout(doc)) {
                 bool future = false;
                 if (doc.metaCommandsUsed().contains(COMMAND_SINCE)) {
-                    QString sinceVersion = doc.metaCommandArgs(COMMAND_SINCE)[0].first;
+                    QString sinceVersion = doc.metaCommandArgs(COMMAND_SINCE).at(0).first;
                     if (getUnpatchedVersion(sinceVersion) > getUnpatchedVersion(m_version))
                         future = true;
                 }
diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index 5552cfa01..41b8e95a7 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -642,7 +642,7 @@ QStringList Config::getCanonicalPathList(const QString &var, PathFlags flags) co
             else
                 qCDebug(lcQdoc) <<
                         qUtf8Printable(QStringLiteral("%1: Ignored nonexistent path \'%2\'")
-                                .arg(m_lastLocation.toString()).arg(rawValue));
+                                .arg(m_lastLocation.toString(), rawValue));
         }
     }
     return result;
diff --git a/src/qdoc/doc.cpp b/src/qdoc/doc.cpp
index 8c546042b..55623e513 100644
--- a/src/qdoc/doc.cpp
+++ b/src/qdoc/doc.cpp
@@ -296,7 +296,8 @@ void Doc::initialize(FileResolver& file_resolver)
 
     QStringMap reverseAliasMap;
 
-    for (const auto &a : config.subVars(CONFIG_ALIAS)) {
+    const auto &configAliases = config.subVars(CONFIG_ALIAS);
+    for (const auto &a : configAliases) {
         QString alias = config.getString(CONFIG_ALIAS + Config::dot + a);
         if (reverseAliasMap.contains(alias)) {
             config.lastLocation().warning(QStringLiteral("Command name '\\%1' cannot stand"
@@ -308,7 +309,8 @@ void Doc::initialize(FileResolver& file_resolver)
         m_utilities.aliasMap.insert(a, alias);
     }
 
-    for (const auto &macroName : config.subVars(CONFIG_MACRO)) {
+    const auto &configMacros = config.subVars(CONFIG_MACRO);
+    for (const auto &macroName : configMacros) {
         QString macroDotName = CONFIG_MACRO + Config::dot + macroName;
         Macro macro;
         macro.numParams = -1;
@@ -319,7 +321,8 @@ void Doc::initialize(FileResolver& file_resolver)
         }
         bool silent = false;
 
-        for (const auto &f : config.subVars(macroDotName)) {
+        const auto &macroDotNames = config.subVars(macroDotName);
+        for (const auto &f : macroDotNames) {
             QString def = config.getString(macroDotName + Config::dot + f);
             if (!def.isEmpty()) {
                 macro.m_otherDefs.insert(f, def);
diff --git a/src/qdoc/docparser.cpp b/src/qdoc/docparser.cpp
index 7f01540ca..c6883fd6e 100644
--- a/src/qdoc/docparser.cpp
+++ b/src/qdoc/docparser.cpp
@@ -255,7 +255,8 @@ void DocParser::initialize(const Config &config, FileResolver &file_resolver)
 
     // If any of the formats define quotinginformation, activate quoting
     DocParser::s_quoting = config.getBool(CONFIG_QUOTINGINFORMATION);
-    for (const auto &format : config.getOutputFormats())
+    const auto &outputFormats = config.getOutputFormats();
+    for (const auto &format : outputFormats)
         DocParser::s_quoting = DocParser::s_quoting
                 || config.getBool(format + Config::dot + CONFIG_QUOTINGINFORMATION);
 
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index 16fd35a5c..19c0c1e9e 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -910,7 +910,6 @@ void Generator::generateLinkToExample(const ExampleNode *en, CodeMarker *marker,
 void Generator::addImageToCopy(const ExampleNode *en, const ResolvedFile& resolved_file)
 {
     QDir dirInfo;
-    QString userFriendlyFilePath;
     // TODO: [uncentralized-output-directory-structure]
     const QString prefix("/images/used-in-examples");
 
@@ -1616,9 +1615,11 @@ void Generator::initialize()
         }
     }
 
-    for (const auto &n : config.subVars(CONFIG_FORMATTING)) {
+    const auto &configFormatting = config.subVars(CONFIG_FORMATTING);
+    for (const auto &n : configFormatting) {
         QString formattingDotName = CONFIG_FORMATTING + Config::dot + n;
-        for (const auto &f : config.subVars(formattingDotName)) {
+        const auto &formattingDotNames = config.subVars(formattingDotName);
+        for (const auto &f : formattingDotNames) {
             QString def = config.getString(formattingDotName + Config::dot + f);
             if (!def.isEmpty()) {
                 int numParams = Config::numParams(def);
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index 51ff61946..ca116b444 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -145,7 +145,7 @@ static void loadIndexFiles(const QSet<QString> &formats)
                 subDirs << module;
 
                 for (const auto &dir : config.indexDirs()) {
-                    for (const auto &subDir : subDirs) {
+                    for (const auto &subDir : std::as_const(subDirs)) {
                         QString fileToLookFor = dir + QLatin1Char('/') + subDir + QLatin1Char('/')
                                 + module + ".index";
                         if (QFile::exists(fileToLookFor)) {
@@ -433,7 +433,7 @@ static void processQdocconfFile(const QString &fileName)
     /*
       By default, the only output format is HTML.
      */
-    QSet<QString> outputFormats = config.getOutputFormats();
+    const QSet<QString> outputFormats = config.getOutputFormats();
     Location outputFormatsLocation = config.lastLocation();
 
     qdb->clearSearchOrder();
@@ -540,7 +540,8 @@ static void processQdocconfFile(const QString &fileName)
         */
         parsed = 0;
         qCInfo(lcQdoc) << "Parse source files for" << project;
-        for (const auto &key : sources.keys()) {
+        for (auto it = sources.cbegin(), end = sources.cend(); it != end; ++it) {
+            const auto &key = it.key();
             auto *codeParser = CodeParser::parserForSourceFile(key);
             if (codeParser) {
                 ++parsed;
diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp
index 247d1734c..79a58df4b 100644
--- a/src/qdoc/webxmlgenerator.cpp
+++ b/src/qdoc/webxmlgenerator.cpp
@@ -29,7 +29,7 @@ void WebXMLGenerator::initializeGenerator()
 
 void WebXMLGenerator::terminateGenerator()
 {
-    Generator::terminateGenerator();
+    HtmlGenerator::terminateGenerator();
 }
 
 QString WebXMLGenerator::format()
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp
index 76352c536..fd172d115 100644
--- a/src/qtattributionsscanner/scanner.cpp
+++ b/src/qtattributionsscanner/scanner.cpp
@@ -83,7 +83,7 @@ static std::optional<QStringList> toStringList(const QJsonValue &value)
     if (!value.isArray())
         return std::nullopt;
     QStringList result;
-    for (auto iter : value.toArray()) {
+    for (const auto &iter : value.toArray()) {
         if (iter.type() != QJsonValue::String)
             return std::nullopt;
         result.push_back(iter.toString());
@@ -216,7 +216,7 @@ static std::optional<Package> readPackage(const QJsonObject &object, const QStri
                 continue;
             }
             const QDir dir(directory);
-            for (auto iter : strings.value())
+            for (const auto &iter : std::as_const(strings.value()))
                 p.licenseFiles.push_back(dir.absoluteFilePath(iter));
         } else if (key == QLatin1String("Copyright")) {
             p.copyright = value;
@@ -255,8 +255,8 @@ static std::optional<Package> readPackage(const QJsonObject &object, const QStri
         QFile file(p.copyrightFile);
         if (!file.open(QIODevice::ReadOnly)) {
             std::cerr << qPrintable(tr("File %1: Cannot open 'CopyrightFile' %2.\n")
-                                            .arg(QDir::toNativeSeparators(filePath))
-                                            .arg(QDir::toNativeSeparators(p.copyrightFile)));
+                                            .arg(QDir::toNativeSeparators(filePath),
+                                                 QDir::toNativeSeparators(p.copyrightFile)));
             validPackage = false;
         }
         p.copyrightFileContents = QString::fromUtf8(file.readAll());
@@ -267,8 +267,8 @@ static std::optional<Package> readPackage(const QJsonObject &object, const QStri
         if (!file.open(QIODevice::ReadOnly)) {
             if (logLevel != SilentLog) {
                 std::cerr << qPrintable(tr("File %1: Cannot open 'LicenseFile' %2.\n")
-                                                .arg(QDir::toNativeSeparators(filePath))
-                                                .arg(QDir::toNativeSeparators(licenseFile)));
+                                                .arg(QDir::toNativeSeparators(filePath),
+                                                     QDir::toNativeSeparators(licenseFile)));
             }
             validPackage = false;
         }