diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 13:01:05 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-30 13:01:05 (GMT) |
| commit | c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e (patch) | |
| tree | b11aaa1acca5ffe30cbfe2ce42a00d3597fa6c45 /tools/qdoc3/htmlgenerator.h | |
| parent | af1e344ac6046640ddb728f6017b3181469c241d (diff) | |
| parent | 1a902e6dba504b4a25a218555bb326772b5b77a6 (diff) | |
| download | Qt-c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e.zip Qt-c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e.tar.gz Qt-c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 8 |
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" |