diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-30 11:06:43 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-30 11:06:43 (GMT) |
| commit | b5415ab695daa49e83587d46641c67b68a2fd4cd (patch) | |
| tree | 35f3053b1cc6ed108282584c28220544efa7b308 /tools | |
| parent | 5d9fd03a7263523f0b2d830a450328b58e50e1bb (diff) | |
| download | Qt-b5415ab695daa49e83587d46641c67b68a2fd4cd.zip Qt-b5415ab695daa49e83587d46641c67b68a2fd4cd.tar.gz Qt-b5415ab695daa49e83587d46641c67b68a2fd4cd.tar.bz2 | |
qdoc: Added breadcrumbs for namespaces.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/codeparser.cpp | 1 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp index 78804eb..65d9572 100644 --- a/tools/qdoc3/codeparser.cpp +++ b/tools/qdoc3/codeparser.cpp @@ -252,7 +252,6 @@ void CodeParser::processCommonMetaCommand(const Location &location, FakeNode *fake = static_cast<FakeNode *>(node); fake->setTitle(arg); nameToTitle.insert(fake->name(),arg); - qDebug() << "NAME TO TITLE:" << fake->name() << arg; } else location.warning(tr("Ignored '\\%1'").arg(COMMAND_TITLE)); diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 9aa8a9a..fb3c3f3 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1224,7 +1224,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner, namespasse = static_cast<const NamespaceNode *>(inner); rawTitle = marker->plainName(inner); fullTitle = marker->plainFullName(inner); - title = rawTitle + " Namespace Reference"; + title = rawTitle + " Namespace"; } else if (inner->type() == Node::Class) { classe = static_cast<const ClassNode *>(inner); @@ -1726,6 +1726,9 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, out() << " <li><a href=\"" << fn->name() << "\">" << title << "</a></li>"; } + else if (fn->name() == QString("namespaces.html")) { + out() << " <li><a href=\"namespaces.html\">All Namespaces</a></li>"; + } } else if (node->subType() == Node::QmlClass) { } @@ -1743,10 +1746,12 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, } else if (node->type() == Node::Namespace) { const NamespaceNode* nsn = static_cast<const NamespaceNode*>(node); + out() << " <li><a href=\"namespaces.html\">All Namespaces</a></li>"; + out() << " <li><a href=\"" << fileName(nsn) << "\">" << title + << "</a></li>"; } } - void HtmlGenerator::generateHeader(const QString& title, const Node *node, CodeMarker *marker) |