summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-06-04 17:46:13 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-06-04 17:46:13 (GMT)
commitc6b7c8e7b6760ebfafa40a71eea48d1b46dec477 (patch)
tree85b63b795f663bb71c26c647948a085a3849177d /src/classdef.cpp
parent832e08dcc70203d84f75249583a95fa172492aa2 (diff)
downloadDoxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.zip
Doxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.tar.gz
Doxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.tar.bz2
Release-1.1.4
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp107
1 files changed, 69 insertions, 38 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 7d35be4..326592c 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -131,29 +131,60 @@ void ClassDef::insertSuperClass(ClassDef *cd,Protection p,
inheritedBy->inSort(new BaseClassDef(cd,p,s,t));
}
-void ClassDef::addMemberToGroup(MemberDef *md,int groupId)
+void ClassDef::addMemberListToGroup(MemberList *ml)
{
- 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 (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 ClassDef::addMembersToMemberGroup()
+{
+ addMemberListToGroup(&pubTypes);
+ addMemberListToGroup(&pubMembers);
+ addMemberListToGroup(&pubAttribs);
+ addMemberListToGroup(&pubSlots);
+ addMemberListToGroup(&signals);
+ addMemberListToGroup(&pubStaticMembers);
+ addMemberListToGroup(&pubStaticAttribs);
+ addMemberListToGroup(&proTypes);
+ addMemberListToGroup(&proMembers);
+ addMemberListToGroup(&proAttribs);
+ addMemberListToGroup(&proSlots);
+ addMemberListToGroup(&proStaticMembers);
+ addMemberListToGroup(&proStaticAttribs);
+ addMemberListToGroup(&priTypes);
+ addMemberListToGroup(&priMembers);
+ addMemberListToGroup(&priAttribs);
+ addMemberListToGroup(&priSlots);
+ addMemberListToGroup(&priStaticMembers);
+ addMemberListToGroup(&priStaticAttribs);
+ addMemberListToGroup(&friends);
+ addMemberListToGroup(&related);
+}
+
// adds new member definition to the class
-void ClassDef::insertMember(MemberDef *md,int groupId)
+void ClassDef::insertMember(MemberDef *md)
{
//printf("adding %s::%s\n",name().data(),md->name().data());
if (!isReference())
@@ -402,7 +433,7 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
/*************************************************/
// Note: this must be done AFTER inserting the member in the
// regular groups
- addMemberToGroup(md,groupId);
+ //addMemberToGroup(md,groupId);
}
@@ -422,26 +453,26 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
}
-void ClassDef::computeMemberGroups()
-{
- MemberNameInfoListIterator mnili(*allMemberNameInfoList);
- MemberNameInfo *mni;
- for (;(mni=mnili.current());++mnili)
- {
- MemberNameInfoIterator mnii(*mni);
- MemberInfo *mi;
- for (mnii.toFirst();(mi=mnii.current());++mnii)
- {
- MemberDef *md=mi->memberDef;
- MemberGroup *mg = md->getMemberGroup();
- if (mg && memberGroupDict->find(mg->groupId())==0)
- {
- memberGroupDict->insert(mg->groupId(),mg);
- memberGroupList->append(mg);
- }
- }
- }
-}
+//void ClassDef::computeMemberGroups()
+//{
+// MemberNameInfoListIterator mnili(*allMemberNameInfoList);
+// MemberNameInfo *mni;
+// for (;(mni=mnili.current());++mnili)
+// {
+// MemberNameInfoIterator mnii(*mni);
+// MemberInfo *mi;
+// for (mnii.toFirst();(mi=mnii.current());++mnii)
+// {
+// MemberDef *md=mi->memberDef;
+// MemberGroup *mg = md->getMemberGroup();
+// if (mg && memberGroupDict->find(mg->groupId())==0)
+// {
+// memberGroupDict->insert(mg->groupId(),mg);
+// memberGroupList->append(mg);
+// }
+// }
+// }
+//}
// compute the anchors for all members
void ClassDef::computeAnchors()
@@ -539,8 +570,6 @@ void ClassDef::writeDocumentation(OutputList &ol)
pageTitle+=pageType+" Reference";
startFile(ol,fileName,pageTitle);
startTitle(ol,getOutputFileBase());
- //ol.docify(name()+" "+pageType.right(pageType.length()-1)+" ");
- //parseText(ol,theTranslator->trReference());
parseText(ol,theTranslator->trCompoundReference(name(),compType));
endTitle(ol,getOutputFileBase(),name());
@@ -1131,8 +1160,8 @@ void ClassDef::writeMemberList(OutputList &ol)
memberWritten=TRUE;
}
if ((protect!=Public || md->isStatic() || virt!=Normal ||
- md->isFriend() || md->isRelated() ||
- (md->isInline() && Config::inlineInfoFlag)
+ md->isFriend() || md->isRelated() ||
+ md->getMemberSpecifiers()!=0
)
&& memberWritten)
{
@@ -1145,6 +1174,8 @@ void ClassDef::writeMemberList(OutputList &ol)
{
if (Config::inlineInfoFlag && md->isInline())
sl.append("inline");
+ if (md->isExplicit()) sl.append("explicit");
+ if (md->isMutable()) sl.append("mutable");
if (protect==Protected) sl.append("protected");
else if (protect==Private) sl.append("private");
if (virt==Virtual) sl.append("virtual");