Release-1.2.6-20010401

1 files changed, 17 insertions, 17 deletions

diff --git a/addon/xmlgen/xml.cpp b/addon/xmlgen/xml.cpp
index ecb3fce..a624426 100644
--- a/addon/xmlgen/xml.cpp
+++ b/addon/xmlgen/xml.cpp
@@ -60,7 +60,7 @@ class TextGeneratorXMLImpl : public TextGeneratorIntf
 
 void generateDTD()
 {
-  QCString fileName=Config::outputDir+"/xml/doxygen.dtd";
+  QCString fileName=Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml/doxygen.dtd";
   QFile f(fileName);
   if (!f.open(IO_WriteOnly))
   {
@@ -440,49 +440,49 @@ void generateXMLForFile(FileDef *fd,QTextStream &t)
 
 void generateXML()
 {
-  if (Config::outputDir.isEmpty())
-    Config::outputDir=QDir::currentDirPath();
+  if (Config::instance()->getString("OUTPUT_DIRECTORY").isEmpty())
+    Config::instance()->getString("OUTPUT_DIRECTORY")=QDir::currentDirPath();
   else
   {
-    QDir dir(Config::outputDir);
+    QDir dir(Config::instance()->getString("OUTPUT_DIRECTORY"));
     if (!dir.exists())
     {
       dir.setPath(QDir::currentDirPath());
-      if (!dir.mkdir(Config::outputDir))
+      if (!dir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")))
       {
         err("Error: tag OUTPUT_DIRECTORY: Output directory `%s' does not "
-            "exist and cannot be created\n",Config::outputDir.data());
+            "exist and cannot be created\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
         exit(1);
       }
-      else if (!Config::quietFlag)
+      else if (!Config::instance()->getBool("QUIET"))
       {
         err("Notice: Output directory `%s' does not exist. "
-            "I have created it for you.\n", Config::outputDir.data());
+            "I have created it for you.\n", Config::instance()->getString("OUTPUT_DIRECTORY").data());
       }
-      dir.cd(Config::outputDir);
+      dir.cd(Config::instance()->getString("OUTPUT_DIRECTORY"));
     }
-    Config::outputDir=dir.absPath();
+    Config::instance()->getString("OUTPUT_DIRECTORY")=dir.absPath();
   }
 
-  QDir dir(Config::outputDir);
+  QDir dir(Config::instance()->getString("OUTPUT_DIRECTORY"));
   if (!dir.exists())
   {
     dir.setPath(QDir::currentDirPath());
-    if (!dir.mkdir(Config::outputDir))
+    if (!dir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")))
     {
-      err("Cannot create directory %s\n",Config::outputDir.data());
+      err("Cannot create directory %s\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
       return;
     }
   }
-  QDir xmlDir(Config::outputDir+"/xml");
-  if (!xmlDir.exists() && !xmlDir.mkdir(Config::outputDir+"/xml"))
+  QDir xmlDir(Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml");
+  if (!xmlDir.exists() && !xmlDir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml"))
   {
-    err("Could not create xml directory in %s\n",Config::outputDir.data());
+    err("Could not create xml directory in %s\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
     return;
   }
   generateDTD();
   
-  QCString fileName=Config::outputDir+"/xml/doxygen.xml";
+  QCString fileName=Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml/doxygen.xml";
   QFile f(fileName);
   if (!f.open(IO_WriteOnly))
   {