qdoc: Changing InnerNode to Aggregate

An Aggregate node is a tree node that is not a leaf.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/src/tools/qdoc/qdocdatabase.h b/src/tools/qdoc/qdocdatabase.h
index 9d3b757eec..6154ec762b 100644
--- a/src/tools/qdoc/qdocdatabase.h
+++ b/src/tools/qdoc/qdocdatabase.h
@@ -130,9 +130,9 @@ class QDocForest
         return 0;
     }
 
-    InnerNode* findRelatesNode(const QStringList& path) {
+    Aggregate* findRelatesNode(const QStringList& path) {
         foreach (Tree* t, searchOrder()) {
-            InnerNode* n = t->findRelatesNode(path);
+            Aggregate* n = t->findRelatesNode(path);
             if (n)
                 return n;
         }
@@ -260,12 +260,12 @@ class QDocDatabase
     QmlTypeNode* findQmlType(const ImportRec& import, const QString& name);
 
  private:
-    void findAllClasses(InnerNode *node);
-    void findAllFunctions(InnerNode *node);
-    void findAllLegaleseTexts(InnerNode *node);
-    void findAllNamespaces(InnerNode *node);
-    void findAllObsoleteThings(InnerNode* node);
-    void findAllSince(InnerNode *node);
+    void findAllClasses(Aggregate *node);
+    void findAllFunctions(Aggregate *node);
+    void findAllLegaleseTexts(Aggregate *node);
+    void findAllNamespaces(Aggregate *node);
+    void findAllObsoleteThings(Aggregate* node);
+    void findAllSince(Aggregate *node);
 
  public:
     /*******************************************************************
@@ -289,7 +289,7 @@ class QDocDatabase
       Many of these will be either eliminated or replaced.
     ********************************************************************/
     void resolveInheritance() { primaryTree()->resolveInheritance(); }
-    void resolveQmlInheritance(InnerNode* root);
+    void resolveQmlInheritance(Aggregate* root);
     void resolveIssues();
     void resolveStuff();
     void fixInheritance() { primaryTree()->fixInheritance(); }
@@ -327,7 +327,7 @@ class QDocDatabase
     ********************************************************************/
     ClassNode* findClassNode(const QStringList& path) { return forest_.findClassNode(path); }
     Node* findNodeForInclude(const QStringList& path) { return forest_.findNodeForInclude(path); }
-    InnerNode* findRelatesNode(const QStringList& path) { return forest_.findRelatesNode(path); }
+    Aggregate* findRelatesNode(const QStringList& path) { return forest_.findRelatesNode(path); }
     const Node* findFunctionNode(const QString& target, const Node* relative, Node::Genus genus) {
         return forest_.findFunctionNode(target, relative, genus);
     }
@@ -414,7 +414,7 @@ class QDocDatabase
                          Node::Genus genus) {
         return forest_.findNode(path, relative, findFlags, genus);
     }
-    void processForest(void (QDocDatabase::*) (InnerNode*));
+    void processForest(void (QDocDatabase::*) (Aggregate*));
     bool isLoaded(const QString& t) { return forest_.isLoaded(t); }
     static void initializeDB();