Release-1.2.6-20010401

1 files changed, 98 insertions, 98 deletions

diff --git a/src/index.cpp b/src/index.cpp
index 83495b8..b45d693 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -155,7 +155,7 @@ void writeQuickLinks(OutputList &ol,bool compact ,bool ext=FALSE)
   if (compact) ol.startCenter(); else ol.startItemList();
 
   if (!compact) ol.writeListItem();
-  if (Config::ftvHelpFlag)
+  if (Config::instance()->getBool("GENERATE_TREEVIEW"))
   {
     ol.startQuickIndexItem(extLink,"main.html");
   }
@@ -196,7 +196,7 @@ void writeQuickLinks(OutputList &ol,bool compact ,bool ext=FALSE)
   } 
   if (annotatedClasses>0)
   {
-    if (Config::alphaIndexFlag)
+    if (Config::instance()->getBool("ALPHABETICAL_INDEX"))
     {
       if (!compact) ol.writeListItem();
       ol.startQuickIndexItem(extLink,"classes.html");
@@ -215,14 +215,14 @@ void writeQuickLinks(OutputList &ol,bool compact ,bool ext=FALSE)
     parseText(ol,theTranslator->trFileList());
     ol.endQuickIndexItem();
   } 
-  //if (documentedIncludeFiles>0 && Config::verbatimHeaderFlag)
+  //if (documentedIncludeFiles>0 && Config::instance()->getBool("VERBATIM_HEADERS"))
   //{
   //  if (!compact) ol.writeListItem();
   //  ol.startQuickIndexItem(extLink,"headers.html");
   //  parseText(ol,theTranslator->trHeaderFiles());
   //  ol.endQuickIndexItem();
   //}
-  //if (Config::sourceBrowseFlag) 
+  //if (Config::instance()->getBool("SOURCE_BROWSER")) 
   //{
   //  if (!compact) ol.writeListItem();
   //  ol.startQuickIndexItem(extLink,"sources.html");
@@ -264,7 +264,7 @@ void writeQuickLinks(OutputList &ol,bool compact ,bool ext=FALSE)
     parseText(ol,theTranslator->trExamples());
     ol.endQuickIndexItem();
   } 
-  if (Config::searchEngineFlag)
+  if (Config::instance()->getBool("SEARCHENGINE"))
   {
     if (!compact) ol.writeListItem();
     ol.startQuickIndexItem("_cgi","");
@@ -303,7 +303,7 @@ void endTitle(OutputList &ol,const char *fileName,const char *name)
 void startFile(OutputList &ol,const char *name,const char *title,bool external)
 {
   ol.startFile(name,title,external);
-  if (!Config::noIndexFlag) writeQuickLinks(ol,TRUE,external);
+  if (!Config::instance()->getBool("DISABLE_INDEX")) writeQuickLinks(ol,TRUE,external);
 }
 
 void endFile(OutputList &ol,bool external)
@@ -311,15 +311,15 @@ void endFile(OutputList &ol,bool external)
   ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
   ol.writeFooter(0,external); // write the footer
-  if (Config::footerFile.isEmpty())
+  if (Config::instance()->getString("HTML_FOOTER").isEmpty())
   {
     parseText(ol,theTranslator->trGeneratedAt(
               dateToString(TRUE),
-              Config::projectName
+              Config::instance()->getString("PROJECT_NAME")
              ));
   }
   ol.writeFooter(1,external); // write the link to the picture
-  if (Config::footerFile.isEmpty())
+  if (Config::instance()->getString("HTML_FOOTER").isEmpty())
   {
     parseText(ol,theTranslator->trWrittenBy());
   }
@@ -334,8 +334,8 @@ void writeClassTree(OutputList &ol,BaseClassList *bcl,bool hideSuper)
 {
   HtmlHelp *htmlHelp=0;
   FTVHelp  *ftvHelp=0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -415,8 +415,8 @@ void writeClassTree(BaseClassList *cl)
 {
   HtmlHelp *htmlHelp=0;
   FTVHelp  *ftvHelp=0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -471,8 +471,8 @@ void writeClassTree(ClassList *cl)
 {
   HtmlHelp *htmlHelp=0;
   FTVHelp  *ftvHelp=0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -521,8 +521,8 @@ void writeClassHierarchy(OutputList &ol)
 
   HtmlHelp *htmlHelp=0;
   FTVHelp  *ftvHelp=0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -627,23 +627,23 @@ void writeHierarchicalIndex(OutputList &ol)
   QCString title = theTranslator->trClassHierarchy();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle  = title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp = 0;
-  if (Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/)
+  if (Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/)
   {
     htmlHelp = HtmlHelp::getInstance();
     htmlHelp->addContentsItem(TRUE,htmlHelpTitle,"hierarchy"); 
   }
-  if (Config::generateHtml && Config::ftvHelpFlag /*&& !Config::htmlHelpGroupsOnly*/)
+  if (Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW") /*&& !Config::instance()->get("")*/)
   {
     ftvHelp = FTVHelp::getInstance();
     ftvHelp->addContentsItem(TRUE,0,"hierarchy",0,ftvHelpTitle); 
   }
-  if (Config::haveDotFlag && Config::gfxHierarchyFlag)
+  if (Config::instance()->getBool("HAVE_DOT") && Config::instance()->getBool("GRAPHICAL_HIERARCHY"))
   {
     ol.disable(OutputGenerator::Latex);
     ol.disable(OutputGenerator::RTF);
@@ -674,18 +674,18 @@ void writeGraphicalClassHierarchy(OutputList &ol)
   QCString title = theTranslator->trGraphicalHierarchy();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle  = title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp = 0;
-  if (Config::generateHtml && Config::htmlHelpFlag)
+  if (Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP"))
   {
     htmlHelp = HtmlHelp::getInstance();
     htmlHelp->addContentsItem(FALSE,htmlHelpTitle,"inherits"); 
   }
-  if (Config::generateHtml && Config::ftvHelpFlag)
+  if (Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW"))
   {
     ftvHelp = FTVHelp::getInstance();
     ftvHelp->addContentsItem(FALSE,0,"inherits",0,ftvHelpTitle); 
@@ -750,14 +750,14 @@ void writeFileIndex(OutputList &ol)
   QCString title = theTranslator->trFileList();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle  = title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp = 0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp =  Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp =  Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -771,7 +771,7 @@ void writeFileIndex(OutputList &ol)
     ftvHelp->incContentsDepth();
   }
   //ol.newParagraph();
-  parseText(ol,theTranslator->trFileListDescription(Config::extractAllFlag));
+  parseText(ol,theTranslator->trFileListDescription(Config::instance()->getBool("EXTRACT_ALL")));
   //ol.newParagraph();
   ol.endTextBlock();
 
@@ -779,7 +779,7 @@ void writeFileIndex(OutputList &ol)
   OutputNameList outputNameList;
   outputNameList.setAutoDelete(TRUE);
   
-  if (Config::fullPathNameFlag)
+  if (Config::instance()->getBool("FULL_PATH_NAMES"))
   {
     // re-sort input files in (dir,file) output order instead of (file,dir) input order 
     FileName *fn=Doxygen::inputNameList.first();
@@ -812,7 +812,7 @@ void writeFileIndex(OutputList &ol)
   
   ol.startIndexList();
   FileList *fl=0;
-  if (Config::fullPathNameFlag)
+  if (Config::instance()->getBool("FULL_PATH_NAMES"))
   {
     fl = outputNameList.first();
   }
@@ -834,7 +834,7 @@ void writeFileIndex(OutputList &ol)
               !fd->isReference())
       {
         QCString path;
-        if (Config::fullPathNameFlag) 
+        if (Config::instance()->getBool("FULL_PATH_NAMES")) 
         {
           path=stripFromPath(fd->getPath().copy());
         }
@@ -920,7 +920,7 @@ void writeFileIndex(OutputList &ol)
       }
       fd=fl->next();
     }
-    if (Config::fullPathNameFlag)
+    if (Config::instance()->getBool("FULL_PATH_NAMES"))
     {
       fl=outputNameList.next();
     }
@@ -968,14 +968,14 @@ void writeNamespaceIndex(OutputList &ol)
   QCString title = theTranslator->trNamespaceList();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle  = title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp  = 0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp =  Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp =  Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -989,7 +989,7 @@ void writeNamespaceIndex(OutputList &ol)
     ftvHelp->incContentsDepth();
   }
   //ol.newParagraph();
-  parseText(ol,theTranslator->trNamespaceListDescription(Config::extractAllFlag));
+  parseText(ol,theTranslator->trNamespaceListDescription(Config::instance()->getBool("EXTRACT_ALL")));
   //ol.newParagraph();
   ol.endTextBlock();
 
@@ -1065,8 +1065,8 @@ int countAnnotatedClasses()
 
 void writeAnnotatedClassList(OutputList &ol)
 {
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp =  Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp =  Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
   ol.startIndexList(); 
   //ClassDef *cd=Doxygen::classList.first();
   //while (cd)
@@ -1107,8 +1107,8 @@ void writeAnnotatedClassList(OutputList &ol)
 
 void writePackageList(OutputList &ol)
 {
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp =  Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp =  Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
   ol.startIndexList(); 
   PackageSDict::Iterator pdi(Doxygen::packageDict);
   PackageDef *pd;
@@ -1168,7 +1168,7 @@ void writeAlphabeticalClassList(OutputList &ol)
   }
 
   // the number of columns in the table
-  const int columns = Config::colsInAlphaIndex;
+  const int columns = Config::instance()->getInt("COLS_IN_ALPHA_INDEX");
 
   int i,j;
   int totalItems = headerItems + annotatedClasses;            // number of items in the table
@@ -1249,7 +1249,7 @@ void writeAlphabeticalClassList(OutputList &ol)
       {
         QCString cname;
         QCString namesp;
-        if (Config::hideScopeNames)
+        if (Config::instance()->getBool("HIDE_SCOPE_NAMES"))
         {
           cname=cd->displayName();
         }
@@ -1275,7 +1275,7 @@ void writeAlphabeticalClassList(OutputList &ol)
           }
           ol.docify(")");
         }
-        ol.writeNonBreakableSpace();
+        ol.writeNonBreakableSpace(3);
         //printf("item ClassDef=%p %s\n",cd,cd ? cd->name().data() : "<none>");
         ++(*colIterators[j]);
       }
@@ -1304,7 +1304,7 @@ void writeAlphabeticalIndex(OutputList &ol)
   ol.disableAllBut(OutputGenerator::Html);
   startFile(ol,"classes.html","Alphabetical index");
   startTitle(ol,0);
-  parseText(ol,Config::projectName+" "+theTranslator->trCompoundIndex());
+  parseText(ol,Config::instance()->getString("PROJECT_NAME")+" "+theTranslator->trCompoundIndex());
   endTitle(ol,0,0);
   writeAlphabeticalClassList(ol);
   endFile(ol);
@@ -1315,8 +1315,8 @@ void writeAlphabeticalIndex(OutputList &ol)
 
 void writeAnnotatedIndex(OutputList &ol)
 {
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
 
   if (annotatedClasses==0) return;
   
@@ -1327,7 +1327,7 @@ void writeAnnotatedIndex(OutputList &ol)
   QCString title = theTranslator->trCompoundList();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle =  title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
@@ -1365,8 +1365,8 @@ void writeAnnotatedIndex(OutputList &ol)
 
 void writePackageIndex(OutputList &ol)
 {
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
 
   if (documentedPackages==0) return;
   
@@ -1377,7 +1377,7 @@ void writePackageIndex(OutputList &ol)
   QCString title = theTranslator->trPackageList();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle =  title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
@@ -1568,7 +1568,7 @@ void writeMemberIndex(OutputList &ol)
   QCString title = theTranslator->trCompoundMembers();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle =  title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   startTitle(ol,0);
   parseText(ol,title);
   endTitle(ol,0,0);
@@ -1577,8 +1577,8 @@ void writeMemberIndex(OutputList &ol)
   {
     writeQuickMemberIndex(ol,g_memberIndexLetterUsed);
   }
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp =  Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp =  Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   if (hasHtmlHelp)
   {
     HtmlHelp *htmlHelp = HtmlHelp::getInstance();
@@ -1589,7 +1589,7 @@ void writeMemberIndex(OutputList &ol)
     FTVHelp *ftvHelp = FTVHelp::getInstance();
     ftvHelp->addContentsItem(FALSE,0,"functions",0,ftvHelpTitle); 
   }
-  parseText(ol,theTranslator->trCompoundMembersDescription(Config::extractAllFlag));
+  parseText(ol,theTranslator->trCompoundMembersDescription(Config::instance()->getBool("EXTRACT_ALL")));
   writeMemberList(ol,quickIndex);
   endFile(ol);
   ol.popGeneratorState();
@@ -1824,7 +1824,7 @@ void writeFileMemberIndex(OutputList &ol)
   QCString title = theTranslator->trFileMembers();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle =  title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   startTitle(ol,0);
   parseText(ol,title);
   endTitle(ol,0,0);
@@ -1833,8 +1833,8 @@ void writeFileMemberIndex(OutputList &ol)
   {
     writeQuickMemberIndex(ol,g_fileIndexLetterUsed);
   }
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp =  Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp =  Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   if (hasHtmlHelp)
   {
     HtmlHelp *htmlHelp = HtmlHelp::getInstance();
@@ -1845,7 +1845,7 @@ void writeFileMemberIndex(OutputList &ol)
     FTVHelp *ftvHelp = FTVHelp::getInstance();
     ftvHelp->addContentsItem(FALSE,0,"globals",0,ftvHelpTitle); 
   }
-  parseText(ol,theTranslator->trFileMembersDescription(Config::extractAllFlag));
+  parseText(ol,theTranslator->trFileMembersDescription(Config::instance()->getBool("EXTRACT_ALL")));
   writeFileMemberList(ol,quickIndex);
   endFile(ol);
   ol.popGeneratorState();
@@ -1862,7 +1862,7 @@ void writeNamespaceMemberIndex(OutputList &ol)
   QCString title = theTranslator->trNamespaceMembers();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle =  title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   startTitle(ol,0);
   parseText(ol,title);
   endTitle(ol,0,0);
@@ -1871,8 +1871,8 @@ void writeNamespaceMemberIndex(OutputList &ol)
   {
     writeQuickMemberIndex(ol,g_namespaceIndexLetterUsed);
   }
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp =  Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp =  Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   if (hasHtmlHelp)
   {
     HtmlHelp *htmlHelp = HtmlHelp::getInstance();
@@ -1883,7 +1883,7 @@ void writeNamespaceMemberIndex(OutputList &ol)
     FTVHelp *ftvHelp = FTVHelp::getInstance();
     ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,ftvHelpTitle); 
   }
-  parseText(ol,theTranslator->trNamespaceMemberDescription(Config::extractAllFlag));
+  parseText(ol,theTranslator->trNamespaceMemberDescription(Config::instance()->getBool("EXTRACT_ALL")));
   writeNamespaceMemberList(ol,quickIndex);
   endFile(ol);
   ol.popGeneratorState();
@@ -1901,14 +1901,14 @@ void writeExampleIndex(OutputList &ol)
   QCString title = theTranslator->trExamples();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle  = title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp = 0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag  /*&& !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&& !Config::instance()->get("")*/;
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -2005,14 +2005,14 @@ void writePageIndex(OutputList &ol)
   QCString title = theTranslator->trRelatedPages();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle  = title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp = 0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag /*&& !Config::htmlHelpGroupsOnly*/;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag  /*&&  !Config::htmlHelpGroupsOnly*/;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP") /*&& !Config::instance()->get("")*/;
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW")  /*&&  !Config::instance()->get("")*/;
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -2037,7 +2037,7 @@ void writePageIndex(OutputList &ol)
     {
       QCString pageName,pageTitle;
 
-      if (Config::caseSensitiveNames)
+      if (Config::instance()->getBool("CASE_SENSE_NAMES"))
         pageName=pi->name.copy();
       else
         pageName=pi->name.lower();
@@ -2099,19 +2099,19 @@ int countGroups()
 
 void writeGraphInfo(OutputList &ol)
 {
-  if (!Config::haveDotFlag || !Config::generateHtml) return;
+  if (!Config::instance()->getBool("HAVE_DOT") || !Config::instance()->getBool("GENERATE_HTML")) return;
   ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
-  generateGraphLegend(Config::htmlOutputDir);
+  generateGraphLegend(Config::instance()->getString("HTML_OUTPUT"));
   startFile(ol,"graph_legend","Graph Legend");
   startTitle(ol,0);
   parseText(ol,theTranslator->trLegendTitle());
   endTitle(ol,0,0);
-  bool oldStripCommentsState = Config::stripCommentsFlag;
+  bool oldStripCommentsState = Config::instance()->getBool("STRIP_CODE_COMMENTS");
   // temporarily disable the stripping of comments for our own code example!
-  Config::stripCommentsFlag = FALSE;
+  Config::instance()->getBool("STRIP_CODE_COMMENTS") = FALSE;
   parseDoc(ol,"graph_legend",1,0,0,theTranslator->trLegendDocs());
-  Config::stripCommentsFlag = oldStripCommentsState;
+  Config::instance()->getBool("STRIP_CODE_COMMENTS") = oldStripCommentsState;
   endFile(ol);
   ol.popGeneratorState();
 }
@@ -2126,8 +2126,8 @@ void writeGroupTreeNode(OutputList &ol, GroupDef *gd,bool subLevel)
 {
   HtmlHelp *htmlHelp=0;
   FTVHelp  *ftvHelp = 0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -2206,7 +2206,7 @@ void writeGroupTreeNode(OutputList &ol, GroupDef *gd,bool subLevel)
     }
 
 
-    if (Config::htmlHelpTocExpandFlag)
+    if (Config::instance()->getBool("TOC_EXPAND"))
     {
       // write members
       struct MemInfo
@@ -2413,8 +2413,8 @@ void writeGroupHierarchy(OutputList &ol)
 #if 0
 void writeGroupList(OutputList &ol)
 {
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp  = 0;
   if (hasHtmlHelp) htmlHelp = HtmlHelp::getInstance();
@@ -2445,7 +2445,7 @@ void writeGroupList(OutputList &ol)
       if (hasHtmlHelp)
       {
         htmlHelp = HtmlHelp::getInstance();
-        if(!Config::htmlHelpGroupsOnly)
+        if(!Config::instance()->get(""))
         {
           htmlHelp->addContentsItem(FALSE,gd->groupTitle(),docFile);
         }
@@ -2453,7 +2453,7 @@ void writeGroupList(OutputList &ol)
       if (hasFtvHelp)
       {
         ftvHelp = FTVHelp::getInstance();
-        if(!Config::htmlHelpGroupsOnly)
+        if(!Config::instance()->get(""))
         {
           ftvHelp->addContentsItem(FALSE,gd->groupTitle(),docFile); 
         }
@@ -2476,14 +2476,14 @@ void writeGroupIndex(OutputList &ol)
   QCString title = theTranslator->trModules();
   QCString htmlHelpTitle = title;
   QCString ftvHelpTitle  = title;
-  if (!Config::projectName.isEmpty()) title.prepend(Config::projectName+" ");
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty()) title.prepend(Config::instance()->getString("PROJECT_NAME")+" ");
   parseText(ol,title);
   endTitle(ol,0,0);
   ol.startTextBlock();
   HtmlHelp *htmlHelp = 0;
   FTVHelp  *ftvHelp = 0;
-  bool hasHtmlHelp = Config::generateHtml && Config::htmlHelpFlag;
-  bool hasFtvHelp  = Config::generateHtml && Config::ftvHelpFlag;
+  bool hasHtmlHelp = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP");
+  bool hasFtvHelp  = Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW");
   if (hasHtmlHelp)
   {
     htmlHelp = HtmlHelp::getInstance();
@@ -2502,7 +2502,7 @@ void writeGroupIndex(OutputList &ol)
   if (hasHtmlHelp)
   {
     //writeGroupTree(ol);   // KPW - modified to write hierarchial HMTL Help
-    //if(!Config::htmlHelpGroupsOnly)
+    //if(!Config::instance()->get(""))
     //{
         htmlHelp->decContentsDepth();
     //}
@@ -2510,7 +2510,7 @@ void writeGroupIndex(OutputList &ol)
   if (hasFtvHelp)
   {
     //writeGroupTree(ol);   // KPW - modified to write hierarchial FTV Help
-    //if(!Config::htmlHelpGroupsOnly)
+    //if(!Config::instance()->get(""))
     //{
         ftvHelp->decContentsDepth();
     //}
@@ -2527,9 +2527,9 @@ void writeIndex(OutputList &ol)
   ol.pushGeneratorState();
 
   QCString projPrefix;
-  if (!Config::projectName.isEmpty())
+  if (!Config::instance()->getString("PROJECT_NAME").isEmpty())
   {
-    projPrefix=Config::projectName+" ";
+    projPrefix=Config::instance()->getString("PROJECT_NAME")+" ";
   }
 
   //--------------------------------------------------------------------
@@ -2553,19 +2553,19 @@ void writeIndex(OutputList &ol)
   }
 
   QCString indexName="index";
-  if (Config::ftvHelpFlag) indexName="main";
+  if (Config::instance()->getBool("GENERATE_TREEVIEW")) indexName="main";
   ol.startFile(indexName,title,FALSE);
   
-  if (Config::generateHtml && Config::htmlHelpFlag)
+  if (Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_HTMLHELP"))
   {
     HtmlHelp::getInstance()->addContentsItem(FALSE,title,indexName); 
   }
-  if (Config::generateHtml && Config::ftvHelpFlag)
+  if (Config::instance()->getBool("GENERATE_HTML") && Config::instance()->getBool("GENERATE_TREEVIEW"))
   {
     FTVHelp::getInstance()->addContentsItem(FALSE,0,indexName,0,title); 
   }
 
-  if (!Config::noIndexFlag) writeQuickLinks(ol,TRUE);
+  if (!Config::instance()->getBool("DISABLE_INDEX")) writeQuickLinks(ol,TRUE);
   ol.startTitleHead(0);
   if (Doxygen::mainPage && !Doxygen::mainPage->title.isEmpty())
   {
@@ -2577,13 +2577,13 @@ void writeIndex(OutputList &ol)
   }
   ol.endTitleHead(0,0);
   ol.newParagraph();
-  if (!Config::projectNumber.isEmpty())
+  if (!Config::instance()->getString("PROJECT_NUMBER").isEmpty())
   {
     ol.startProjectNumber();
-    parseDoc(ol,defFileName,defLine,0,0,Config::projectNumber);
+    parseDoc(ol,defFileName,defLine,0,0,Config::instance()->getString("PROJECT_NUMBER"));
     ol.endProjectNumber();
   }
-  if (Config::noIndexFlag && Doxygen::mainPage==0) writeQuickLinks(ol,FALSE);
+  if (Config::instance()->getBool("DISABLE_INDEX") && Doxygen::mainPage==0) writeQuickLinks(ol,FALSE);
 
   if (Doxygen::mainPage)
   {
@@ -2601,16 +2601,16 @@ void writeIndex(OutputList &ol)
 
   ol.startFile("refman",0,FALSE);
   ol.startIndexSection(isTitlePageStart);
-  if (!Config::latexHeaderFile.isEmpty()) 
+  if (!Config::instance()->getString("LATEX_HEADER").isEmpty()) 
   {
     ol.disable(OutputGenerator::Latex);
   }
 
   parseText(ol,projPrefix+theTranslator->trReferenceManual());
-  if (!Config::projectNumber.isEmpty())
+  if (!Config::instance()->getString("PROJECT_NUMBER").isEmpty())
   {
     ol.startProjectNumber(); 
-    parseDoc(ol,defFileName,defLine,0,0,Config::projectNumber);
+    parseDoc(ol,defFileName,defLine,0,0,Config::instance()->getString("PROJECT_NUMBER"));
     ol.endProjectNumber();
   }
   ol.endIndexSection(isTitlePageStart);