diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-07 13:57:38 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-07 13:57:38 (GMT) |
| commit | d8fb8ca3a378743eebb8464f7910a5e6d1870c01 (patch) | |
| tree | 9c31a017163a532946f10107b8d9f4405ed1c9db /tools/qdoc3/pagegenerator.h | |
| parent | b5915ef3a6d0417440ad82e9369d6679505b953e (diff) | |
| parent | 076bba6c901e292b61fffb7a91020075dcd84919 (diff) | |
| download | Qt-d8fb8ca3a378743eebb8464f7910a5e6d1870c01.zip Qt-d8fb8ca3a378743eebb8464f7910a5e6d1870c01.tar.gz Qt-d8fb8ca3a378743eebb8464f7910a5e6d1870c01.tar.bz2 | |
Merge branch 'qdoc-simplified' into mimir-simplified
Conflicts:
doc/src/platforms/compiler-notes.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
tools/qdoc3/pagegenerator.h
Diffstat (limited to 'tools/qdoc3/pagegenerator.h')
| -rw-r--r-- | tools/qdoc3/pagegenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/pagegenerator.h b/tools/qdoc3/pagegenerator.h index 0fea67a..30ce9a5 100644 --- a/tools/qdoc3/pagegenerator.h +++ b/tools/qdoc3/pagegenerator.h @@ -64,7 +64,7 @@ class PageGenerator : public Generator PageGenerator(); ~PageGenerator(); - virtual void generateTree(const Tree* tree, CodeMarker* marker); + virtual void generateTree(const Tree *tree); protected: virtual QString fileBase(const Node* node) const; @@ -73,7 +73,7 @@ class PageGenerator : public Generator QString outFileName(); virtual void beginSubPage(const Location& location, const QString& fileName); virtual void endSubPage(); - virtual void generateInnerNode(const InnerNode* node, CodeMarker* marker); + virtual void generateInnerNode(const InnerNode *node); QTextStream& out(); QString naturalLanguage; |