summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-05-14 12:18:59 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-05-19 17:32:08 (GMT)
commit4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed (patch)
tree9f6221758758ebcf1854a9a513fe6f4fe4b83d7a
parent30974e3be08bd913142a13d7d7a35039a0bfa434 (diff)
downloadQt-4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed.zip
Qt-4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed.tar.gz
Qt-4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed.tar.bz2
qdoc: Ensure that all inner class methods are included in the function
index. Since the original code only used the parent class name as a key in the map that collects functions, you would only ever see either QHash::iterator::key() or QMap::iterator::key() in the index. This patch changes the key to the fully-qualified name for the parent class so that inner class methods are included. Reviewed-by: Martin Smith <msmith@trolltech.com>
-rw-r--r--tools/qdoc3/htmlgenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 13d52bf..f5b5a2d 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2851,7 +2851,7 @@ void HtmlGenerator::findAllFunctions(const InnerNode *node)
const FunctionNode *func = static_cast<const FunctionNode *>(*c);
if (func->status() > Node::Obsolete && func->metaness() != FunctionNode::Ctor
&& func->metaness() != FunctionNode::Dtor) {
- funcIndex[(*c)->name()].insert((*c)->parent()->name(), *c);
+ funcIndex[(*c)->name()].insert(tre->fullDocumentName((*c)->parent()), *c);
}
}
}