summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.h
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-09-30 12:37:29 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-09-30 12:39:23 (GMT)
commitdcbba3c0b603ad3b38c0d3ed128b230857cb38be (patch)
tree6f2216b2bf12513b77f50eb81e726cdc40393063 /tools/qdoc3/htmlgenerator.h
parentca2834b0056b301f1d1b732840fcb106fdd477ac (diff)
downloadQt-dcbba3c0b603ad3b38c0d3ed128b230857cb38be.zip
Qt-dcbba3c0b603ad3b38c0d3ed128b230857cb38be.tar.gz
Qt-dcbba3c0b603ad3b38c0d3ed128b230857cb38be.tar.bz2
qdoc: Modified the support for \sincelist.
It now finds a lot more \since 4.6 stuff.
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
-rw-r--r--tools/qdoc3/htmlgenerator.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 24e2986..3f6e564 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -67,6 +67,9 @@ struct NavigationBar
};
#endif
+typedef QMultiMap<QString, Node*> SinceNodeMultiMap;
+typedef QMap<QString, SinceNodeMultiMap> SinceVersionMap;
+
class HelpProjectWriter;
class HtmlGenerator : public PageGenerator
@@ -216,7 +219,7 @@ class HtmlGenerator : public PageGenerator
#ifdef ZZZ_QDOC_QML
void findAllQmlClasses(const InnerNode *node);
#endif
- void findAllSince(const InnerNode *node, QString version);
+ void findAllSince(const InnerNode *node);
static int hOffset(const Node *node);
static bool isThreeColumnEnumValueTable(const Atom *atom);
virtual QString getLink(const Atom *atom,
@@ -286,8 +289,7 @@ class HtmlGenerator : public PageGenerator
#endif
QMap<QString, QMap<QString, const Node *> > funcIndex;
QMap<Text, const Node *> legaleseTexts;
- QMap<QString, Node*> sinceClasses;
- QMap<QString, Node*> sinceFunctions;
+ SinceVersionMap sinceVersions;
};
#define HTMLGENERATOR_ADDRESS "address"