diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2001-04-08 19:19:32 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2001-04-08 19:19:32 (GMT) |
commit | 8f195c2d389edeeaf0f76de36c5b5db788b6e312 (patch) | |
tree | 120d3069adfaa3da505045185569c8c67554d055 /src/memberlist.cpp | |
parent | c47269c4f1fb1387d6876075f3b2e935354d5b76 (diff) | |
download | Doxygen-8f195c2d389edeeaf0f76de36c5b5db788b6e312.zip Doxygen-8f195c2d389edeeaf0f76de36c5b5db788b6e312.tar.gz Doxygen-8f195c2d389edeeaf0f76de36c5b5db788b6e312.tar.bz2 |
Doxygen-1.2.6-20010408
Diffstat (limited to 'src/memberlist.cpp')
-rw-r--r-- | src/memberlist.cpp | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/src/memberlist.cpp b/src/memberlist.cpp index f15f041..d6d05e2 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -54,18 +54,18 @@ void MemberList::countDecMembers(bool inGroup,bool countSubGroups,bool sectionPe { //printf("md=%p md->name()=`%s' inGroup=%d getMemberGroup()=%p\n", // md,md->name().data(),inGroup,md->getMemberGroup()); - if (!(md->getClassDef()==0 && md->isStatic() && !Config::instance()->getBool("EXTRACT_STATIC")) && - (!Config::instance()->getBool("HIDE_UNDOC_MEMBERS") || md->hasDocumentation()) && + if (!(md->getClassDef()==0 && md->isStatic() && !Config_getBool("EXTRACT_STATIC")) && + (!Config_getBool("HIDE_UNDOC_MEMBERS") || md->hasDocumentation()) && ( - (!Config::instance()->getBool("HIDE_UNDOC_MEMBERS") || !md->documentation().isEmpty() || - Config::instance()->getBool("BRIEF_MEMBER_DESC") || Config::instance()->getBool("REPEAT_BRIEF") - ) || Config::instance()->getBool("EXTRACT_ALL") || + (!Config_getBool("HIDE_UNDOC_MEMBERS") || !md->documentation().isEmpty() || + Config_getBool("BRIEF_MEMBER_DESC") || Config_getBool("REPEAT_BRIEF") + ) || Config_getBool("EXTRACT_ALL") || (md->isEnumerate() && md->hasDocumentedEnumValues() ) ) && inGroup==md->visibleMemberGroup(sectionPerType) && - !(inGroup && md->protection()==Private && !Config::instance()->getBool("EXTRACT_PRIVATE")) + !(inGroup && md->protection()==Private && !Config_getBool("EXTRACT_PRIVATE")) ) { switch(md->memberType()) @@ -83,7 +83,7 @@ void MemberList::countDecMembers(bool inGroup,bool countSubGroups,bool sectionPe case MemberDef::EnumValue: enumValCnt++,m_count++; break; case MemberDef::Typedef: typeCnt++,m_count++; break; case MemberDef::Prototype: protoCnt++,m_count++; break; - case MemberDef::Define: if (Config::instance()->getBool("EXTRACT_ALL") || + case MemberDef::Define: if (Config_getBool("EXTRACT_ALL") || md->argsString() || !md->initializer().isEmpty() || md->hasDocumentation() @@ -122,12 +122,12 @@ void MemberList::countDocMembers(bool listOfGroup) //printf("%s MemberList::countDocMembers() details=%d\n", // md->name().data(),md->detailsAreVisible()); bool visibleIfStatic = - !(md->getClassDef()==0 && md->isStatic() && !Config::instance()->getBool("EXTRACT_STATIC")); + !(md->getClassDef()==0 && md->isStatic() && !Config_getBool("EXTRACT_STATIC")); bool inOwnGroup = (md->getGroupDef()!=0 && !listOfGroup); if (visibleIfStatic && !inOwnGroup && - (Config::instance()->getBool("EXTRACT_ALL") || md->detailsAreVisible()) + (Config_getBool("EXTRACT_ALL") || md->detailsAreVisible()) ) { if (md->memberType()!=MemberDef::EnumValue) m_count++; @@ -190,7 +190,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, if (md->isDefine() && (md->argsString() || md->hasDocumentation() || !md->initializer().isEmpty() || - Config::instance()->getBool("EXTRACT_ALL")) && + Config_getBool("EXTRACT_ALL")) && inGroup==md->visibleMemberGroup(sectionPerType) ) { @@ -264,21 +264,21 @@ void MemberList::writePlainDeclarations(OutputList &ol, for ( ; (md=mli.current()) ; ++mli ) // iterate through the members { // see if member is hidden by protection - if (md->protection()==Private && !Config::instance()->getBool("EXTRACT_PRIVATE")) continue; + if (md->protection()==Private && !Config_getBool("EXTRACT_PRIVATE")) continue; QCString type=md->typeString(); type=type.stripWhiteSpace(); // TODO: is this really needed? // filter out enums that are in a group iff inGroup holds - if (md->isEnumerate() && inGroup==md->visibleMemberGroup(sectionPerType) /*&& (hasDocs || !Config::instance()->getBool("HIDE_UNDOC_MEMBERS"))*/) + if (md->isEnumerate() && inGroup==md->visibleMemberGroup(sectionPerType) /*&& (hasDocs || !Config_getBool("HIDE_UNDOC_MEMBERS"))*/) { // filter out invisible enums - if ( !Config::instance()->getBool("HIDE_UNDOC_MEMBERS") || // do not hide undocumented members or + if ( !Config_getBool("HIDE_UNDOC_MEMBERS") || // do not hide undocumented members or !md->documentation().isEmpty() || // member has detailed descr. or md->hasDocumentedEnumValues() || // member has documented enum vales. ( !md->briefDescription().isEmpty() && - Config::instance()->getBool("BRIEF_MEMBER_DESC") // brief descr. is shown or + Config_getBool("BRIEF_MEMBER_DESC") // brief descr. is shown or ) ) { @@ -290,7 +290,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, { if (md->isLinkableInProject() || md->hasDocumentedEnumValues()) { - if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) + if (!Config_getString("GENERATE_TAGFILE").isEmpty()) { Doxygen::tagFile << " <member kind=\"enumeration\">" << endl; Doxygen::tagFile << " <name>" << convertToXML(md->name()) << "</name>" << endl; @@ -311,6 +311,8 @@ void MemberList::writePlainDeclarations(OutputList &ol, int enumMemCount=0; + uint enumValuesPerLine = + (uint)Config_getInt("ENUM_VALUES_PER_LINE"); typeDecl.docify("{ "); QList<MemberDef> *fmdl=md->enumFieldList(); if (fmdl) @@ -319,8 +321,8 @@ void MemberList::writePlainDeclarations(OutputList &ol, while (fmd) { /* in html we start a new line after a number of items */ - if (fmdl->count()>(uint)Config::instance()->getInt("ENUM_VALUES_PER_LINE") - && (enumMemCount%(uint)Config::instance()->getInt("ENUM_VALUES_PER_LINE"))==0 + if (fmdl->count()>enumValuesPerLine + && (enumMemCount%enumValuesPerLine)==0 ) { typeDecl.pushGeneratorState(); @@ -332,7 +334,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, if (fmd->hasDocumentation()) // enum value has docs { - if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) + if (!Config_getString("GENERATE_TAGFILE").isEmpty()) { Doxygen::tagFile << " <member kind=\"enumvalue\">" << endl; Doxygen::tagFile << " <name>" << convertToXML(fmd->name()) << "</name>" << endl; @@ -361,7 +363,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, typeDecl.enable(OutputGenerator::Man); enumMemCount++; } - if (fmdl->count()>(uint)Config::instance()->getInt("ENUM_VALUES_PER_LINE")) + if (fmdl->count()>enumValuesPerLine) { typeDecl.pushGeneratorState(); typeDecl.disableAllBut(OutputGenerator::Html); @@ -395,7 +397,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, ol.insertMemberAlign(); ol+=typeDecl; // append the enum values. ol.endMemberItem(FALSE); - if (!md->briefDescription().isEmpty() && Config::instance()->getBool("BRIEF_MEMBER_DESC")) + if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) { ol.startMemberDescription(); parseDoc(ol, @@ -486,7 +488,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, ol.writeObjectLink(cd->getReference(),cd->getOutputFileBase(),0,cd->name()); ol.endMemberItem(FALSE); } - else if (!Config::instance()->getBool("HIDE_UNDOC_MEMBERS")) // no documentation + else if (!Config_getBool("HIDE_UNDOC_MEMBERS")) // no documentation { ol.startMemberItem(0); ol.docify("class "); |