diff options
author | Martin Smith <martin.smith@digia.com> | 2014-12-10 15:08:20 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@digia.com> | 2014-12-19 08:07:55 +0100 |
commit | 7869ee5b9d74a9bcf1cff097fb93b108146f4df8 (patch) | |
tree | 836f734978c4b31fc015a9e2c9f1c33bac08ed83 /src/tools/qdoc/htmlgenerator.cpp | |
parent | 2bd8443663676440dd03a699f8bbb42fb18cabb5 (diff) |
qdoc: Fixed broken TOC links to Reimplemented sections
This update fixes some links in the table of contents on class
reference pages. Links to sections of reimplemented functions did not
work because the word 'reimplemented' was not included in the anchor.
This update fixes that bug.
Change-Id: Ifae972c45ebf6c81e865cfb36f645ea42d74cf55
Task-number: QTBUG-42237
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
-rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 0f5bf26e71..ced7e637b3 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1226,11 +1226,10 @@ void HtmlGenerator::generateClassLikeNode(InnerNode* inner, CodeMarker* marker) } if (!s->reimpMembers.isEmpty()) { QString name = QString("Reimplemented ") + (*s).name; + QString ref = registerRef(name.toLower()); // out() << "<hr />\n"; - out() << "<a name=\"" - << registerRef(name.toLower()) - << "\"></a>" << divNavTop << "\n"; - out() << "<h2>" << protectEnc(name) << "</h2>\n"; + out() << "<a name=\"" << ref << "\"></a>" << divNavTop << "\n"; + out() << "<h2 id=\"" << ref << "\">" << protectEnc(name) << "</h2>\n"; generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary); } @@ -2221,7 +2220,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node, else if (sections && (node->isClass() || node->isNamespace() || node->isQmlType())) { QList<Section>::ConstIterator s = sections->constBegin(); while (s != sections->constEnd()) { - if (!s->members.isEmpty() || !s->reimpMembers.isEmpty()) { + if (!s->members.isEmpty()) { out() << "<li class=\"level" << sectionNumber.size() << "\"><a href=\"#" @@ -2229,6 +2228,15 @@ void HtmlGenerator::generateTableOfContents(const Node *node, << "\">" << (*s).name << "</a></li>\n"; } + if (!s->reimpMembers.isEmpty()) { + QString ref = QString("Reimplemented ") + (*s).pluralMember; + out() << "<li class=\"level" + << sectionNumber.size() + << "\"><a href=\"#" + << registerRef(ref.toLower()) + << "\">" << QString("Reimplemented ") + (*s).name + << "</a></li>\n"; + } ++s; } out() << "<li class=\"level" |