QDoc: Minor cleanup in main.cpp

Simple cleanup to improve readability.

Change-Id: If9ee2947ad76e64d230584a3cb36e51457f643c3
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

1 files changed, 42 insertions, 48 deletions

diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index 127bcf0d5..1accb6449 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -108,9 +108,8 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
     for (const auto &format : formats) {
         if (config.getBool(format + Config::dot + "nosubdirs")) {
             useNoSubDirs = true;
-            QString singleOutputSubdir = config.getString(format
-                                                          + Config::dot
-                                                          + "outputsubdir");
+            QString singleOutputSubdir =
+                    config.getString(format + Config::dot + "outputsubdir");
             if (singleOutputSubdir.isEmpty())
                 singleOutputSubdir = "html";
             subDirs << singleOutputSubdir;
@@ -119,11 +118,11 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
 
     if (config.dependModules().size() > 0) {
         if (config.indexDirs().size() > 0) {
-            for (int i = 0; i < config.indexDirs().size(); i++) {
-                if (config.indexDirs()[i].startsWith("..")) {
+            for (auto &dir : config.indexDirs()){
+                if (dir.startsWith("..")) {
                     const QString prefix(QDir(config.currentDir()).relativeFilePath(config.previousCurrentDir()));
                     if (!prefix.isEmpty())
-                        config.indexDirs()[i].prepend(prefix + QLatin1Char('/'));
+                        dir.prepend(prefix + QLatin1Char('/'));
                 }
             }
             /*
@@ -149,13 +148,12 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
                             config.dependModules() << foundModules;
                         });
                 } else {
-                    for (int i = 0; i < config.indexDirs().size(); i++) {
-                        QDir scanDir = QDir(config.indexDirs()[i]);
+                    for (const auto &indexDir : config.indexDirs()) {
+                        QDir scanDir = QDir(indexDir);
                         scanDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
                         QFileInfoList dirList = scanDir.entryInfoList();
-                        for (int j = 0; j < dirList.size(); j++) {
-                            config.dependModules().append(dirList[j].fileName());
-                        }
+                        for (const auto &dir : dirList)
+                            config.dependModules().append(dir.fileName());
                     }
                 }
                 // Remove self-dependencies and possible duplicates
@@ -164,19 +162,16 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
                 Location::logToStdErrAlways(QString("qdocconf file has depends = *;"
                                                     " loading all %1 index files found").arg(config.dependModules().count()));
             }
-            for (int i = 0; i < config.dependModules().size(); i++) {
-                QString indexToAdd;
-                QString dependModule = config.dependModules()[i];
+            for (const auto &module : config.dependModules()) {
                 QVector<QFileInfo> foundIndices;
                 // Always look in module-specific subdir, even with *.nosubdirs config
-                bool useModuleSubDir = !subDirs.contains(dependModule);
-                subDirs << dependModule;
+                bool useModuleSubDir = !subDirs.contains(module);
+                subDirs << module;
 
-                for (int j = 0; j < config.indexDirs().size(); j++) {
+                for (const auto &dir : config.indexDirs()) {
                     for (const auto &subDir : subDirs) {
-                        QString fileToLookFor = config.indexDirs()[j]
-                                + QLatin1Char('/') + subDir
-                                + QLatin1Char('/') + dependModule + ".index";
+                        QString fileToLookFor = dir + QLatin1Char('/') + subDir
+                                + QLatin1Char('/') + module + ".index";
                         if (QFile::exists(fileToLookFor)) {
                             QFileInfo tempFileInfo(fileToLookFor);
                             if (!foundIndices.contains(tempFileInfo))
@@ -186,8 +181,9 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
                 }
                 // Clear the temporary module-specific subdir
                 if (useModuleSubDir)
-                    subDirs.remove(dependModule);
+                    subDirs.remove(module);
                 std::sort(foundIndices.begin(), foundIndices.end(), creationTimeBefore);
+                QString indexToAdd;
                 if (foundIndices.size() > 1) {
                     /*
                         QDoc should always use the last entry in the multimap when there are
@@ -199,10 +195,10 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
                     for (const auto &found : qAsConst(foundIndices))
                         indexPaths << found.absoluteFilePath();
                     Location::null.warning(QString("Multiple index files found for dependency \"%1\":\n%2").arg(
-                                               dependModule, indexPaths.join('\n')));
+                                               module, indexPaths.join('\n')));
                     Location::null.warning(QString("Using %1 as index file for dependency \"%2\"").arg(
                                                foundIndices[foundIndices.size() - 1].absoluteFilePath(),
-                                               dependModule));
+                                               module));
                     indexToAdd = foundIndices[foundIndices.size() - 1].absoluteFilePath();
                 }
                 else if (foundIndices.size() == 1) {
@@ -214,7 +210,7 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
                 }
                 else if (!asteriskUsed) {
                     Location::null.warning(QString("\"%1\" Cannot locate index file for dependency \"%2\"").arg(
-                                               config.getString(CONFIG_PROJECT), config.dependModules()[i]));
+                                               config.getString(CONFIG_PROJECT), module));
                 }
             }
         }
@@ -296,8 +292,8 @@ static void processQdocconfFile(const QString &fileName, Config &config)
     for (const auto &fileName : fileNames) {
         bool found = false;
         if (!translators.isEmpty()) {
-            for (int i=0; i<translators.size(); ++i) {
-                if (translators.at(i).first == fileName) {
+            for (const auto &translator : translators) {
+                if (translator.first == fileName) {
                     found = true;
                     break;
                 }
@@ -389,12 +385,11 @@ static void processQdocconfFile(const QString &fileName, Config &config)
     qCDebug(lcQdoc, "Adding doc/image dirs found in exampledirs to imagedirs");
     QSet<QString> exampleImageDirs;
     QStringList exampleImageList = config.getExampleImageFiles(excludedDirs, excludedFiles);
-    for (int i = 0; i < exampleImageList.size(); ++i) {
-        if (exampleImageList[i].contains("doc/images")) {
-            QString t = exampleImageList[i].left(exampleImageList[i].lastIndexOf("doc/images") + 10);
-            if (!exampleImageDirs.contains(t)) {
+    for (const auto &image : exampleImageList) {
+        if (image.contains("doc/images")) {
+            QString t = image.left(image.lastIndexOf("doc/images") + 10);
+            if (!exampleImageDirs.contains(t))
                 exampleImageDirs.insert(t);
-            }
         }
     }
     Generator::augmentImageDirs(exampleImageDirs);
@@ -407,13 +402,13 @@ static void processQdocconfFile(const QString &fileName, Config &config)
         headerList = config.getAllFiles(CONFIG_HEADERS,CONFIG_HEADERDIRS, excludedDirs, excludedFiles);
         QMap<QString, QString> headers;
         QMultiMap<QString, QString> headerFileNames;
-        for (int i = 0; i < headerList.size(); ++i) {
-            if (headerList[i].contains(QString("doc/snippets")))
+        for (const auto &header : headerList) {
+            if (header.contains(QLatin1String("doc/snippets")))
                 continue;
-            if (headers.contains(headerList[i]))
+            if (headers.contains(header))
                 continue;
-            headers.insert(headerList[i],headerList[i]);
-            QString t = headerList[i].mid(headerList[i].lastIndexOf('/')+1);
+            headers.insert(header, header);
+            QString t = header.mid(header.lastIndexOf('/') + 1);
             headerFileNames.insert(t, t);
         }
 
@@ -421,13 +416,13 @@ static void processQdocconfFile(const QString &fileName, Config &config)
         sourceList = config.getAllFiles(CONFIG_SOURCES,CONFIG_SOURCEDIRS, excludedDirs, excludedFiles);
         QMap<QString, QString> sources;
         QMultiMap<QString, QString> sourceFileNames;
-        for (int i = 0; i < sourceList.size(); ++i) {
-            if (sourceList[i].contains(QString("doc/snippets")))
+        for (const auto &source : sourceList) {
+            if (source.contains(QLatin1String("doc/snippets")))
                 continue;
-            if (sources.contains(sourceList[i]))
+            if (sources.contains(source))
                 continue;
-            sources.insert(sourceList[i], sourceList[i]);
-            QString t = sourceList[i].mid(sourceList[i].lastIndexOf('/') + 1);
+            sources.insert(source, source);
+            QString t = source.mid(source.lastIndexOf('/') + 1);
             sourceFileNames.insert(t, t);
         }
         /*
@@ -436,10 +431,10 @@ static void processQdocconfFile(const QString &fileName, Config &config)
         */
         qCDebug(lcQdoc, "Reading exampledirs");
         QStringList exampleQdocList = config.getExampleQdocFiles(excludedDirs, excludedFiles);
-        for (int i = 0; i < exampleQdocList.size(); ++i) {
-            if (!sources.contains(exampleQdocList[i])) {
-                sources.insert(exampleQdocList[i], exampleQdocList[i]);
-                QString t = exampleQdocList[i].mid(exampleQdocList[i].lastIndexOf('/') + 1);
+        for (const auto &example : exampleQdocList) {
+            if (!sources.contains(example)) {
+                sources.insert(example, example);
+                QString t = example.mid(example.lastIndexOf('/') + 1);
                 sourceFileNames.insert(t, t);
             }
         }
@@ -596,9 +591,8 @@ int main(int argc, char **argv)
     // Tidy everything away:
 #ifndef QT_NO_TRANSLATION
     if (!translators.isEmpty()) {
-        for (int i=0; i<translators.size(); ++i) {
-            delete translators.at(i).second;
-        }
+        for (const auto &translator : translators)
+            delete translator.second;
     }
     translators.clear();
 #endif