summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2007-07-27 08:53:22 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2007-07-27 08:53:22 (GMT)
commit9343f07a41e764a904f2d8bef3dd6ac967b63989 (patch)
tree096d7be65663d2b1088aed9714e8047edf65961d /src/memberdef.cpp
parent0424762097d2a6393d3eed4e2e0a7f32041cfa50 (diff)
downloadDoxygen-9343f07a41e764a904f2d8bef3dd6ac967b63989.zip
Doxygen-9343f07a41e764a904f2d8bef3dd6ac967b63989.tar.gz
Doxygen-9343f07a41e764a904f2d8bef3dd6ac967b63989.tar.bz2
Release-1.5.3
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index bc8c76e..14d1c2d 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -150,7 +150,7 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd,
// or use the following to put the function pointer as it appears in
// the prototype.
- // bool hasFuncPtrType=vp!=-1 && wp!=-1 && wp<vp;
+ //bool hasFuncPtrType=vp!=-1 && wp!=-1 && wp<vp;
if (!a->attrib.isEmpty() && !md->isObjCMethod()) // argument has an IDL attribute
{
@@ -455,9 +455,9 @@ void MemberDefImpl::init(Definition *def,
initLines=0;
type=t;
if (mt==MemberDef::Typedef) type.stripPrefix("typedef ");
- type.stripPrefix("struct ");
- type.stripPrefix("class " );
- type.stripPrefix("union " );
+ // type.stripPrefix("struct ");
+ // type.stripPrefix("class " );
+ // type.stripPrefix("union " );
type=removeRedundantWhiteSpace(type);
args=a;
args=removeRedundantWhiteSpace(args);
@@ -970,10 +970,11 @@ bool MemberDef::isBriefSectionVisible() const
makeResident();
LockingPtr<MemberDef> lock(this,this);
MemberGroupInfo *info = Doxygen::memGrpInfoDict[m_impl->grpId];
+ //printf("name=%s m_impl->grpId=%d info=%p\n",name().data(),m_impl->grpId,info);
//QCString *pMemGrp = Doxygen::memberDocDict[grpId];
bool hasDocs = hasDocumentation() ||
// part of a documented member group
- (m_impl->grpId!=-1 && info && !info->doc.isEmpty());
+ (m_impl->grpId!=-1 && info && !(info->doc.isEmpty() && info->header.isEmpty()));
// only include static members with file/namespace scope if
// explicitly enabled in the config file
@@ -1033,9 +1034,9 @@ bool MemberDef::isBriefSectionVisible() const
);
//printf("visibleIfStatic=%d visibleIfDocumented=%d visibleIfEnabled=%d"
- // "visibleIfPrivate=%d visibleIfDocVirtual=%d visibltIfNotDefaultCDTor=%d "
+ // "visibleIfPrivate=%d visibltIfNotDefaultCDTor=%d "
// "visibleIfFriendCompound=%d\n",visibleIfStatic,visibleIfDocumented,
- // visibleIfEnabled,visibleIfPrivate,visibleIfDocVirtual,visibleIfNotDefaultCDTor,
+ // visibleIfEnabled,visibleIfPrivate,visibleIfNotDefaultCDTor,
// visibleIfFriendCompound);
bool visible = visibleIfStatic && visibleIfDocumented &&
@@ -1222,7 +1223,7 @@ void MemberDef::writeDeclaration(OutputList &ol,
}
else
{
- ltype = ltype.left(i) + " { ... } " + ltype.right(ltype.length()-i-l);
+ ltype = ltype.left(i) + " { ... } " + removeAnonymousScopes(ltype.right(ltype.length()-i-l));
linkifyText(TextGeneratorOLImpl(ol),d,getBodyDef(),name(),ltype,TRUE);
}
}
@@ -1575,7 +1576,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
}
// get member name
- QCString doxyName=name().copy();
+ QCString doxyName=name();
// prepend scope if there is any. TODO: make this optional for C only docs
if (scopeName) doxyName.prepend((QCString)scopeName+"::");
QCString doxyArgs=argsString();