From 7708c4b85465c08e6ba45a6485288f9459db6bb3 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Fri, 23 Jan 2015 12:40:41 +0100
Subject: 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>
---
 src/tools/qdoc/cppcodeparser.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/tools/qdoc/cppcodeparser.cpp')

diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index f05615972ca..1338417babc 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -1021,7 +1021,7 @@ void CppCodeParser::reset()
     access = Node::Public;
     metaness = FunctionNode::Plain;
     lastPath_.clear();
-    moduleName.clear();
+    physicalModuleName.clear();
 }
 
 /*!
@@ -1615,8 +1615,8 @@ bool CppCodeParser::matchClassDecl(InnerNode *parent,
     classe->setLocation(location());
     if (compat)
         classe->setStatus(Node::Compat);
-    if (!moduleName.isEmpty())
-        classe->setModuleName(moduleName);
+    if (!physicalModuleName.isEmpty())
+        classe->setPhysicalModuleName(physicalModuleName);
     classe->setTemplateStuff(templateStuff);
 
     if (match(Tok_Colon) && !matchBaseList(classe, isClass))
@@ -2035,9 +2035,9 @@ bool CppCodeParser::matchDeclList(InnerNode *parent)
         case Tok_QT_MODULE:
             readToken();
             if (match(Tok_LeftParen) && match(Tok_Ident))
-                moduleName = previousLexeme();
-            if (!moduleName.startsWith("Qt"))
-                moduleName.prepend("Qt");
+                physicalModuleName = previousLexeme();
+            if (!physicalModuleName.startsWith("Qt"))
+                physicalModuleName.prepend("Qt");
             match(Tok_RightParen);
             break;
         default:
@@ -2174,7 +2174,7 @@ bool CppCodeParser::matchDocsAndStuff()
                 checkModuleInclusion(*n);
                 if ((*n)->isInnerNode() && ((InnerNode *)*n)->includes().isEmpty()) {
                     InnerNode *m = static_cast<InnerNode *>(*n);
-                    while (m->parent() && m->moduleName().isEmpty()) {
+                    while (m->parent() && m->physicalModuleName().isEmpty()) {
                         m = m->parent();
                     }
                     if (m == *n)
-- 
cgit v1.2.3