1 files changed, 30 insertions, 32 deletions

diff --git a/src/tools/qdoc/qdocdatabase.h b/src/tools/qdoc/qdocdatabase.h
index b8ca8bc32d..80a92af4ed 100644
--- a/src/tools/qdoc/qdocdatabase.h
+++ b/src/tools/qdoc/qdocdatabase.h
@@ -103,7 +103,7 @@ class QDocForest
         return 0;
     }
 
-    Node* findNodeByNameAndType(const QStringList& path, Node::Type type) {
+    Node* findNodeByNameAndType(const QStringList& path, Node::NodeType type) {
         foreach (Tree* t, searchOrder()) {
             Node* n = t->findNodeByNameAndType(path, type);
             if (n)
@@ -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;
         }
@@ -141,15 +141,8 @@ class QDocForest
 
     const Node* findFunctionNode(const QString& target,
                                  const Node* relative,
-                                 Node::Genus genus) {
-        foreach (Tree* t, searchOrder()) {
-            const Node* n = t->findFunctionNode(target, relative, genus);
-            if (n)
-                return n;
-            relative = 0;
-        }
-        return 0;
-    }
+                                 Node::Genus genus);
+
     const Node* findNodeForTarget(QStringList& targetPath,
                                   const Node* relative,
                                   Node::Genus genus,
@@ -177,6 +170,16 @@ class QDocForest
         return 0;
     }
 
+    const CollectionNode* getCollectionNode(const QString& name, Node::Genus genus)
+    {
+        foreach (Tree* t, searchOrder()) {
+            const CollectionNode* cn = t->getCollection(name, genus);
+            if (cn)
+                return cn;
+        }
+        return 0;
+    }
+
     QmlTypeNode* lookupQmlType(const QString& name)
     {
         foreach (Tree* t, searchOrder()) {
@@ -221,19 +224,11 @@ class QDocDatabase
 
     Tree* findTree(const QString& t) { return forest_.findTree(t); }
 
-    CollectionNode* getCollection(const QString& name, Node::Genus genus) {
-        return primaryTree()->getCollection(name, genus);
-    }
     const CNMap& groups() { return primaryTree()->groups(); }
     const CNMap& modules() { return primaryTree()->modules(); }
     const CNMap& qmlModules() { return primaryTree()->qmlModules(); }
     const CNMap& jsModules() { return primaryTree()->jsModules(); }
 
-    CollectionNode* findGroup(const QString& name) { return primaryTree()->findGroup(name); }
-    CollectionNode* findModule(const QString& name) { return primaryTree()->findModule(name); }
-    CollectionNode* findQmlModule(const QString& name) { return primaryTree()->findQmlModule(name); }
-    CollectionNode* findJsModule(const QString& name) { return primaryTree()->findJsModule(name); }
-
     CollectionNode* addGroup(const QString& name) { return primaryTree()->addGroup(name); }
     CollectionNode* addModule(const QString& name) { return primaryTree()->addModule(name); }
     CollectionNode* addQmlModule(const QString& name) { return primaryTree()->addQmlModule(name); }
@@ -260,12 +255,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 +284,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(); }
@@ -297,7 +292,7 @@ class QDocDatabase
 
     void insertTarget(const QString& name,
                       const QString& title,
-                      TargetRec::Type type,
+                      TargetRec::TargetType type,
                       Node* node,
                       int priority) {
         primaryTree()->insertTarget(name, title, type, node, priority);
@@ -310,7 +305,7 @@ class QDocDatabase
         return primaryTree()->findFunctionNode(parentPath, clone);
     }
     FunctionNode* findNodeInOpenNamespace(const QStringList& parentPath, const FunctionNode* clone);
-    Node* findNodeInOpenNamespace(QStringList& path, Node::Type type);
+    Node* findNodeInOpenNamespace(QStringList& path, Node::NodeType type);
     const Node* checkForCollision(const QString& name) {
         return primaryTree()->checkForCollision(name);
     }
@@ -327,7 +322,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);
     }
@@ -336,9 +331,12 @@ class QDocDatabase
     const DocumentNode* findDocumentNodeByTitle(const QString& title) {
         return forest_.findDocumentNodeByTitle(title);
     }
-    Node* findNodeByNameAndType(const QStringList& path, Node::Type type) {
+    Node* findNodeByNameAndType(const QStringList& path, Node::NodeType type) {
         return forest_.findNodeByNameAndType(path, type);
     }
+    const CollectionNode* getCollectionNode(const QString& name, Node::Genus genus) {
+        return forest_.getCollectionNode(name, genus);
+    }
 
   private:
     const Node* findNodeForTarget(QStringList& targetPath,
@@ -414,7 +412,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();