summaryrefslogtreecommitdiffstats
path: root/src/namespacedef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2000-06-04 17:46:13 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2000-06-04 17:46:13 (GMT)
commitd8197176c24ca1a41af722063bfb6ceeb050442c (patch)
tree85b63b795f663bb71c26c647948a085a3849177d /src/namespacedef.cpp
parent3e33c5094f5127c719418656fff8e47d2e19405e (diff)
downloadDoxygen-d8197176c24ca1a41af722063bfb6ceeb050442c.zip
Doxygen-d8197176c24ca1a41af722063bfb6ceeb050442c.tar.gz
Doxygen-d8197176c24ca1a41af722063bfb6ceeb050442c.tar.bz2
Release-1.1.4
Diffstat (limited to 'src/namespacedef.cpp')
-rw-r--r--src/namespacedef.cpp44
1 files changed, 30 insertions, 14 deletions
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index a3cbaa2..89f7a5a 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -78,28 +78,44 @@ void NamespaceDef::insertClass(ClassDef *cd)
}
}
-void NamespaceDef::addMemberToGroup(MemberDef *md,int groupId)
+void NamespaceDef::addMemberListToGroup(MemberList *ml,
+ bool (MemberDef::*func)() const)
{
- if (groupId!=-1)
+ MemberListIterator mli(*ml);
+ MemberDef *md;
+ for (;(md=mli.current());++mli)
{
- QCString *pGrpHeader = memberHeaderDict[groupId];
- QCString *pDocs = memberDocDict[groupId];
- if (pGrpHeader)
+ int groupId=md->getMemberGroupId();
+ if ((md->*func)() && groupId!=-1)
{
- MemberGroup *mg = memberGroupDict->find(groupId);
- if (mg==0)
+ QCString *pGrpHeader = memberHeaderDict[groupId];
+ QCString *pDocs = memberDocDict[groupId];
+ if (pGrpHeader)
{
- mg = new MemberGroup(groupId,*pGrpHeader,pDocs ? pDocs->data() : 0);
- memberGroupDict->insert(groupId,mg);
- memberGroupList->append(mg);
+ MemberGroup *mg = memberGroupDict->find(groupId);
+ if (mg==0)
+ {
+ mg = new MemberGroup(groupId,*pGrpHeader,pDocs ? pDocs->data() : 0);
+ memberGroupDict->insert(groupId,mg);
+ memberGroupList->append(mg);
+ }
+ mg->insertMember(md);
+ md->setMemberGroup(mg);
}
- mg->insertMember(md);
- md->setMemberGroup(mg);
}
}
}
-void NamespaceDef::insertMember(MemberDef *md,int groupId)
+void NamespaceDef::addMembersToMemberGroup()
+{
+ addMemberListToGroup(&allMemberList,&MemberDef::isTypedef);
+ addMemberListToGroup(&allMemberList,&MemberDef::isEnumerate);
+ addMemberListToGroup(&allMemberList,&MemberDef::isEnumValue);
+ addMemberListToGroup(&allMemberList,&MemberDef::isFunction);
+ addMemberListToGroup(&allMemberList,&MemberDef::isVariable);
+}
+
+void NamespaceDef::insertMember(MemberDef *md)
{
//memList->append(md);
allMemberList.append(md);
@@ -115,7 +131,7 @@ void NamespaceDef::insertMember(MemberDef *md,int groupId)
default:
err("NamespaceDef::insertMembers(): unexpected member inserted in namespace!\n");
}
- addMemberToGroup(md,groupId);
+ //addMemberToGroup(md,groupId);
}
void NamespaceDef::computeAnchors()