qdoc: Config class keeps track of current path

The Config class is modified to build a single
multimap containing a record for each variable
found in each .qdocconf file. Each reacord
contains not only the name and value of the
variable, but also its location in the qdocconf
file it was read from and the path to that file.
This single multimap replaces 3 maps in the
Config class.

Task-number: QTBUG-30725
Change-Id: I049a69790f943b24c014a24b55b2b39725a1b56f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index a828101551..314dda3a9d 100644
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -5829,8 +5829,11 @@ bool DitaXmlGenerator::writeMetadataElements(const InnerNode* inner,
 QString DitaXmlGenerator::getMetadataElement(const InnerNode* inner, DitaXmlGenerator::DitaTag t)
 {
     QString s = Generator::getMetadataElement(inner, ditaTags[t]);
-    if (s.isEmpty())
-        s = metadataDefault(t);
+    if (s.isEmpty()) {
+        QStringList sl = metadataDefault(t);
+        if (!sl.isEmpty())
+            s = sl[0];
+    }
     return s;
 }
 
@@ -5850,7 +5853,7 @@ QStringList DitaXmlGenerator::getMetadataElements(const InnerNode* inner,
 {
     QStringList s = Generator::getMetadataElements(inner,ditaTags[t]);
     if (s.isEmpty())
-        s.append(metadataDefault(t));
+        s = metadataDefault(t);
     return s;
 }
 
@@ -5858,9 +5861,9 @@ QStringList DitaXmlGenerator::getMetadataElements(const InnerNode* inner,
   Returns the value of key \a t or an empty string
   if \a t is not found in the map.
  */
-QString DitaXmlGenerator::metadataDefault(DitaTag t) const
+QStringList DitaXmlGenerator::metadataDefault(DitaTag t) const
 {
-    return metadataDefaults.value(ditaTags[t]).second;
+    return metadataDefaults.value(ditaTags[t]).values_;
 }
 
 /*!