diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-08-21 15:43:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 16:15:21 +0200 |
| commit | 5f4d793d816b35776e59744732f8b0010a20a4d6 (patch) | |
| tree | 784d3963ec2b9517800a0729cd8778a261d8938a /src/tools/qdoc/cppcodemarker.cpp | |
| parent | 6276acb59a800e3cc3251f218b285f988a9128b5 (diff) | |
doc: Replaced FakeNode with DocNode
The name FakeNode was a bad choice. It was used
to represent something that wasn't derived from
a C++ declaration in a .h file. Any generic page
or QML item or any special kind of qdoc construct
was stored in a FakeNode. The name was unfortunate
because the constructs stored in FakeNodes were
just as real as C++ constructs.
So FakeNode has been renamed to DocNode, which
just refers to a documentation node. The node
type Fake has been replaced with node type
Document.
Change-Id: Ida9de8288b7b8915bf9273fd890ca84aaf05e182
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/cppcodemarker.cpp')
| -rw-r--r-- | src/tools/qdoc/cppcodemarker.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index e910665d37..80fb75a13b 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -1353,13 +1353,12 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, Syno } ++c; } - const FakeNode* fn = current->qmlBase(); - if (fn) { - if (fn->subType() == Node::QmlClass) - current = static_cast<const QmlClassNode*>(fn); + const DocNode* dn = current->qmlBase(); + if (dn) { + if (dn->subType() == Node::QmlClass) + current = static_cast<const QmlClassNode*>(dn); else { - fn->doc().location().warning(tr("Base class of QML class '%1' is ambgiguous") - .arg(current->name())); + dn->doc().location().warning(tr("Base class of QML class '%1' is ambgiguous").arg(current->name())); current = 0; } } |