diff options
Diffstat (limited to 'src/memberdef.cpp')
| -rw-r--r-- | src/memberdef.cpp | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 539b621..8591ca3 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1837,9 +1837,16 @@ void MemberDef::_getLabels(QStrList &sl,Definition *container) const if (isNew()) sl.append("new"); if (isOptional()) sl.append("optional"); if (isRequired()) sl.append("required"); + + if (isNonAtomic()) sl.append("nonatomic"); + else if (isObjCProperty()) sl.append("atomic"); + + // mutual exclusive Objective 2.0 property attributes if (isAssign()) sl.append("assign"); else if (isCopy()) sl.append("copy"); else if (isRetain()) sl.append("retain"); + else if (isWeak()) sl.append("weak"); + else if (isStrong()) sl.append("strong"); if (!isObjCMethod()) { @@ -2774,8 +2781,9 @@ void MemberDef::warnIfUndocumented() // name().data(),prot); if ((!hasUserDocumentation() && !extractAll) && !isFriendClass() && - name().find('@')==-1 && d->name().find('@')==-1 && - protectionLevelVisible(m_impl->prot) + name().find('@')==-1 && d && d->name().find('@')==-1 && + protectionLevelVisible(m_impl->prot) && + !isReference() ) { warn_undoc(getDefFileName(),getDefLine(),"warning: Member %s%s (%s) of %s %s is not documented.", @@ -3854,6 +3862,17 @@ bool MemberDef::isRetain() const return (m_impl->memSpec&Entry::Retain)!=0; } +bool MemberDef::isWeak() const +{ + makeResident(); + return (m_impl->memSpec&Entry::Weak)!=0; +} + +bool MemberDef::isStrong() const +{ + makeResident(); + return (m_impl->memSpec&Entry::Strong)!=0; +} bool MemberDef::isImplementation() const { @@ -4613,3 +4632,7 @@ void MemberDef::unlock() const } } +QCString MemberDef::displayName(bool) const +{ + return Definition::name(); +} |