summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/ditaxmlgenerator.h
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-06-30 17:08:43 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-09-02 13:21:37 (GMT)
commit47cc8102def2e9b0c1dbc9ae4055fe595915e0e4 (patch)
tree806e0ea8586a00fc9534d1f00252e3184595061d /tools/qdoc3/ditaxmlgenerator.h
parent4e0ec071d3d4ac6142ac7542f98b6dd9c827e6de (diff)
downloadQt-47cc8102def2e9b0c1dbc9ae4055fe595915e0e4.zip
Qt-47cc8102def2e9b0c1dbc9ae4055fe595915e0e4.tar.gz
Qt-47cc8102def2e9b0c1dbc9ae4055fe595915e0e4.tar.bz2
Modified \since command behavior slightly to handle project and version.
(The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge
Diffstat (limited to 'tools/qdoc3/ditaxmlgenerator.h')
-rw-r--r--tools/qdoc3/ditaxmlgenerator.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 408f46c..d8d3563 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -51,12 +51,6 @@
QT_BEGIN_NAMESPACE
-typedef QMultiMap<QString, Node*> NodeMultiMap;
-typedef QMap<QString, NodeMultiMap> NewSinceMaps;
-typedef QMap<Node*, NodeMultiMap> ParentMaps;
-typedef QMap<QString, const Node*> NodeMap;
-typedef QMap<QString, NodeMap> NewClassMaps;
-
typedef QMap<QString, QString> GuidMap;
typedef QMap<QString, GuidMap*> GuidMaps;
@@ -418,7 +412,6 @@ class DitaXmlGenerator : public PageGenerator
void findAllFunctions(const InnerNode *node);
void findAllLegaleseTexts(const InnerNode *node);
void findAllNamespaces(const InnerNode *node);
- void findAllSince(const InnerNode *node);
static int hOffset(const Node *node);
static bool isThreeColumnEnumValueTable(const Atom *atom);
virtual QString getLink(const Atom *atom,
@@ -515,10 +508,6 @@ class DitaXmlGenerator : public PageGenerator
#endif
QMap<QString, NodeMap > funcIndex;
QMap<Text, const Node*> legaleseTexts;
- NewSinceMaps newSinceMaps;
- static QString sinceTitles[];
- NewClassMaps newClassMaps;
- NewClassMaps newQmlClassMaps;
static int id;
static QString ditaTags[];
QStack<QXmlStreamWriter*> xmlWriterStack;