qdoc: Teach qdoc to use multiple trees (part 2)

qdoc now knows how to search the forrest of node
trees in an optimal order. But there remain some
problems with specific searches that cross module
boundaries. These include group membership and C++
and QML module membership, as well ass C++ base
class resolution. Part 3 will be concerned with
fixing these remaining bugs.

With this update, qdoc now takes less time to
generate the docs for Qt 5. Testing indicates
that qdoc run time has dropped from about 14
minutes to about 7.5 minutes on an iMac.

Task-number: QTBUG-35377
Change-Id: I6bded6ef54124b4f6e5914cad4548f0b600209b0
Reviewed-by: Martin Smith <martin.smith@digia.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h
index ea21e9dcd9..487da9f10e 100644
--- a/src/tools/qdoc/node.h
+++ b/src/tools/qdoc/node.h
@@ -339,9 +339,9 @@ class InnerNode : public Node
 public:
     virtual ~InnerNode();
 
-    Node* findChildNodeByName(const QString& name) const;
-    Node* findChildNodeByName(const QString& name, bool qml) const;
-    Node* findChildNodeByNameAndType(const QString& name, Type type);
+    Node* findChildNode(const QString& name) const;
+    Node* findChildNode(const QString& name, bool qml) const;
+    Node* findChildNode(const QString& name, Type type);
     void findNodes(const QString& name, QList<Node*>& n);
     FunctionNode* findFunctionNode(const QString& name) const;
     FunctionNode* findFunctionNode(const FunctionNode* clone);
@@ -382,6 +382,7 @@ public:
     virtual void setOutputFileName(const QString& f) { outputFileName_ = f; }
     virtual QString outputFileName() const { return outputFileName_; }
     virtual QmlPropertyNode* hasQmlProperty(const QString& ) const;
+    void addChild(Node* child, const QString& title);
 
     void printChildren(const QString& title);
     void printMembers(const QString& title);
@@ -508,7 +509,7 @@ public:
     virtual ~DocNode() { }
 
     void setQtVariable(const QString &variable) { qtVariable_ = variable; }
-    void setTitle(const QString &title) { title_ = title; }
+    void setTitle(const QString &title);
     void setSubTitle(const QString &subTitle) { subtitle_ = subTitle; }
 
     QString qtVariable() const { return qtVariable_; }
@@ -838,8 +839,6 @@ private:
     QString def;
 };
 
-class PropertyNode;
-
 class FunctionNode : public LeafNode
 {
 public: