qdoc: Change uses of module and qmlModule

The uses of moduleName and qmlModuleName are changed to
physicalModuleName and logicalModuleName respectively. A
few other names are also changed in the same way. These
changes are being done both to support documentation of
javascript but also to emphasize that moduleName is
really the name of the physical library module the entity
is part of, and qmlModuleName is really the name of a
collection of logical entities that is versionable and
that may contain entities located in different physical
modules.

Change-Id: If49392aabf5950dc7b97c84f8134e9369e76dd1b
Task-number: QTBUG-43715
Reviewed-by: Martin Smith <martin.smith@digia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp
index 5c7a2143e9..d25e1bc345 100644
--- a/src/tools/qdoc/tree.cpp
+++ b/src/tools/qdoc/tree.cpp
@@ -65,16 +65,16 @@ QT_BEGIN_NAMESPACE
   qdoc database that is constructing the tree. This might not
   be necessary, and it might be removed later.
  */
-Tree::Tree(const QString& module, QDocDatabase* qdb)
+Tree::Tree(const QString& physicalModuleName, QDocDatabase* qdb)
     : treeHasBeenAnalyzed_(false),
       docsHaveBeenGenerated_(false),
       linkCount_(0),
-      module_(module),
+      physicalModuleName_(physicalModuleName),
       qdb_(qdb),
       root_(0, QString()),
       targetListMap_(0)
 {
-    root_.setModuleName(module_);
+    root_.setPhysicalModuleName(physicalModuleName_);
     root_.setTree(this);
     if (Generator::writeQaPages()) {
         targetListMap_ = new TargetListMap;
@@ -1348,7 +1348,7 @@ ModuleNode* Tree::addToModule(const QString& name, Node* node)
 {
     ModuleNode* mn = findModule(name);
     mn->addMember(node);
-    node->setModuleName(name);
+    node->setPhysicalModuleName(name);
     return mn;
 }
 
@@ -1431,23 +1431,23 @@ QString Tree::getNewLinkTarget(const Node* locNode,
                                QString& text,
                                bool broken)
 {
-    QString moduleName;
+    QString physicalModuleName;
     if (t && !broken) {
         Tree* tree = t->tree();
         if (tree != this)
             tree->incrementLinkCount();
-        moduleName = tree->moduleName();
+        physicalModuleName = tree->physicalModuleName();
     }
     else
-        moduleName = "broken";
+        physicalModuleName = "broken";
     incrementLinkCount();
     QString target = QString("qa-target-%1").arg(-(linkCount()));
     TargetLoc* tloc = new TargetLoc(locNode, target, fileName, text, broken);
     TargetList* tList = 0;
-    TargetListMap::iterator i = targetListMap_->find(moduleName);
+    TargetListMap::iterator i = targetListMap_->find(physicalModuleName);
     if (i == targetListMap_->end()) {
         tList = new TargetList;
-        i = targetListMap_->insert(moduleName, tList);
+        i = targetListMap_->insert(physicalModuleName, tList);
     }
     else
         tList = i.value();