Release-1.2.6-20010401

1 files changed, 22 insertions, 22 deletions

diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index ebdec58..495f515 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -86,7 +86,7 @@ void GroupDef::distributeMemberGroupDocumentation()
 
 void GroupDef::addFile(const FileDef *def)
 {
-  if (Config::sortMembersFlag)
+  if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
     fileList->inSort(def);
   else
     fileList->append(def);
@@ -94,7 +94,7 @@ void GroupDef::addFile(const FileDef *def)
 
 void GroupDef::addClass(const ClassDef *def)
 {
-  if (Config::sortMembersFlag)
+  if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
     classList->inSort(def);
   else
     classList->append(def);
@@ -102,7 +102,7 @@ void GroupDef::addClass(const ClassDef *def)
 
 void GroupDef::addNamespace(const NamespaceDef *def)
 {
-  if (Config::sortMembersFlag)
+  if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
     namespaceList->inSort(def);  
   else
     namespaceList->append(def);
@@ -189,43 +189,43 @@ void GroupDef::insertMember(MemberDef *md)
   switch(md->memberType())
   {
     case MemberDef::Variable:     
-      if (Config::sortMembersFlag)
+      if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
         varMembers.inSort(md); 
       else
         varMembers.append(md);
       break;
     case MemberDef::Function: 
-      if (Config::sortMembersFlag)    
+      if (Config::instance()->getBool("SORT_MEMBER_DOCS"))    
         funcMembers.inSort(md); 
       else
         funcMembers.append(md);
       break;
     case MemberDef::Typedef:      
-      if (Config::sortMembersFlag)
+      if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
         typedefMembers.inSort(md); 
       else
         typedefMembers.append(md);
       break;
     case MemberDef::Enumeration:  
-      if (Config::sortMembersFlag)
+      if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
         enumMembers.inSort(md); 
       else
         enumMembers.append(md);
       break;
     case MemberDef::EnumValue:    
-      if (Config::sortMembersFlag)
+      if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
         enumValMembers.inSort(md); 
       else
         enumValMembers.append(md);
       break;
     case MemberDef::Prototype:    
-      if (Config::sortMembersFlag)
+      if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
         protoMembers.inSort(md); 
       else
         protoMembers.append(md);
       break;
     case MemberDef::Define:       
-      if (Config::sortMembersFlag)
+      if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
         defineMembers.inSort(md); 
       else
         defineMembers.append(md);
@@ -238,7 +238,7 @@ void GroupDef::insertMember(MemberDef *md)
 
 void GroupDef::addGroup(const GroupDef *def)
 {
-  if (Config::sortMembersFlag)
+  if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
     groupList->inSort(def);
   else
     groupList->append(def);
@@ -246,7 +246,7 @@ void GroupDef::addGroup(const GroupDef *def)
 
 void GroupDef::addParentGroup(const GroupDef *def)
 {
-  if (Config::sortMembersFlag)
+  if (Config::instance()->getBool("SORT_MEMBER_DOCS"))
     parentGroupList->inSort(def);
   else
     parentGroupList->append(def);
@@ -302,7 +302,7 @@ void GroupDef::writeDocumentation(OutputList &ol)
     ol.popGeneratorState();
   }
 
-  if (!Config::genTagFile.isEmpty()) 
+  if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) 
   {
     Doxygen::tagFile << "  <compound kind=\"group\">" << endl;
     Doxygen::tagFile << "    <name>" << convertToXML(name()) << "</name>" << endl;
@@ -324,12 +324,12 @@ void GroupDef::writeDocumentation(OutputList &ol)
       ol.docify("file ");
       ol.insertMemberAlign();
       ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),0,fd->name());
-      if (!Config::genTagFile.isEmpty()) 
+      if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) 
       {
         Doxygen::tagFile << "    <file>" << convertToXML(fd->name()) << "</file>" << endl;
       }
       ol.endMemberItem(FALSE);
-      if (!fd->briefDescription().isEmpty() && Config::briefMemDescFlag)
+      if (!fd->briefDescription().isEmpty() && Config::instance()->getBool("BRIEF_MEMBER_DESC"))
       {
         ol.startMemberDescription();
         parseDoc(ol,defFileName,defLine,0,0,fd->briefDescription());
@@ -353,12 +353,12 @@ void GroupDef::writeDocumentation(OutputList &ol)
       ol.docify("namespace ");
       ol.insertMemberAlign();
       ol.writeObjectLink(nd->getReference(),nd->getOutputFileBase(),0,nd->name());
-      if (!Config::genTagFile.isEmpty()) 
+      if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) 
       {
         Doxygen::tagFile << "    <namespace>" << convertToXML(nd->name()) << "</namespace>" << endl;
       }
       ol.endMemberItem(FALSE);
-      if (!nd->briefDescription().isEmpty() && Config::briefMemDescFlag)
+      if (!nd->briefDescription().isEmpty() && Config::instance()->getBool("BRIEF_MEMBER_DESC"))
       {
         ol.startMemberDescription();
         parseDoc(ol,defFileName,defLine,0,0,nd->briefDescription());
@@ -381,12 +381,12 @@ void GroupDef::writeDocumentation(OutputList &ol)
       ol.startMemberItem(0);
       //ol.insertMemberAlign();
       ol.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),0,gd->groupTitle());
-      if (!Config::genTagFile.isEmpty()) 
+      if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) 
       {
         Doxygen::tagFile << "    <subgroup>" << convertToXML(gd->name()) << "</subgroup>" << endl;
       }
       ol.endMemberItem(FALSE);
-      if (!gd->briefDescription().isEmpty() && Config::briefMemDescFlag)
+      if (!gd->briefDescription().isEmpty() && Config::instance()->getBool("BRIEF_MEMBER_DESC"))
       {
         ol.startMemberDescription();
         parseDoc(ol,defFileName,defLine,0,0,gd->briefDescription());
@@ -431,7 +431,7 @@ void GroupDef::writeDocumentation(OutputList &ol)
       ol.endGroupHeader();
 
       // repeat brief description
-      if (!briefDescription().isEmpty() && Config::repeatBriefFlag)
+      if (!briefDescription().isEmpty() && Config::instance()->getBool("REPEAT_BRIEF"))
       {
         ol+=briefOutput;
         ol.newParagraph();
@@ -452,7 +452,7 @@ void GroupDef::writeDocumentation(OutputList &ol)
     {
       QCString pageName = pi->getOutputFileBase();
 
-      if (!Config::genTagFile.isEmpty()) 
+      if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) 
       {
         Doxygen::tagFile << "    <page>" << convertToXML(pageName) << "</page>" << endl;
       }
@@ -531,7 +531,7 @@ void GroupDef::writeDocumentation(OutputList &ol)
     varMembers.writeDocumentation(ol,name(),this);
   }
 
-  if (!Config::genTagFile.isEmpty()) 
+  if (!Config::instance()->getString("GENERATE_TAGFILE").isEmpty()) 
   {
     writeDocAnchorsToTagFile();
     Doxygen::tagFile << "  </compound>" << endl;