QDoc: Clean up remains of incomplete translation effort

* Replace calls to QCoreApplication::translate() with QStringLiteral().
* Remove related configuration strings.
* Remove #ifndef QT_NO_TRANSLATION blocks.

Task-number: QTBUG-71176
Change-Id: If7ac4d84a757d75c8a36f94f1811391c81b56aff
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

5 files changed, 36 insertions, 93 deletions

diff --git a/src/qdoc/atom.cpp b/src/qdoc/atom.cpp
index 6a8231ff1..69bf6fb9c 100644
--- a/src/qdoc/atom.cpp
+++ b/src/qdoc/atom.cpp
@@ -300,8 +300,7 @@ QString Atom::typeString() const
         int i = 0;
         while (atms[i].english != nullptr) {
             if (atms[i].no != i)
-                Location::internalError(
-                        QCoreApplication::translate("QDoc::Atom", "atom %1 missing").arg(i));
+                Location::internalError(QStringLiteral("QDoc::Atom: atom %1 missing").arg(i));
             ++i;
         }
         deja = true;
diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index c0a069c3e..5b7f9e98f 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -82,7 +82,6 @@ QString ConfigStrings::TABSIZE = QStringLiteral("tabsize");
 QString ConfigStrings::TAGFILE = QStringLiteral("tagfile");
 QString ConfigStrings::TIMESTAMPS = QStringLiteral("timestamps");
 QString ConfigStrings::TOCTITLES = QStringLiteral("toctitles");
-QString ConfigStrings::TRANSLATORS = QStringLiteral("translators");
 QString ConfigStrings::URL = QStringLiteral("url");
 QString ConfigStrings::VERSION = QStringLiteral("version");
 QString ConfigStrings::VERSIONSYM = QStringLiteral("versionsym");
diff --git a/src/qdoc/config.h b/src/qdoc/config.h
index e3cfcff06..1b62f691c 100644
--- a/src/qdoc/config.h
+++ b/src/qdoc/config.h
@@ -290,7 +290,6 @@ struct ConfigStrings
     static QString TAGFILE;
     static QString TIMESTAMPS;
     static QString TOCTITLES;
-    static QString TRANSLATORS;
     static QString URL;
     static QString VERSION;
     static QString VERSIONSYM;
@@ -369,7 +368,6 @@ struct ConfigStrings
 #define CONFIG_TAGFILE ConfigStrings::TAGFILE
 #define CONFIG_TIMESTAMPS ConfigStrings::TIMESTAMPS
 #define CONFIG_TOCTITLES ConfigStrings::TOCTITLES
-#define CONFIG_TRANSLATORS ConfigStrings::TRANSLATORS
 #define CONFIG_URL ConfigStrings::URL
 #define CONFIG_VERSION ConfigStrings::VERSION
 #define CONFIG_VERSIONSYM ConfigStrings::VERSIONSYM
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index ba70a6634..112b9400b 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -15,7 +15,6 @@
 #include "qmlcodemarker.h"
 #include "qmlcodeparser.h"
 #include "utilities.h"
-#include "qtranslator.h"
 #include "tokenizer.h"
 #include "tree.h"
 #include "webxmlgenerator.h"
@@ -71,11 +70,6 @@ static void parseSourceFiles(const QMap<QString, QString> &sources)
     }
 }
 
-#ifndef QT_NO_TRANSLATION
-typedef std::pair<QString, QTranslator *> Translator;
-static QList<Translator> translators;
-#endif
-
 /*!
   Read some XML indexes containing definitions from other
   documentation sets. \a config contains a variable that
@@ -413,37 +407,6 @@ static void processQdocconfFile(const QString &fileName)
     Generator::initialize();
     Doc::initialize(file_resolver);
 
-#ifndef QT_NO_TRANSLATION
-    /*
-      Load the language translators, if the configuration specifies any,
-      but only if they haven't already been loaded. This works in both
-      -prepare/-generate mode and -singleexec mode.
-     */
-    const QStringList fileNames{config.get(CONFIG_TRANSLATORS).asStringList()};
-    for (const auto &file : fileNames) {
-        bool found = false;
-        if (!translators.isEmpty()) {
-            for (const auto &translator : translators) {
-                if (translator.first == file) {
-                    found = true;
-                    break;
-                }
-            }
-        }
-        if (!found) {
-            auto *translator = new QTranslator(nullptr);
-            if (!translator->load(file)) {
-                config.get(CONFIG_TRANSLATORS).location()
-                        .error(QCoreApplication::translate("QDoc", "Cannot load translator '%1'")
-                                .arg(file));
-            } else {
-                QCoreApplication::instance()->installTranslator(translator);
-                translators.append(Translator(file, translator));
-            }
-        }
-    }
-#endif
-
     /*
       Initialize the qdoc database, where all the parsed source files
       will be stored. The database includes a tree of nodes, which gets
@@ -588,9 +551,9 @@ static void processQdocconfFile(const QString &fileName)
             generator->initializeFormat();
             generator->generateDocs();
         } else {
-            config.get(CONFIG_OUTPUTFORMATS).location()
-                    .fatal(QCoreApplication::translate("QDoc", "Unknown output format '%1'")
-                            .arg(format));
+            config.get(CONFIG_OUTPUTFORMATS)
+                    .location()
+                    .fatal(QStringLiteral("QDoc: Unknown output format '%1'").arg(format));
         }
     }
 
@@ -695,7 +658,7 @@ int main(int argc, char **argv)
     CppCodeMarker cppMarker;
     QmlCodeMarker qmlMarker;
 
-    Config::instance().init(QCoreApplication::translate("QDoc", "qdoc"), app.arguments());
+    Config::instance().init("QDoc", app.arguments());
 
     if (Config::instance().qdocFiles().isEmpty())
         Config::instance().showHelp();
@@ -707,13 +670,6 @@ int main(int argc, char **argv)
     }
 
     // Tidy everything away:
-#ifndef QT_NO_TRANSLATION
-    if (!translators.isEmpty()) {
-        for (const auto &translator : translators)
-            delete translator.second;
-    }
-    translators.clear();
-#endif
     QmlTypeNode::terminate();
     QDocDatabase::destroyQdocDB();
     return Location::exitCode();
diff --git a/src/qdoc/qdoccommandlineparser.cpp b/src/qdoc/qdoccommandlineparser.cpp
index 8d2395e29..6586056a4 100644
--- a/src/qdoc/qdoccommandlineparser.cpp
+++ b/src/qdoc/qdoccommandlineparser.cpp
@@ -37,92 +37,84 @@ QDocCommandLineParser::QDocCommandLineParser()
       timestampsOption(QStringList() << QStringLiteral("timestamps")),
       useDocBookExtensions(QStringList() << QStringLiteral("docbook-extensions"))
 {
-    setApplicationDescription(QCoreApplication::translate("qdoc", "Qt documentation generator"));
+    setApplicationDescription(QStringLiteral("Qt documentation generator"));
     addHelpOption();
     addVersionOption();
 
     setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
 
-    addPositionalArgument("file1.qdocconf ...", QCoreApplication::translate("qdoc", "Input files"));
+    addPositionalArgument("file1.qdocconf ...", QStringLiteral("Input files"));
 
-    defineOption.setDescription(QCoreApplication::translate(
-            "qdoc", "Define the argument as a macro while parsing sources"));
+    defineOption.setDescription(
+            QStringLiteral("Define the argument as a macro while parsing sources"));
     defineOption.setValueName(QStringLiteral("macro[=def]"));
     addOption(defineOption);
 
-    dependsOption.setDescription(QCoreApplication::translate("qdoc", "Specify dependent modules"));
+    dependsOption.setDescription(QStringLiteral("Specify dependent modules"));
     dependsOption.setValueName(QStringLiteral("module"));
     addOption(dependsOption);
 
-    highlightingOption.setDescription(QCoreApplication::translate(
-            "qdoc", "Turn on syntax highlighting (makes qdoc run slower)"));
+    highlightingOption.setDescription(
+            QStringLiteral("Turn on syntax highlighting (makes qdoc run slower)"));
     addOption(highlightingOption);
 
-    showInternalOption.setDescription(
-            QCoreApplication::translate("qdoc", "Include content marked internal"));
+    showInternalOption.setDescription(QStringLiteral("Include content marked internal"));
     addOption(showInternalOption);
 
     redirectDocumentationToDevNullOption.setDescription(
-            QCoreApplication::translate("qdoc",
-                                        "Save all documentation content to /dev/null. Useful if "
-                                        "someone is interested in qdoc errors only."));
+            QStringLiteral("Save all documentation content to /dev/null. "
+                           " Useful if someone is interested in qdoc errors only."));
     addOption(redirectDocumentationToDevNullOption);
 
-    noExamplesOption.setDescription(
-            QCoreApplication::translate("qdoc", "Do not generate documentation for examples"));
+    noExamplesOption.setDescription(QStringLiteral("Do not generate documentation for examples"));
     addOption(noExamplesOption);
 
-    indexDirOption.setDescription(QCoreApplication::translate(
-            "qdoc", "Specify a directory where QDoc should search for index files to load"));
+    indexDirOption.setDescription(
+            QStringLiteral("Specify a directory where QDoc should search for index files to load"));
     indexDirOption.setValueName(QStringLiteral("dir"));
     addOption(indexDirOption);
 
-    installDirOption.setDescription(QCoreApplication::translate(
-            "qdoc",
+    installDirOption.setDescription(QStringLiteral(
             "Specify the directory where the output will be after running \"make install\""));
     installDirOption.setValueName(QStringLiteral("dir"));
     addOption(installDirOption);
 
-    outputDirOption.setDescription(QCoreApplication::translate(
-            "qdoc", "Specify output directory, overrides setting in qdocconf file"));
+    outputDirOption.setDescription(
+            QStringLiteral("Specify output directory, overrides setting in qdocconf file"));
     outputDirOption.setValueName(QStringLiteral("dir"));
     addOption(outputDirOption);
 
-    outputFormatOption.setDescription(QCoreApplication::translate(
-            "qdoc", "Specify output format, overrides setting in qdocconf file"));
+    outputFormatOption.setDescription(
+            QStringLiteral("Specify output format, overrides setting in qdocconf file"));
     outputFormatOption.setValueName(QStringLiteral("format"));
     addOption(outputFormatOption);
 
     noLinkErrorsOption.setDescription(
-            QCoreApplication::translate("qdoc", "Do not print link errors (i.e. missing targets)"));
+            QStringLiteral("Do not print link errors (i.e. missing targets)"));
     addOption(noLinkErrorsOption);
 
-    autoLinkErrorsOption.setDescription(
-            QCoreApplication::translate("qdoc", "Show errors when automatic linking fails"));
+    autoLinkErrorsOption.setDescription(QStringLiteral("Show errors when automatic linking fails"));
     addOption(autoLinkErrorsOption);
 
-    debugOption.setDescription(QCoreApplication::translate("qdoc", "Enable debug output"));
+    debugOption.setDescription(QStringLiteral("Enable debug output"));
     addOption(debugOption);
 
-    atomsDumpOption.setDescription(QCoreApplication::translate(
-            "qdoc",
+    atomsDumpOption.setDescription(QStringLiteral(
             "Shows a human-readable form of the intermediate result of parsing a block-comment."));
     addOption(atomsDumpOption);
 
-    prepareOption.setDescription(QCoreApplication::translate(
-            "qdoc", "Run qdoc only to generate an index file, not the docs"));
+    prepareOption.setDescription(
+            QStringLiteral("Run qdoc only to generate an index file, not the docs"));
     addOption(prepareOption);
 
-    generateOption.setDescription(QCoreApplication::translate(
-            "qdoc", "Run qdoc to read the index files and generate the docs"));
+    generateOption.setDescription(
+            QStringLiteral("Run qdoc to read the index files and generate the docs"));
     addOption(generateOption);
 
-    logProgressOption.setDescription(
-            QCoreApplication::translate("qdoc", "Log progress on stderr."));
+    logProgressOption.setDescription(QStringLiteral("Log progress on stderr."));
     addOption(logProgressOption);
 
-    singleExecOption.setDescription(
-            QCoreApplication::translate("qdoc", "Run qdoc once over all the qdoc conf files."));
+    singleExecOption.setDescription(QStringLiteral("Run qdoc once over all the qdoc conf files."));
     addOption(singleExecOption);
 
     includePathOption.setFlags(QCommandLineOption::ShortOptionStyle);
@@ -133,12 +125,11 @@ QDocCommandLineParser::QDocCommandLineParser()
     frameworkOption.setFlags(QCommandLineOption::ShortOptionStyle);
     addOption(frameworkOption);
 
-    timestampsOption.setDescription(
-            QCoreApplication::translate("qdoc", "Timestamp each qdoc log line."));
+    timestampsOption.setDescription(QStringLiteral("Timestamp each qdoc log line."));
     addOption(timestampsOption);
 
-    useDocBookExtensions.setDescription(QCoreApplication::translate(
-            "qdoc", "Use the DocBook Library extensions for metadata."));
+    useDocBookExtensions.setDescription(
+            QStringLiteral("Use the DocBook Library extensions for metadata."));
     addOption(useDocBookExtensions);
 }