1 files changed, 10 insertions, 15 deletions

diff --git a/src/qdoc/tree.cpp b/src/qdoc/tree.cpp
index 10b46f712..f8f88e6b9 100644
--- a/src/qdoc/tree.cpp
+++ b/src/qdoc/tree.cpp
@@ -102,8 +102,6 @@ Tree::Tree(const QString& camelCaseModuleName, QDocDatabase* qdb)
  */
 Tree::~Tree()
 {
-    if (Generator::debugging())
-        qDebug() << "    Deleting tree:" << physicalModuleName_;
     TargetMap::iterator i = nodesByTargetRef_.begin();
     while (i != nodesByTargetRef_.end()) {
         delete i.value();
@@ -123,8 +121,6 @@ Tree::~Tree()
             ++i;
         }
     }
-    if (Generator::debugging())
-        qDebug() << "    Deleted tree:" << physicalModuleName_;
 }
 
 /* API members */
@@ -168,18 +164,17 @@ NamespaceNode* Tree::findNamespaceNode(const QStringList& path) const
 }
 
 /*!
-  This function first ignores the \a declData parameter and
-  searches for the parent node with \a parentPath. If that
-  search is successful, it searches for a child node of the
-  parent that matches the function described in \a declData.
-  If it finds a match, it returns a pointer to the matching
-  node.
+  This function first ignores the \a clone node and searches
+  for the parent node with \a parentPath. If that search is
+  successful, it searches for a child node of the parent that
+  matches the \a clone node. If it finds a node that is just
+  like the \a clone, it returns a pointer to the found node.
 
   Apparently the search order is important here. Don't change
   it unless you know what you are doing, or you will introduce
   qdoc warnings.
  */
-FunctionNode* Tree::findFunctionNode(const QStringList& parentPath, const Declaration& declData)
+FunctionNode* Tree::findFunctionNode(const QStringList& parentPath, const FunctionNode* clone)
 {
     const Node* parent = findNamespaceNode(parentPath);
     if (parent == 0)
@@ -188,7 +183,7 @@ FunctionNode* Tree::findFunctionNode(const QStringList& parentPath, const Declar
         parent = findNode(parentPath, 0, 0, Node::DontCare);
     if (parent == 0 || !parent->isAggregate())
         return 0;
-    return ((const Aggregate*)parent)->findFunctionNode(declData);
+    return ((const Aggregate*)parent)->findFunctionNode(clone);
 }
 
 
@@ -556,15 +551,15 @@ void Tree::fixInheritance(NamespaceNode* rootNode)
 
 /*!
  */
-FunctionNode* Tree::findVirtualFunctionInBaseClasses(ClassNode* cn, FunctionNode* virtualFunc)
+FunctionNode* Tree::findVirtualFunctionInBaseClasses(ClassNode* cn, FunctionNode* clone)
 {
     const QList<RelatedClass>& rc = cn->baseClasses();
     QList<RelatedClass>::ConstIterator r = rc.constBegin();
     while (r != rc.constEnd()) {
         FunctionNode* func;
         if ((*r).node_) {
-            if (((func = findVirtualFunctionInBaseClasses((*r).node_, virtualFunc)) != 0 ||
-                 (func = (*r).node_->findFunctionNode(virtualFunc)) != 0)) {
+            if (((func = findVirtualFunctionInBaseClasses((*r).node_, clone)) != 0 ||
+                 (func = (*r).node_->findFunctionNode(clone)) != 0)) {
                 if (func->virtualness() != FunctionNode::NonVirtual)
                     return func;
             }