diff options
Diffstat (limited to 'src/tools/qdoc/cppcodemarker.cpp')
| -rw-r--r-- | src/tools/qdoc/cppcodemarker.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index d3cb111873..715e7daa6e 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -410,8 +410,7 @@ QString CppCodeMarker::markedUpEnumValue(const QString &enumValue, const Node *r QString fullName; while (node->parent()) { fullName.prepend(markedUpName(node)); - if (node->parent() == relative || node->parent()->name().isEmpty() || - node->parent()->isCollisionNode()) + if (node->parent() == relative || node->parent()->name().isEmpty()) break; fullName.prepend("<@op>::</@op>"); node = node->parent(); @@ -1094,7 +1093,7 @@ QString CppCodeMarker::addMarkUp(const QString &in, the list of documentation sections for the children of the \a qmlClassNode. */ -QList<Section> CppCodeMarker::qmlSections(QmlClassNode* qmlClassNode, SynopsisStyle style) +QList<Section> CppCodeMarker::qmlSections(QmlClassNode* qmlClassNode, SynopsisStyle style, Status status) { QList<Section> sections; if (qmlClassNode) { @@ -1144,32 +1143,32 @@ QList<Section> CppCodeMarker::qmlSections(QmlClassNode* qmlClassNode, SynopsisSt continue; } if ((*c)->type() == Node::QmlPropertyGroup) { - insert(qmlproperties, *c, style, Okay); + insert(qmlproperties, *c, style, status); } else if ((*c)->type() == Node::QmlProperty) { const QmlPropertyNode* pn = static_cast<const QmlPropertyNode*>(*c); if (pn->isAttached()) - insert(qmlattachedproperties,*c,style,Okay); + insert(qmlattachedproperties,*c,style, status); else { - insert(qmlproperties,*c,style,Okay); + insert(qmlproperties,*c,style, status); } } else if ((*c)->type() == Node::QmlSignal) { const FunctionNode* sn = static_cast<const FunctionNode*>(*c); if (sn->isAttached()) - insert(qmlattachedsignals,*c,style,Okay); + insert(qmlattachedsignals,*c,style, status); else - insert(qmlsignals,*c,style,Okay); + insert(qmlsignals,*c,style, status); } else if ((*c)->type() == Node::QmlSignalHandler) { - insert(qmlsignalhandlers,*c,style,Okay); + insert(qmlsignalhandlers,*c,style, status); } else if ((*c)->type() == Node::QmlMethod) { const FunctionNode* mn = static_cast<const FunctionNode*>(*c); if (mn->isAttached()) - insert(qmlattachedmethods,*c,style,Okay); + insert(qmlattachedmethods,*c,style, status); else - insert(qmlmethods,*c,style,Okay); + insert(qmlmethods,*c,style, status); } ++c; } @@ -1209,31 +1208,31 @@ QList<Section> CppCodeMarker::qmlSections(QmlClassNode* qmlClassNode, SynopsisSt continue; } if ((*c)->type() == Node::QmlPropertyGroup) { - insert(qmlproperties,*c,style,Okay); + insert(qmlproperties,*c,style, status); } else if ((*c)->type() == Node::QmlProperty) { const QmlPropertyNode* pn = static_cast<const QmlPropertyNode*>(*c); if (pn->isAttached()) - insert(qmlattachedproperties,*c,style,Okay); + insert(qmlattachedproperties,*c,style, status); else - insert(qmlproperties,*c,style,Okay); + insert(qmlproperties,*c,style, status); } else if ((*c)->type() == Node::QmlSignal) { const FunctionNode* sn = static_cast<const FunctionNode*>(*c); if (sn->isAttached()) - insert(qmlattachedsignals,*c,style,Okay); + insert(qmlattachedsignals,*c,style, status); else - insert(qmlsignals,*c,style,Okay); + insert(qmlsignals,*c,style, status); } else if ((*c)->type() == Node::QmlSignalHandler) { - insert(qmlsignalhandlers,*c,style,Okay); + insert(qmlsignalhandlers,*c,style, status); } else if ((*c)->type() == Node::QmlMethod) { const FunctionNode* mn = static_cast<const FunctionNode*>(*c); if (mn->isAttached()) - insert(qmlattachedmethods,*c,style,Okay); + insert(qmlattachedmethods,*c,style, status); else - insert(qmlmethods,*c,style,Okay); + insert(qmlmethods,*c,style, status); } ++c; } |