qdoc: More data member name changes

In preparation for refactoring the Node class hierarchy,
the names of a few enum types and the functions that set
and get them are changed so that they will not be confused
with other uses of the word Type.

Change-Id: I0496b46e5d7adffccadcb464aedb2806728e781d
Task-number: QTBUG-45450
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/tools/qdoc/cppcodeparser.h b/src/tools/qdoc/cppcodeparser.h
index 308d14f042..4f364c4feb 100644
--- a/src/tools/qdoc/cppcodeparser.h
+++ b/src/tools/qdoc/cppcodeparser.h
@@ -53,11 +53,11 @@ class CppCodeParser : public CodeParser
 
     struct ExtraFuncData {
         InnerNode* root; // Used as the parent.
-        Node::Type type; // The node type: Function, etc.
+        Node::NodeType type; // The node type: Function, etc.
         bool isAttached; // If true, the method is attached.
         bool isMacro;    // If true, we are parsing a macro signature.
         ExtraFuncData() : root(0), type(Node::Function), isAttached(false), isMacro(false) { }
-        ExtraFuncData(InnerNode* r, Node::Type t, bool a)
+        ExtraFuncData(InnerNode* r, Node::NodeType t, bool a)
           : root(r), type(t), isAttached(a), isMacro(false) { }
     };
 
@@ -141,7 +141,7 @@ protected:
     FunctionNode* makeFunctionNode(const Doc& doc,
                                    const QString& sig,
                                    InnerNode* parent,
-                                   Node::Type type,
+                                   Node::NodeType type,
                                    bool attached,
                                    QString qdoctag);
     void parseQiteratorDotH(const Location &location, const QString &filePath);
@@ -151,7 +151,7 @@ protected:
     void createExampleFileNodes(DocumentNode *dn);
 
  protected:
-    QMap<QString, Node::Type> nodeTypeMap;
+    QMap<QString, Node::NodeType> nodeTypeMap;
     Tokenizer *tokenizer;
     int tok;
     Node::Access access;