summaryrefslogtreecommitdiffstats
path: root/src/qdoc/qdocdatabase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qdoc/qdocdatabase.cpp')
-rw-r--r--src/qdoc/qdocdatabase.cpp24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/qdoc/qdocdatabase.cpp b/src/qdoc/qdocdatabase.cpp
index 795da4484..e3331a4f0 100644
--- a/src/qdoc/qdocdatabase.cpp
+++ b/src/qdoc/qdocdatabase.cpp
@@ -68,9 +68,8 @@ bool QDocDatabase::debug = false;
*/
QDocForest::~QDocForest()
{
- for (int i=0; i<searchOrder_.size(); ++i) {
+ for (int i=0; i<searchOrder_.size(); ++i)
delete searchOrder_.at(i);
- }
forest_.clear();
searchOrder_.clear();
indexSearchOrder_.clear();
@@ -1387,7 +1386,16 @@ void QDocDatabase::resolveNamespaces()
}
}
}
-
+#if 0
+/*!
+ */
+const Node* QDocDatabase::findFunctionNode(const QString& target,
+ const Node* relative,
+ Node::Genus genus)
+{
+ return forest_.findFunctionNode(target, relative, genus);
+}
+#endif
/*!
This function is called for autolinking to a \a type,
which could be a function return type or a parameter
@@ -1527,9 +1535,9 @@ void QDocDatabase::generateIndex(const QString& fileName,
}
/*!
- If there are open namespaces, search each one for a function
- node having the same function name as the function described
- in \a declData. The \a parentPath is a portion of the path
+ If there are open namespaces, search for the function node
+ having the same function name as the \a clone node in each
+ open namespace. The \a parentPath is a portion of the path
name provided with the function name at the point of
reference. \a parentPath is usually a class name. Return
the pointer to the function node if one is found in an
@@ -1539,13 +1547,13 @@ void QDocDatabase::generateIndex(const QString& fileName,
be removed.
*/
FunctionNode* QDocDatabase::findNodeInOpenNamespace(const QStringList& parentPath,
- const Declaration& declData)
+ const FunctionNode* clone)
{
FunctionNode* fn = 0;
if (!openNamespaces_.isEmpty()) {
foreach (const QString& t, openNamespaces_) {
QStringList path = t.split("::") + parentPath;
- fn = findFunctionNode(path, declData);
+ fn = findFunctionNode(path, clone);
if (fn)
break;
}