diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
| commit | 149b13bdec3802a80e86a0de77837d7e9cbab8af (patch) | |
| tree | 41a76edb43874b11d36f53c745a3e40393feb52f /tools/qdoc3/cppcodemarker.cpp | |
| parent | cf44101e03eb33caa7c37fbd8023c2948b7f0249 (diff) | |
| parent | 0c52573b646d8f139f37c26c954d03061ddb485a (diff) | |
| download | Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.zip Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.gz Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'tools/qdoc3/cppcodemarker.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodemarker.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp index 53a2a99..0396866 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -194,6 +194,8 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, synopsis = "class " + name; break; case Node::Function: + case Node::QmlSignal: + case Node::QmlMethod: func = (const FunctionNode *) node; if (style != SeparateList && !func->returnType().isEmpty()) synopsis = typified(func->returnType()) + " "; @@ -1156,14 +1158,14 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, } } else if ((*c)->type() == Node::QmlSignal) { - const QmlSignalNode* sn = static_cast<const QmlSignalNode*>(*c); + const FunctionNode* sn = static_cast<const FunctionNode*>(*c); if (sn->isAttached()) insert(qmlattachedsignals,*c,style,Okay); else insert(qmlsignals,*c,style,Okay); } else if ((*c)->type() == Node::QmlMethod) { - const QmlMethodNode* mn = static_cast<const QmlMethodNode*>(*c); + const FunctionNode* mn = static_cast<const FunctionNode*>(*c); if (mn->isAttached()) insert(qmlattachedmethods,*c,style,Okay); else @@ -1195,14 +1197,14 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, insert(qmlproperties,*c,style,Okay); } else if ((*c)->type() == Node::QmlSignal) { - const QmlSignalNode* sn = static_cast<const QmlSignalNode*>(*c); + const FunctionNode* sn = static_cast<const FunctionNode*>(*c); if (sn->isAttached()) insert(qmlattachedsignals,*c,style,Okay); else insert(qmlsignals,*c,style,Okay); } else if ((*c)->type() == Node::QmlMethod) { - const QmlMethodNode* mn = static_cast<const QmlMethodNode*>(*c); + const FunctionNode* mn = static_cast<const FunctionNode*>(*c); if (mn->isAttached()) insert(qmlattachedmethods,*c,style,Okay); else |