diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2008-06-26 19:24:36 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2008-06-26 19:24:36 (GMT) |
| commit | 15c353fe21452d415876c93607a468c5a8e89b82 (patch) | |
| tree | cc6b9b1f467451deab5096afece76012eec030b3 /src/memberdef.cpp | |
| parent | e436cad917e0d8e0cdb7de9d2fbafc7a44b6ab54 (diff) | |
| download | Doxygen-15c353fe21452d415876c93607a468c5a8e89b82.zip Doxygen-15c353fe21452d415876c93607a468c5a8e89b82.tar.gz Doxygen-15c353fe21452d415876c93607a468c5a8e89b82.tar.bz2 | |
Release-1.5.6-20080626
Diffstat (limited to 'src/memberdef.cpp')
| -rw-r--r-- | src/memberdef.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 2180bb9..824d8e9 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1808,7 +1808,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, Specifier lvirt=virtualness(); - if (!isObjCMethod() && + if ((!isObjCMethod() || isOptional() || isRequired()) && (protection()!=Public || lvirt!=Normal || isFriend() || isRelated() || (isInline() && Config_getBool("INLINE_INFO")) || @@ -1855,13 +1855,18 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, if (isAssign()) sl.append("assign"); else if (isCopy()) sl.append("copy"); else if (isRetain()) sl.append("retain"); - if (protection()==Protected) sl.append("protected"); - else if (protection()==Private) sl.append("private"); - else if (protection()==Package) sl.append("package"); - if (lvirt==Virtual) sl.append("virtual"); - else if (lvirt==Pure) sl.append("pure virtual"); - if (isSignal()) sl.append("signal"); - if (isSlot()) sl.append("slot"); + + if (!isObjCMethod()) + { + if (protection()==Protected) sl.append("protected"); + else if (protection()==Private) sl.append("private"); + else if (protection()==Package) sl.append("package"); + + if (lvirt==Virtual) sl.append("virtual"); + else if (lvirt==Pure) sl.append("pure virtual"); + if (isSignal()) sl.append("signal"); + if (isSlot()) sl.append("slot"); + } } if (m_impl->classDef && m_impl->classDef!=container) sl.append("inherited"); } |