qdoc: Make Config a singleton

There is no need to pass a pointer to Config throughout
the API; the only instance of it is created in main()
so we can turn it into a singleton.

Having access to Config without API changes makes
implementation of configurable features easier.

Change-Id: Ida47e067865082dfe036a7a97f7f1ffc736db346
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp
index 39d7e360e..7298f7e84 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdocindexfiles.cpp
@@ -1503,11 +1503,10 @@ void QDocIndexFiles::generateIndexSections(QXmlStreamWriter &writer, Node *node,
 }
 
 /*!
-  Writes aqdoc module index in XML to a file named \afilerName.
-  \a url becaomes the \c url attribute of the <INDEX> element.
-  \a title becomes the \c title attribute of the <INDEX> element.
-  \a g is used to get the Config object that contains the variables
-  from the module's .qdocconf file.
+  Writes a qdoc module index in XML to a file named \a fileName.
+  \a url is the \c url attribute of the <INDEX> element.
+  \a title is the \c title attribute of the <INDEX> element.
+  \a g is a pointer to the current Generator in use, stored for later use.
  */
 void QDocIndexFiles::generateIndex(const QString &fileName, const QString &url,
                                    const QString &title, Generator *g)
@@ -1529,7 +1528,7 @@ void QDocIndexFiles::generateIndex(const QString &fileName, const QString &url,
     writer.writeAttribute("url", url);
     writer.writeAttribute("title", title);
     writer.writeAttribute("version", qdb_->version());
-    writer.writeAttribute("project", g->config()->getString(CONFIG_PROJECT));
+    writer.writeAttribute("project", Config::instance().getString(CONFIG_PROJECT));
 
     root_ = qdb_->primaryTreeRoot();
     if (!root_->tree()->indexTitle().isEmpty())