diff options
author | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:05:08 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:05:08 (GMT) |
commit | fbbdb701978cb66577472c6d2c9060b2fb208f30 (patch) | |
tree | 44614b8add20ea5f89e3cbe5e87ba8b9eff1e781 /tools/qdoc3/pagegenerator.cpp | |
parent | 3b9674c720a8aca2558a344e9ca08219687afc91 (diff) | |
parent | bb6d5d9eb2a40de14ab3a41fbdaf4092c1a3b4e8 (diff) | |
download | Qt-fbbdb701978cb66577472c6d2c9060b2fb208f30.zip Qt-fbbdb701978cb66577472c6d2c9060b2fb208f30.tar.gz Qt-fbbdb701978cb66577472c6d2c9060b2fb208f30.tar.bz2 |
Merge branch 'qdoc-simplified' of ../qt-doc-team-qdoc-simplified into qdoc-simplified
Conflicts:
tools/qdoc3/qmlcodemarker.cpp
tools/qdoc3/qmlcodemarker.h
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
-rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index 37dc191..cde4b45 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -46,6 +46,7 @@ #include <qfile.h> #include <qfileinfo.h> #include <qdebug.h> +#include "codemarker.h" #include "pagegenerator.h" #include "tree.h" @@ -175,9 +176,9 @@ bool PageGenerator::parseArg(const QString& src, /*! This function is recursive. */ -void PageGenerator::generateTree(const Tree *tree, CodeMarker *marker) +void PageGenerator::generateTree(const Tree *tree) { - generateInnerNode(tree->root(), marker); + generateInnerNode(tree->root()); } QString PageGenerator::fileBase(const Node *node) const @@ -298,10 +299,10 @@ QTextStream &PageGenerator::out() } /*! - Recursive writing of html files from the root \a node. + Recursive writing of HTML files from the root \a node. */ void -PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker) +PageGenerator::generateInnerNode(const InnerNode* node) { if (!node->url().isNull()) return; @@ -320,6 +321,11 @@ PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker) } } + /* + Obtain a code marker for the source file. + */ + CodeMarker *marker = CodeMarker::markerForFileName(node->location().filePath()); + if (node->parent() != 0) { beginSubPage(node->location(), fileName(node)); if (node->type() == Node::Namespace || node->type() == Node::Class) { @@ -334,7 +340,7 @@ PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker) NodeList::ConstIterator c = node->childNodes().begin(); while (c != node->childNodes().end()) { if ((*c)->isInnerNode() && (*c)->access() != Node::Private) - generateInnerNode((const InnerNode *) *c, marker); + generateInnerNode((const InnerNode *) *c); ++c; } } |