diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2014-05-16 22:46:23 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-20 13:42:24 +0200 |
commit | 1243940f83a5c04cc0eb64a0d1679dab3b7164f1 (patch) | |
tree | 95642b3a02ab408ecf10b7373bb297e90591f4f3 /src/tools | |
parent | 1ea0d59c4a068b9bddab1a5161cc51f050c4a55d (diff) |
QDoc: Stop copying title string unnecessarily
"htmlTitle" never diverges from "fullTitle".
Change-Id: Id1ce9005311bd86aa9803836168a2bebae6db65d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 06097e85d5..407253ff64 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1344,7 +1344,6 @@ void HtmlGenerator::generateCollisionPages() ncn->clearCurrentChild(); beginSubPage(ncn, Generator::fileName(ncn)); QString fullTitle = ncn->fullTitle(); - QString htmlTitle = fullTitle; CodeMarker* marker = CodeMarker::markerForFileName(ncn->location().filePath()); if (ncn->isQmlNode()) { // Replace the marker with a QML code marker. @@ -1352,7 +1351,7 @@ void HtmlGenerator::generateCollisionPages() marker = CodeMarker::markerForLanguage(QLatin1String("QML")); } - generateHeader(htmlTitle, ncn, marker); + generateHeader(fullTitle, ncn, marker); if (!fullTitle.isEmpty()) out() << "<h1 class=\"title\">" << protectEnc(fullTitle) << "</h1>\n"; @@ -1437,21 +1436,18 @@ void HtmlGenerator::generateDocNode(DocNode* dn, CodeMarker* marker) QList<Section> sections; QList<Section>::const_iterator s; QString fullTitle = dn->fullTitle(); - QString htmlTitle = fullTitle; if (dn->subType() == Node::QmlBasicType) { fullTitle = "QML Basic Type: " + fullTitle; - htmlTitle = fullTitle; // Replace the marker with a QML code marker. marker = CodeMarker::markerForLanguage(QLatin1String("QML")); } else if (dn->subType() == Node::QmlClass) { fullTitle = fullTitle + " QML Type"; - htmlTitle = fullTitle; } - generateHeader(htmlTitle, dn, marker); + generateHeader(fullTitle, dn, marker); /* Generate the TOC for the new doc format. Don't generate a TOC for the home page. |