From b690f5b89e8d3707790e143815557df73043f1a7 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 14 May 2012 12:15:04 +0200 Subject: [PATCH] QDoc: Use capitalized navtitles in ditamap. The auto-generated ditamap used titles like "articles", this now becomes "Articles". Change-Id: I32fa6353443aaa66cbfc2b2fea1fea26e3e33684 Reviewed-by: Martin Smith --- src/tools/qdoc/ditaxmlgenerator.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 9536a4185f..5ee3823374 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -5992,18 +5992,18 @@ void DitaXmlGenerator::writeDitaMap(Tree *tree) else xmlWriter().writeAttribute("navtitle",project); - writeTopicrefs(pageTypeMaps[Node::OverviewPage], "overviews"); - writeTopicrefs(pageTypeMaps[Node::HowToPage], "howtos"); - writeTopicrefs(pageTypeMaps[Node::TutorialPage], "tutorials"); - writeTopicrefs(pageTypeMaps[Node::FAQPage], "faqs"); - writeTopicrefs(pageTypeMaps[Node::ArticlePage], "articles"); - writeTopicrefs(nodeSubtypeMaps[Node::Example], "examples"); + writeTopicrefs(pageTypeMaps[Node::OverviewPage], "Overviews"); + writeTopicrefs(pageTypeMaps[Node::HowToPage], "Howtos"); + writeTopicrefs(pageTypeMaps[Node::TutorialPage], "Tutorials"); + writeTopicrefs(pageTypeMaps[Node::FAQPage], "FAQs"); + writeTopicrefs(pageTypeMaps[Node::ArticlePage], "Articles"); + writeTopicrefs(nodeSubtypeMaps[Node::Example], "Examples"); writeTopicrefs(nodeSubtypeMaps[Node::QmlClass], "QML types"); writeTopicrefs(nodeTypeMaps[Node::Class], "C++ classes"); writeTopicrefs(nodeTypeMaps[Node::Namespace], "C++ namespaces"); - writeTopicrefs(nodeSubtypeMaps[Node::HeaderFile], "header files"); - writeTopicrefs(nodeSubtypeMaps[Node::Module], "modules"); - writeTopicrefs(nodeSubtypeMaps[Node::Group], "groups"); + writeTopicrefs(nodeSubtypeMaps[Node::HeaderFile], "Header files"); + writeTopicrefs(nodeSubtypeMaps[Node::Module], "Modules"); + writeTopicrefs(nodeSubtypeMaps[Node::Group], "Groups"); writeTopicrefs(nodeSubtypeMaps[Node::QmlModule], "QML modules"); writeTopicrefs(nodeSubtypeMaps[Node::QmlBasicType], "QML basic types"); @@ -6078,7 +6078,7 @@ void DitaXmlGenerator::writeTopicrefs(NodeMultiMap* nmm, const QString& navtitle the qt.ditamap separately. It loops through all ditamaps recursively before deciding to write an article to qt.ditamap. */ - if ((navtitle == "articles" && ditaMaps && ditaMaps->size() > 0)) { + if ((navtitle == "Articles" && ditaMaps && ditaMaps->size() > 0)) { NodeMultiMap::iterator mapIterator = ditaMaps->begin(); while (mapIterator != ditaMaps->end()) { writeStartTag(DT_mapref);