diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
tree | 2b89637b93fc7d81c674106008566010f986d67c /src/tools/qdoc/htmlgenerator.h | |
parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.h')
-rw-r--r-- | src/tools/qdoc/htmlgenerator.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h index 1ba88f83df..403c1f0899 100644 --- a/src/tools/qdoc/htmlgenerator.h +++ b/src/tools/qdoc/htmlgenerator.h @@ -86,8 +86,8 @@ public: virtual void initializeGenerator(const Config& config); virtual void terminateGenerator(); virtual QString format(); - virtual void generateTree(const Tree *tree); - virtual void generateDisambiguationPages(); + virtual void generateTree(Tree *tree); + void generateCollisionPages(); void generateManifestFiles(); QString protectEnc(const QString &string); @@ -101,8 +101,8 @@ protected: virtual int generateAtom(const Atom *atom, const Node *relative, CodeMarker *marker); - virtual void generateClassLikeNode(const InnerNode *inner, CodeMarker *marker); - virtual void generateFakeNode(const FakeNode *fake, CodeMarker *marker); + virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker); + virtual void generateFakeNode(FakeNode* fake, CodeMarker* marker); virtual QString fileExtension(const Node *node) const; virtual QString refForNode(const Node *node); virtual QString linkForNode(const Node *node, const Node *relative); @@ -176,12 +176,12 @@ private: const Node *relative, CodeMarker *marker, bool summary); - void generateDetailedQmlMember(const Node *node, + void generateDetailedQmlMember(Node *node, const InnerNode *relative, CodeMarker *marker); void generateQmlInherits(const QmlClassNode* qcn, CodeMarker* marker); - void generateQmlInstantiates(const QmlClassNode* qcn, CodeMarker* marker); - void generateInstantiatedBy(const ClassNode* cn, CodeMarker* marker); + void generateQmlInstantiates(QmlClassNode* qcn, CodeMarker* marker); + void generateInstantiatedBy(ClassNode* cn, CodeMarker* marker); void generateSection(const NodeList& nl, const Node *relative, @@ -227,7 +227,6 @@ private: const Node *relative, CodeMarker *marker, const Node** node); - QString getDisambiguationLink(const Atom* atom, CodeMarker* marker); virtual void generateIndex(const QString &fileBase, const QString &url, const QString &title); @@ -278,7 +277,6 @@ private: QString manifestDir; QStringList stylesheets; QStringList customHeadElements; - const Tree *myTree; bool obsoleteLinks; QMap<QString, NodeMap > moduleClassMap; QMap<QString, NodeMap > moduleNamespaceMap; |