diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2005-05-16 10:07:22 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2005-05-16 10:07:22 (GMT) |
commit | 530402f723b5426086bc8efdb9b7c6513e2ed3fa (patch) | |
tree | 4031df0b930759962f9126116d333cec031ca5cb /src/memberdef.cpp | |
parent | 5bd970b12ec39636593453d12e5b64bd935bbf38 (diff) | |
download | Doxygen-530402f723b5426086bc8efdb9b7c6513e2ed3fa.zip Doxygen-530402f723b5426086bc8efdb9b7c6513e2ed3fa.tar.gz Doxygen-530402f723b5426086bc8efdb9b7c6513e2ed3fa.tar.bz2 |
Release-1.4.3
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r-- | src/memberdef.cpp | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 36079fd..ee96ff1 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1943,7 +1943,7 @@ void MemberDef::warnIfUndocumented() // d->isLinkable(),isLinkable(),isDocumentedFriendClass(), // name().data(),prot); if (!isLinkable() && - !isDocumentedFriendClass() && + !isFriendClass() && name().find('@')==-1 && d->name().find('@')==-1 && (prot!=Private || Config_getBool("EXTRACT_PRIVATE")) ) @@ -1960,13 +1960,21 @@ void MemberDef::warnIfUndocumented() // *enumDeclList+=ed; //} -bool MemberDef::isDocumentedFriendClass() const +bool MemberDef::isFriendClass() const { - ClassDef *fcd=0; return (isFriend() && (type=="friend class" || type=="friend struct" || - type=="friend union") && - (fcd=getClass(name())) && fcd->isLinkable()); + type=="friend union")); +} + +bool MemberDef::isDocumentedFriendClass() const +{ + ClassDef *fcd=0; + QCString baseName=name(); + int i=baseName.find('<'); + if (i!=-1) baseName=baseName.left(i); + return (isFriendClass() && + (fcd=getClass(baseName)) && fcd->isLinkable()); } bool MemberDef::hasDocumentation() const @@ -2125,6 +2133,7 @@ void MemberDef::addListReference(Definition *) } QCString memName = name(); Definition *pd=getOuterScope(); + QCString memArgs; if (!isRelated() && ( (!hideScopeNames && // there is a scope @@ -2135,19 +2144,25 @@ void MemberDef::addListReference(Definition *) ) ) { - if (optimizeOutputJava) + if (isObjCMethod()) + { + memName = "[" + pd->name() + " " + name() + "]"; + } + else if (optimizeOutputJava) { memName.prepend(pd->name()+"."); + memArgs = argsString(); } else { memName.prepend(pd->name()+"::"); + memArgs = argsString(); } } if (xrefListItems()) { addRefItem(xrefListItems(),memLabel, - getOutputFileBase()+"#"+anchor(),memName,argsString()); + getOutputFileBase()+"#"+anchor(),memName,memArgs); } else { |