diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-08-03 12:29:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 01:31:19 +0200 |
| commit | 35215a0f5f31c4bcca245e3f45b5ea02f4dcfc6b (patch) | |
| tree | bedd938b9e3bacf621747ca212a5e1b1610a2ee6 /src/tools | |
| parent | 9f006a863a803a7daac2e44e9c8b79eff16f00d1 (diff) | |
qdoc: No longer prints namespace qualifier twice
enum values in the Qt namespace were being printed
as. e.g.: Qt::Qt::AlignLeft. This was due to the
presence of a collision node that was not handled
properly.
Task nr: QTBUG-26628
Change-Id: I54adaba72410b2838f0922f181846bb7e76b61d4
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/cppcodemarker.cpp | 7 | ||||
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index 166ede994a..e910665d37 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -433,14 +433,14 @@ QString CppCodeMarker::markedUpFullName(const Node *node, const Node *relative) } } -QString CppCodeMarker::markedUpEnumValue(const QString &enumValue, - const Node *relative) +QString CppCodeMarker::markedUpEnumValue(const QString &enumValue, const Node *relative) { const Node *node = relative->parent(); QString fullName; while (node->parent()) { fullName.prepend(markedUpName(node)); - if (node->parent() == relative || node->parent()->name().isEmpty()) + if (node->parent() == relative || node->parent()->name().isEmpty() || + node->parent()->isCollisionNode()) break; fullName.prepend("<@op>::</@op>"); node = node->parent(); @@ -564,7 +564,6 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner, QStack<const ClassNode *> stack; stack.push(classe); - while (!stack.isEmpty()) { const ClassNode *ancestorClass = stack.pop(); diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 02261de63c..46e5d0a4b5 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -917,10 +917,8 @@ int HtmlGenerator::generateAtom(const Atom *atom, else { // (atom->string() == ATOM_LIST_VALUE) // ### Trenton - out() << "<tr><td class=\"topAlign\"><tt>" - << protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(), - relative))) - << "</tt></td><td class=\"topAlign\">"; + QString t= protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),relative))); + out() << "<tr><td class=\"topAlign\"><tt>" << t << "</tt></td><td class=\"topAlign\">"; QString itemValue; if (relative->type() == Node::Enum) { |