summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-08-21 11:07:45 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-08-21 11:08:32 (GMT)
commit500ee5b8888eed68f3d237c498c56ef0ebb9795e (patch)
treeae600bf93a49b8b43c36a44eba00d4178eeb9031 /tools
parentbb49724be3439311c539a7f5bb0014c5fd83f375 (diff)
downloadQt-500ee5b8888eed68f3d237c498c56ef0ebb9795e.zip
Qt-500ee5b8888eed68f3d237c498c56ef0ebb9795e.tar.gz
Qt-500ee5b8888eed68f3d237c498c56ef0ebb9795e.tar.bz2
qdoc: Redesigned the Class and Function Documentation page.
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp7
-rw-r--r--tools/qdoc3/node.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 84e330f..3d62d7c 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -539,12 +539,15 @@ int HtmlGenerator::generateAtom(const Atom *atom,
break;
case Atom::AnnotatedList:
{
+ //qDebug() << "ANNOTATED LIS:";
QList<Node*> values = tre->groups().values(atom->string());
QMap<QString, const Node*> nodeMap;
for (int i = 0; i < values.size(); ++i) {
const Node* n = values.at(i);
- if ((n->status() != Node::Internal) && (n->access() != Node::Private))
- nodeMap.insert(n->name(),n);
+ if ((n->status() != Node::Internal) && (n->access() != Node::Private)) {
+ nodeMap.insert(n->nameForLists(),n);
+ //qDebug() << " " << n->nameForLists();
+ }
}
generateAnnotatedList(relative, marker, nodeMap);
}
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 0cddf51..e956fed 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -157,6 +157,7 @@ class Node
QMap<LinkType, QPair<QString,QString> > links() const { return linkMap; }
QString moduleName() const;
QString url() const;
+ virtual QString nameForLists() const { return nam; }
Access access() const { return acc; }
const Location& location() const { return loc; }
@@ -337,6 +338,7 @@ class FakeNode : public InnerNode
QString fullTitle() const;
QString subTitle() const;
const NodeList &groupMembers() const { return gr; }
+ virtual QString nameForLists() const { return title(); }
private:
SubType sub;