summaryrefslogtreecommitdiff
path: root/src/qdoc/cppcodemarker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qdoc/cppcodemarker.cpp')
-rw-r--r--src/qdoc/cppcodemarker.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp
index 0f1137fa8..8234f8676 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/cppcodemarker.cpp
@@ -590,7 +590,7 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner,
insert(publicFunctions, *c, style, status);
}
}
- else {
+ else if ((*c)->type() != Node::SharedComment) {
insert(publicTypes, *c, style, status);
}
break;
@@ -702,8 +702,15 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner,
}
else if ((*c)->type() == Node::Function) {
FunctionNode *function = static_cast<FunctionNode *>(*c);
- if (!function->hasAssociatedProperties() || !function->doc().isEmpty())
- insert(memberFunctions, function, style, status);
+ if (!function->isInCollective()) {
+ if (!function->hasAssociatedProperties() || !function->doc().isEmpty())
+ insert(memberFunctions, function, style, status);
+ }
+ }
+ else if ((*c)->type() == Node::SharedComment) {
+ SharedCommentNode *scn = static_cast<SharedCommentNode *>(*c);
+ if (!scn->doc().isEmpty())
+ insert(memberFunctions, scn, style, status);
}
++c;
}