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

diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h
index 3165e8d449..b64cfc2824 100644
--- a/src/tools/qdoc/generator.h
+++ b/src/tools/qdoc/generator.h
@@ -130,10 +130,10 @@ protected:
                                  const QString& qmlName);
     virtual bool generateText(const Text& text, const Node *relative, CodeMarker *marker);
     virtual QString imageFileName(const Node *relative, const QString& fileBase);
-    virtual int skipAtoms(const Atom *atom, Atom::Type type) const;
+    virtual int skipAtoms(const Atom *atom, Atom::AtomType type) const;
     virtual QString typeString(const Node *node);
 
-    static bool matchAhead(const Atom *atom, Atom::Type expectedAtomType);
+    static bool matchAhead(const Atom *atom, Atom::AtomType expectedAtomType);
     static QString outputPrefix(const QString &nodeType);
     static void singularPlural(Text& text, const NodeList& nodes);
     static void supplementAlsoList(const Node *node, QList<Text> &alsoList);
@@ -152,7 +152,7 @@ protected:
     void generateExampleFiles(const DocumentNode *dn, CodeMarker *marker);
     void generateFileList(const DocumentNode* dn,
                           CodeMarker* marker,
-                          Node::SubType subtype,
+                          Node::DocSubtype subtype,
                           const QString& tag);
     void generateSince(const Node *node, CodeMarker *marker);
     void generateStatus(const Node *node, CodeMarker *marker);