1 files changed, 59 insertions, 59 deletions

diff --git a/src/index.cpp b/src/index.cpp
index 15303c7..dbc0878 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -245,7 +245,7 @@ void startFile(OutputList &ol,const char *name,const char *manName,
                const char *title,HighlightedItem hli,bool additionalIndices,
                const char *altSidebarName)
 {
-  static bool disableIndex     = Config_getBool("DISABLE_INDEX");
+  static bool disableIndex     = Config_getBool(DISABLE_INDEX);
   ol.startFile(name,manName,title);
   ol.startQuickIndices();
   if (!disableIndex)
@@ -263,7 +263,7 @@ void startFile(OutputList &ol,const char *name,const char *manName,
 void endFile(OutputList &ol,bool skipNavIndex,bool skipEndContents,
              const QCString &navPath)
 {
-  static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW");
+  static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW);
   ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
   if (!skipNavIndex)
@@ -281,7 +281,7 @@ void endFile(OutputList &ol,bool skipNavIndex,bool skipEndContents,
 
 void endFileWithNavPath(Definition *d,OutputList &ol)
 {
-  static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW");
+  static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW);
   QCString navPath;
   if (generateTreeView)
   {
@@ -338,8 +338,8 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part,
             MemberList *enumList = md->enumFieldList();
             bool isDir = enumList!=0 && md->isEnumerate();
             bool isAnonymous = md->name().find('@')!=-1;
-            static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS");
-            static bool extractStatic = Config_getBool("EXTRACT_STATIC");
+            static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS);
+            static bool extractStatic = Config_getBool(EXTRACT_STATIC);
             if (!isAnonymous && 
                 (!hideUndocMembers || md->hasDocumentation()) &&
                 (!md->isStatic() || extractStatic)
@@ -401,7 +401,7 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part,
           {
             if (cd->isLinkable() && (cd->partOfGroups()==0 || def->definitionType()==Definition::TypeGroup))
             {
-              static bool inlineSimpleStructs = Config_getBool("INLINE_SIMPLE_STRUCTS");
+              static bool inlineSimpleStructs = Config_getBool(INLINE_SIMPLE_STRUCTS);
               bool isNestedClass = def->definitionType()==Definition::TypeClass;
               addMembersToIndex(cd,LayoutDocManager::Class,cd->displayName(FALSE),cd->anchor(),
                                 addToIndex && (isNestedClass || (cd->isSimple() && inlineSimpleStructs)),
@@ -585,7 +585,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
     return;
   }
 
-  static bool tocExpand = TRUE; //Config_getBool("TOC_EXPAND");
+  static bool tocExpand = TRUE; //Config_getBool(TOC_EXPAND);
   bool isDir = dd->subDirs().count()>0 || // there are subdirs
                (tocExpand &&              // or toc expand and
                 dd->getFiles() && dd->getFiles()->count()>0 // there are files
@@ -635,7 +635,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
     FileDef *fd;
     for (;(fd=it.current());++it)
     {
-      //static bool allExternals = Config_getBool("ALLEXTERNALS");
+      //static bool allExternals = Config_getBool(ALLEXTERNALS);
       //if ((allExternals && fd->isLinkable()) || fd->isLinkableInProject())
       //{
       //  fileCount++;
@@ -693,7 +693,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
       FileDef *fd;
       for (;(fd=it.current());++it)
       {
-        //static bool allExternals = Config_getBool("ALLEXTERNALS");
+        //static bool allExternals = Config_getBool(ALLEXTERNALS);
         //if ((allExternals && fd->isLinkable()) || fd->isLinkableInProject())
         bool doc,src;
         doc = fileVisibleInIndex(fd,src);
@@ -729,7 +729,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
     ol.pushGeneratorState(); 
     ol.disable(OutputGenerator::Html);
   }
-  static bool fullPathNames = Config_getBool("FULL_PATH_NAMES");
+  static bool fullPathNames = Config_getBool(FULL_PATH_NAMES);
   startIndexHierarchy(ol,0);
   if (fullPathNames)
   {
@@ -753,7 +753,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
       FileDef *fd;
       for (;(fd=fni.current());++fni)
       {
-        static bool fullPathNames = Config_getBool("FULL_PATH_NAMES");
+        static bool fullPathNames = Config_getBool(FULL_PATH_NAMES);
         if (!fullPathNames || fd->getDirDef()==0) // top level file
         {
           bool doc,src;
@@ -970,7 +970,7 @@ static void writeHierarchicalIndex(OutputList &ol)
   ol.startContents();
   ol.startTextBlock();
 
-  if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY"))
+  if (Config_getBool(HAVE_DOT) && Config_getBool(GRAPHICAL_HIERARCHY))
   {
     ol.disable(OutputGenerator::Latex);
     ol.disable(OutputGenerator::RTF);
@@ -1094,7 +1094,7 @@ static void writeSingleFileIndex(OutputList &ol,FileDef *fd)
   if (nameOk && (doc || src) && !fd->isReference())
   {
     QCString path;
-    if (Config_getBool("FULL_PATH_NAMES"))
+    if (Config_getBool(FULL_PATH_NAMES))
     {
       path=stripFromPath(fd->getPath().copy());
     }
@@ -1178,9 +1178,9 @@ static void writeFileIndex(OutputList &ol)
 
   startFile(ol,"files",0,title,HLI_Files);
   startTitle(ol,0);
-  //if (!Config_getString("PROJECT_NAME").isEmpty()) 
+  //if (!Config_getString(PROJECT_NAME).isEmpty()) 
   //{
-  //  title.prepend(Config_getString("PROJECT_NAME")+" ");
+  //  title.prepend(Config_getString(PROJECT_NAME)+" ");
   //}
   ol.parseText(title);
   endTitle(ol,0,0);
@@ -1193,7 +1193,7 @@ static void writeFileIndex(OutputList &ol)
     Doxygen::indexList->incContentsDepth();
   }
 
-  ol.parseText(lne ? lne->intro() : theTranslator->trFileListDescription(Config_getBool("EXTRACT_ALL")));
+  ol.parseText(lne ? lne->intro() : theTranslator->trFileListDescription(Config_getBool(EXTRACT_ALL)));
   ol.endTextBlock();
 
   // ---------------
@@ -1208,7 +1208,7 @@ static void writeFileIndex(OutputList &ol)
   OutputNameList outputNameList;
   outputNameList.setAutoDelete(TRUE);
 
-  if (Config_getBool("FULL_PATH_NAMES"))
+  if (Config_getBool(FULL_PATH_NAMES))
   {
     // re-sort input files in (dir,file) output order instead of (file,dir) input order 
     FileNameListIterator fnli(*Doxygen::inputNameList);
@@ -1240,7 +1240,7 @@ static void writeFileIndex(OutputList &ol)
   }
 
   ol.startIndexList();
-  if (Config_getBool("FULL_PATH_NAMES"))
+  if (Config_getBool(FULL_PATH_NAMES))
   {
     outputNameList.sort();
     QListIterator<FileList> fnli(outputNameList);
@@ -1459,7 +1459,7 @@ static void writeNamespaceIndex(OutputList &ol)
   endTitle(ol,0,0);
   ol.startContents();
   ol.startTextBlock();
-  ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceListDescription(Config_getBool("EXTRACT_ALL")));
+  ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceListDescription(Config_getBool(EXTRACT_ALL)));
   ol.endTextBlock();
 
   bool first=TRUE;
@@ -1801,7 +1801,7 @@ static void writeAlphabeticalClassList(OutputList &ol)
 
 
   // the number of columns in the table
-  const int columns = Config_getInt("COLS_IN_ALPHA_INDEX");
+  const int columns = Config_getInt(COLS_IN_ALPHA_INDEX);
 
   int i,j;
   int totalItems = headerItems*2 + annotatedClasses;      // number of items in the table (headers span 2 items)
@@ -2263,7 +2263,7 @@ void initClassMemberIndices()
 
 void addClassMemberNameToIndex(MemberDef *md)
 {
-  static bool hideFriendCompounds = Config_getBool("HIDE_FRIEND_COMPOUNDS");
+  static bool hideFriendCompounds = Config_getBool(HIDE_FRIEND_COMPOUNDS);
   ClassDef *cd=0;
 
  
@@ -2496,8 +2496,8 @@ struct CmhlInfo
 
 static const CmhlInfo *getCmhlInfo(int hl)
 {
-  static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
-  static bool vhdlOpt    = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
+  static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
+  static bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
   static CmhlInfo cmhlInfo[] = 
   {
     CmhlInfo("functions",     theTranslator->trAll()),
@@ -2520,7 +2520,7 @@ static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight h
 {
   if (documentedClassMembers[hl]==0) return;
 
-  static bool disableIndex     = Config_getBool("DISABLE_INDEX");
+  static bool disableIndex     = Config_getBool(DISABLE_INDEX);
 
   bool multiPageIndex=FALSE;
   if (documentedClassMembers[hl]>MAX_ITEMS_BEFORE_MULTIPAGE_INDEX)
@@ -2610,7 +2610,7 @@ static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight h
     if (hl==CMHL_All)
     {
       ol.startTextBlock();
-      ol.parseText(lne ? lne->intro() : theTranslator->trCompoundMembersDescription(Config_getBool("EXTRACT_ALL")));
+      ol.parseText(lne ? lne->intro() : theTranslator->trCompoundMembersDescription(Config_getBool(EXTRACT_ALL)));
       ol.endTextBlock();
     }
     else
@@ -2671,8 +2671,8 @@ struct FmhlInfo
 
 static const FmhlInfo *getFmhlInfo(int hl)
 {
-  static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
-  static bool vhdlOpt    = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
+  static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
+  static bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
   static FmhlInfo fmhlInfo[] = 
   {
     FmhlInfo("globals",     theTranslator->trAll()),
@@ -2693,7 +2693,7 @@ static void writeFileMemberIndexFiltered(OutputList &ol, FileMemberHighlight hl)
 {
   if (documentedFileMembers[hl]==0) return;
 
-  static bool disableIndex     = Config_getBool("DISABLE_INDEX");
+  static bool disableIndex     = Config_getBool(DISABLE_INDEX);
 
   bool multiPageIndex=FALSE;
   if (documentedFileMembers[hl]>MAX_ITEMS_BEFORE_MULTIPAGE_INDEX)
@@ -2780,7 +2780,7 @@ static void writeFileMemberIndexFiltered(OutputList &ol, FileMemberHighlight hl)
     if (hl==FMHL_All)
     {
       ol.startTextBlock();
-      ol.parseText(lne ? lne->intro() : theTranslator->trFileMembersDescription(Config_getBool("EXTRACT_ALL")));
+      ol.parseText(lne ? lne->intro() : theTranslator->trFileMembersDescription(Config_getBool(EXTRACT_ALL)));
       ol.endTextBlock();
     }
     else
@@ -2836,8 +2836,8 @@ struct NmhlInfo
 
 static const NmhlInfo *getNmhlInfo(int hl)
 {
-  static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
-  static bool vhdlOpt    = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
+  static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
+  static bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
   static NmhlInfo nmhlInfo[] = 
   {
     NmhlInfo("namespacemembers",     theTranslator->trAll()),
@@ -2860,7 +2860,7 @@ static void writeNamespaceMemberIndexFiltered(OutputList &ol,
 {
   if (documentedNamespaceMembers[hl]==0) return;
 
-  static bool disableIndex     = Config_getBool("DISABLE_INDEX");
+  static bool disableIndex     = Config_getBool(DISABLE_INDEX);
 
 
   bool multiPageIndex=FALSE;
@@ -2949,7 +2949,7 @@ static void writeNamespaceMemberIndexFiltered(OutputList &ol,
     if (hl==NMHL_All)
     {
       ol.startTextBlock();
-      ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceMemberDescription(Config_getBool("EXTRACT_ALL")));
+      ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceMemberDescription(Config_getBool(EXTRACT_ALL)));
       ol.endTextBlock();
     }
     else
@@ -2978,7 +2978,7 @@ static void writeNamespaceMemberIndex(OutputList &ol)
     Doxygen::indexList->addContentsItem(FALSE,lne ? lne->title() : theTranslator->trNamespaceMembers(),0,"namespacemembers",0); 
     Doxygen::indexList->incContentsDepth();
   }
-  //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
+  //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
   writeNamespaceMemberIndexFiltered(ol,NMHL_All);
   writeNamespaceMemberIndexFiltered(ol,NMHL_Functions);
   writeNamespaceMemberIndexFiltered(ol,NMHL_Variables);
@@ -3084,7 +3084,7 @@ static void countRelatedPages(int &docPages,int &indexPages)
 
 static bool mainPageHasOwnTitle()
 {
-  static QCString projectName = Config_getString("PROJECT_NAME");
+  static QCString projectName = Config_getString(PROJECT_NAME);
   QCString title;
   if (Doxygen::mainPage)
   {
@@ -3244,14 +3244,14 @@ static int countDirs()
 
 void writeGraphInfo(OutputList &ol)
 {
-  if (!Config_getBool("HAVE_DOT") || !Config_getBool("GENERATE_HTML")) return;
+  if (!Config_getBool(HAVE_DOT) || !Config_getBool(GENERATE_HTML)) return;
   ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
-  generateGraphLegend(Config_getString("HTML_OUTPUT"));
+  generateGraphLegend(Config_getString(HTML_OUTPUT));
 
-  bool &stripCommentsStateRef = Config_getBool("STRIP_CODE_COMMENTS");
+  bool &stripCommentsStateRef = Config_getBool(STRIP_CODE_COMMENTS);
   bool oldStripCommentsState = stripCommentsStateRef;
-  bool &createSubdirs = Config_getBool("CREATE_SUBDIRS");
+  bool &createSubdirs = Config_getBool(CREATE_SUBDIRS);
   bool oldCreateSubdirs = createSubdirs;
   // temporarily disable the stripping of comments for our own code example!
   stripCommentsStateRef = FALSE;
@@ -3291,8 +3291,8 @@ void writeGraphInfo(OutputList &ol)
  */
 static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* ftv, bool addToIndex)
 {
-  //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
-  //bool vhdlOpt    = Config_getBool("OPTIMIZE_OUTPUT_VHDL");  
+  //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
+  //bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);  
   if (level>20)
   {
     warn(gd->getDefFileName(),gd->getDefLine(),
@@ -3306,7 +3306,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
    */
   if (/*!gd->visited &&*/ (!gd->isASubGroup() || level>0) &&
       gd->isVisible() &&
-      (!gd->isReference() || Config_getBool("EXTERNAL_GROUPS")) // hide external groups by default
+      (!gd->isReference() || Config_getBool(EXTERNAL_GROUPS)) // hide external groups by default
      )
   {
     //printf("gd->name()=%s #members=%d\n",gd->name().data(),gd->countMembers());
@@ -3314,7 +3314,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
     bool hasSubGroups = gd->getSubGroups()->count()>0;
     bool hasSubPages = gd->getPages()->count()>0;
     int numSubItems = 0;
-    if (1 /*Config_getBool("TOC_EXPAND")*/)
+    if (1 /*Config_getBool(TOC_EXPAND)*/)
     {
       QListIterator<MemberList> mli(gd->getMemberLists());
       MemberList *ml;
@@ -3560,7 +3560,7 @@ static void writeGroupHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
 #if 0
 static void writeGroupTree(GroupDef *gd,FTVHelp *ftv,int level,bool addToIndex)
 {
-  static bool externalGroups = Config_getBool("EXTERNAL_GROUPS");
+  static bool externalGroups = Config_getBool(EXTERNAL_GROUPS);
   /* Some groups should appear twice under different parent-groups.
    * That is why we should not check if it was visited 
    */
@@ -3689,7 +3689,7 @@ static void writeDirIndex(OutputList &ol)
   ol.endTextBlock();
 
   FTVHelp* ftv = 0;
-  bool treeView=Config_getBool("USE_INLINE_TREES");
+  bool treeView=Config_getBool(USE_INLINE_TREES);
   if (treeView)
   {
     ftv = new FTVHelp(FALSE);
@@ -3760,9 +3760,9 @@ static void writeUserGroupStubPage(OutputList &ol,LayoutNavEntry *lne)
 
 static void writeIndex(OutputList &ol)
 {
-  static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
-  static bool vhdlOpt    = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
-  static QCString projectName = Config_getString("PROJECT_NAME");
+  static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
+  static bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
+  static QCString projectName = Config_getString(PROJECT_NAME);
   // save old generator state
   ol.pushGeneratorState();
 
@@ -3810,7 +3810,7 @@ static void writeIndex(OutputList &ol)
   }
 
   ol.startQuickIndices();
-  if (!Config_getBool("DISABLE_INDEX")) 
+  if (!Config_getBool(DISABLE_INDEX)) 
   {
     ol.writeQuickLinks(TRUE,HLI_Main,0);
   }
@@ -3847,7 +3847,7 @@ static void writeIndex(OutputList &ol)
   }
 
   ol.startContents();
-  if (Config_getBool("DISABLE_INDEX") && Doxygen::mainPage==0) 
+  if (Config_getBool(DISABLE_INDEX) && Doxygen::mainPage==0) 
   {
     ol.writeQuickLinks(FALSE,HLI_Main,0);
   }
@@ -3880,7 +3880,7 @@ static void writeIndex(OutputList &ol)
 
   ol.startFile("refman",0,0);
   ol.startIndexSection(isTitlePageStart);
-  if (!Config_getString("LATEX_HEADER").isEmpty()) 
+  if (!Config_getString(LATEX_HEADER).isEmpty()) 
   {
     ol.disable(OutputGenerator::Latex);
   }
@@ -3894,10 +3894,10 @@ static void writeIndex(OutputList &ol)
     ol.parseText(projPrefix);
   }
 
-  if (!Config_getString("PROJECT_NUMBER").isEmpty())
+  if (!Config_getString(PROJECT_NUMBER).isEmpty())
   {
     ol.startProjectNumber(); 
-    ol.generateDoc(defFileName,defLine,Doxygen::mainPage,0,Config_getString("PROJECT_NUMBER"),FALSE,FALSE);
+    ol.generateDoc(defFileName,defLine,Doxygen::mainPage,0,Config_getString(PROJECT_NUMBER),FALSE,FALSE);
     ol.endProjectNumber();
   }
   ol.endIndexSection(isTitlePageStart);
@@ -3968,7 +3968,7 @@ static void writeIndex(OutputList &ol)
     }
   }
 
-  if (!Config_getBool("LATEX_HIDE_INDICES"))
+  if (!Config_getBool(LATEX_HIDE_INDICES))
   {
     //if (indexedPages>0)
     //{
@@ -4106,7 +4106,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
           break;
         case LayoutNavEntry::Namespaces: 
           {
-            static bool showNamespaces = Config_getBool("SHOW_NAMESPACES");
+            static bool showNamespaces = Config_getBool(SHOW_NAMESPACES);
             if (showNamespaces)
             {
               if (documentedNamespaces>0 && addToIndex)
@@ -4125,7 +4125,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
           break;
         case LayoutNavEntry::NamespaceList: 
           {
-            static bool showNamespaces = Config_getBool("SHOW_NAMESPACES");
+            static bool showNamespaces = Config_getBool(SHOW_NAMESPACES);
             if (showNamespaces)
             {
               msg("Generating namespace index...\n");
@@ -4161,7 +4161,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
         case LayoutNavEntry::ClassHierarchy: 
           msg("Generating hierarchical class index...\n");
           writeHierarchicalIndex(ol);
-          if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY"))
+          if (Config_getBool(HAVE_DOT) && Config_getBool(GRAPHICAL_HIERARCHY))
           {
             msg("Generating graphical class hierarchy...\n");
             writeGraphicalClassHierarchy(ol);
@@ -4173,7 +4173,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
           break;
         case LayoutNavEntry::Files: 
           {
-            static bool showFiles = Config_getBool("SHOW_FILES");
+            static bool showFiles = Config_getBool(SHOW_FILES);
             if (showFiles)
             {
               if (documentedHtmlFiles>0 && addToIndex)
@@ -4192,7 +4192,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
           break;
         case LayoutNavEntry::FileList: 
           {
-            static bool showFiles = Config_getBool("SHOW_FILES");
+            static bool showFiles = Config_getBool(SHOW_FILES);
             if (showFiles)
             {
               msg("Generating file index...\n");