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, 6 insertions, 6 deletions

diff --git a/src/tools/qdoc/tree.h b/src/tools/qdoc/tree.h
index 1e9612aeec..28832cc038 100644
--- a/src/tools/qdoc/tree.h
+++ b/src/tools/qdoc/tree.h
@@ -49,11 +49,11 @@ class QDocDatabase;
 struct TargetRec
 {
   public:
-    enum Type { Unknown, Target, Keyword, Contents, Class, Function, Page, Subtitle };
+    enum TargetType { Unknown, Target, Keyword, Contents, Class, Function, Page, Subtitle };
 
     TargetRec(const QString& name,
               const QString& title,
-              TargetRec::Type type,
+              TargetRec::TargetType type,
               Node* node,
               int priority)
     : node_(node), ref_(name), title_(title), priority_(priority), type_(type) { }
@@ -64,7 +64,7 @@ struct TargetRec
     QString ref_;
     QString title_;
     int priority_;
-    Type type_;
+    TargetType type_;
 };
 
 struct TargetLoc
@@ -107,7 +107,7 @@ class Tree
     Node* findNodeRecursive(const QStringList& path,
                             int pathIndex,
                             const Node* start,
-                            Node::Type type) const;
+                            Node::NodeType type) const;
     Node* findNodeRecursive(const QStringList& path,
                             int pathIndex,
                             Node* start,
@@ -134,12 +134,12 @@ class Tree
 
     QmlTypeNode* findQmlTypeNode(const QStringList& path);
 
-    Node* findNodeByNameAndType(const QStringList& path, Node::Type type) const;
+    Node* findNodeByNameAndType(const QStringList& path, Node::NodeType type) const;
     InnerNode* findRelatesNode(const QStringList& path);
     QString getRef(const QString& target, const Node* node) const;
     void insertTarget(const QString& name,
                       const QString& title,
-                      TargetRec::Type type,
+                      TargetRec::TargetType type,
                       Node* node,
                       int priority);
     void resolveTargets(InnerNode* root);