Remove two potential instances of help engine before exec()

Change-Id: I74c016fdfbe9d6fad13cad5819a38a4ffd3f16c5
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 90 insertions, 72 deletions

diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index 3ddbdbc29..cd6487751 100644
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -265,69 +265,49 @@ void setupTranslations()
 
 } // Anonymous namespace.
 
-int main(int argc, char *argv[])
-{
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-    QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
-    TRACE_OBJ
-    QScopedPointer<QCoreApplication> a(createApplication(argc, argv));
-#if QT_CONFIG(library)
-    a->addLibraryPath(a->applicationDirPath() + QLatin1String("/plugins"));
-#endif
-    setupTranslations();
-
-#if defined(BROWSER_QTWEBKIT)
-    if (qobject_cast<QApplication *>(a.data())) {
-        QFont f;
-        f.setStyleHint(QFont::SansSerif);
-        QWebSettings::globalSettings()->setFontFamily(QWebSettings::StandardFont, f.defaultFamily());
-    }
-#endif // BROWSER_QTWEBKIT
-
-    // Parse arguments.
-    CmdLineParser cmd(a->arguments());
-    CmdLineParser::Result res = cmd.parse();
-    if (res == CmdLineParser::Help)
-        return 0;
-    else if (res == CmdLineParser::Error)
-        return -1;
+enum ExitStatus {
+    ExitSuccess = 0,
+    ExitFailure,
+    NoExit
+};
 
+static ExitStatus preliminarySetup(CmdLineParser *cmd)
+{
     /*
      * Create the collection objects that we need. We always have the
      * cached collection file. Depending on whether the user specified
      * one, we also may have an input collection file.
      */
-    const QString collectionFile = cmd.collectionFile();
+    const QString collectionFile = cmd->collectionFile();
     const bool collectionFileGiven = !collectionFile.isEmpty();
     QScopedPointer<QHelpEngineCore> collection;
     if (collectionFileGiven) {
         collection.reset(new QHelpEngineCore(collectionFile));
         collection->setProperty("_q_readonly", QVariant::fromValue<bool>(true));
         if (!collection->setupData()) {
-            cmd.showMessage(QCoreApplication::translate("Assistant",
-                                "Error reading collection file '%1': %2.").
-                arg(collectionFile).arg(collection->error()), true);
-            return EXIT_FAILURE;
+            cmd->showMessage(QCoreApplication::translate("Assistant",
+                             "Error reading collection file '%1': %2.")
+                            .arg(collectionFile).arg(collection->error()), true);
+            return ExitFailure;
         }
     }
     const QString &cachedCollectionFile = collectionFileGiven
-        ? constructCachedCollectionFilePath(*collection)
-        : MainWindow::defaultHelpCollectionFileName();
+            ? constructCachedCollectionFilePath(*collection)
+            : MainWindow::defaultHelpCollectionFileName();
     if (collectionFileGiven && !QFileInfo(cachedCollectionFile).exists()
-        && !collection->copyCollectionFile(cachedCollectionFile)) {
-        cmd.showMessage(QCoreApplication::translate("Assistant",
-                            "Error creating collection file '%1': %2.").
-                arg(cachedCollectionFile).arg(collection->error()), true);
-        return EXIT_FAILURE;
+            && !collection->copyCollectionFile(cachedCollectionFile)) {
+        cmd->showMessage(QCoreApplication::translate("Assistant",
+                         "Error creating collection file '%1': %2.")
+                        .arg(cachedCollectionFile).arg(collection->error()), true);
+        return ExitFailure;
     }
     QHelpEngineCore cachedCollection(cachedCollectionFile);
     if (!cachedCollection.setupData()) {
-        cmd.showMessage(QCoreApplication::translate("Assistant",
-                            "Error reading collection file '%1': %2.").
-                        arg(cachedCollectionFile).
-                        arg(cachedCollection.error()), true);
-        return EXIT_FAILURE;
+        cmd->showMessage(QCoreApplication::translate("Assistant",
+                         "Error reading collection file '%1': %2.")
+                        .arg(cachedCollectionFile)
+                        .arg(cachedCollection.error()), true);
+        return ExitFailure;
     }
 
     stripNonexistingDocs(cachedCollection);
@@ -335,56 +315,94 @@ int main(int argc, char *argv[])
         if (CollectionConfiguration::isNewer(*collection, cachedCollection))
             CollectionConfiguration::copyConfiguration(*collection,
                                                        cachedCollection);
-        if (!synchronizeDocs(*collection, cachedCollection, cmd))
-            return EXIT_FAILURE;
+        if (!synchronizeDocs(*collection, cachedCollection, *cmd))
+            return ExitFailure;
     }
 
-    if (cmd.registerRequest() != CmdLineParser::None) {
+    if (cmd->registerRequest() != CmdLineParser::None) {
         const QStringList &cachedDocs =
-            cachedCollection.registeredDocumentations();
+                cachedCollection.registeredDocumentations();
         const QString &namespaceName =
-            QHelpEngineCore::namespaceName(cmd.helpFile());
-        if (cmd.registerRequest() == CmdLineParser::Register) {
+                QHelpEngineCore::namespaceName(cmd->helpFile());
+        if (cmd->registerRequest() == CmdLineParser::Register) {
             if (collectionFileGiven
-                && !registerDocumentation(*collection, cmd, true))
-                return EXIT_FAILURE;
+                    && !registerDocumentation(*collection, *cmd, true))
+                return ExitFailure;
             if (!cachedDocs.contains(namespaceName)
-                && !registerDocumentation(cachedCollection, cmd, !collectionFileGiven))
-                return EXIT_FAILURE;
-            return EXIT_SUCCESS;
+                    && !registerDocumentation(cachedCollection, *cmd, !collectionFileGiven))
+                return ExitFailure;
+            return ExitSuccess;
         }
-        if (cmd.registerRequest() == CmdLineParser::Unregister) {
+        if (cmd->registerRequest() == CmdLineParser::Unregister) {
             if (collectionFileGiven
-                && !unregisterDocumentation(*collection, namespaceName, cmd, true))
-                return EXIT_FAILURE;
+                    && !unregisterDocumentation(*collection, namespaceName, *cmd, true))
+                return ExitFailure;
             if (cachedDocs.contains(namespaceName)
-                && !unregisterDocumentation(cachedCollection, namespaceName,
-                                            cmd, !collectionFileGiven))
-                return EXIT_FAILURE;
-            return EXIT_SUCCESS;
+                    && !unregisterDocumentation(cachedCollection, namespaceName,
+                                                *cmd, !collectionFileGiven))
+                return ExitFailure;
+            return ExitSuccess;
         }
     }
 
-    if (cmd.removeSearchIndex()) {
+    if (cmd->removeSearchIndex()) {
         return removeSearchIndex(cachedCollectionFile)
-            ? EXIT_SUCCESS : EXIT_FAILURE;
+                ? ExitSuccess : ExitFailure;
     }
 
     if (!QSqlDatabase::isDriverAvailable(QLatin1String("QSQLITE"))) {
-        cmd.showMessage(QCoreApplication::translate("Assistant",
-                            "Cannot load sqlite database driver!"),
-                        true);
-        return EXIT_FAILURE;
+        cmd->showMessage(QCoreApplication::translate("Assistant",
+                         "Cannot load sqlite database driver!"),
+                         true);
+        return ExitFailure;
     }
 
-    if (!cmd.currentFilter().isEmpty()) {
+    if (!cmd->currentFilter().isEmpty()) {
         if (collectionFileGiven)
-            collection->setCurrentFilter(cmd.currentFilter());
-        cachedCollection.setCurrentFilter(cmd.currentFilter());
+            collection->setCurrentFilter(cmd->currentFilter());
+        cachedCollection.setCurrentFilter(cmd->currentFilter());
     }
 
     if (collectionFileGiven)
-        cmd.setCollectionFile(cachedCollectionFile);
+        cmd->setCollectionFile(cachedCollectionFile);
+
+    return NoExit;
+}
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+    QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
+    TRACE_OBJ
+    QScopedPointer<QCoreApplication> a(createApplication(argc, argv));
+#if QT_CONFIG(library)
+    a->addLibraryPath(a->applicationDirPath() + QLatin1String("/plugins"));
+#endif
+    setupTranslations();
+
+#if defined(BROWSER_QTWEBKIT)
+    if (qobject_cast<QApplication *>(a.data())) {
+        QFont f;
+        f.setStyleHint(QFont::SansSerif);
+        QWebSettings::globalSettings()->setFontFamily(QWebSettings::StandardFont, f.defaultFamily());
+    }
+#endif // BROWSER_QTWEBKIT
+
+    // Parse arguments.
+    CmdLineParser cmd(a->arguments());
+    CmdLineParser::Result res = cmd.parse();
+    if (res == CmdLineParser::Help)
+        return 0;
+    else if (res == CmdLineParser::Error)
+        return -1;
+
+    const ExitStatus status = preliminarySetup(&cmd);
+    switch (status) {
+        case ExitFailure: return EXIT_FAILURE;
+        case ExitSuccess: return EXIT_SUCCESS;
+        default: break;
+    }
 
     MainWindow *w = new MainWindow(&cmd);
     w->show();