Release-1.2.6-20010401

2 files changed, 23 insertions, 23 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))
   {
diff --git a/addon/xmlgen/xmlgen.pro.in b/addon/xmlgen/xmlgen.pro.in
index c16db47..2f29fd3 100644
--- a/addon/xmlgen/xmlgen.pro.in
+++ b/addon/xmlgen/xmlgen.pro.in
@@ -3,18 +3,18 @@ CONFIG       =	console warn_on $extraopt
 HEADERS      =	xml.h xml_dtd.h
 SOURCES      =	main.cpp xml.cpp
 DEPENDPATH   = ../../src
-unix:LIBS                  += -L../../lib -ldoxygen -lqtools 
+unix:LIBS                  += -L../../lib -ldoxygen -ldoxycfg -lqtools 
 win32:INCLUDEPATH          += .
-win32-mingw:LIBS           += -L../../lib -ldoxygen -lqtools 
-win32-msvc:LIBS            += qtools.lib doxygen.lib shell32.lib 
+win32-mingw:LIBS           += -L../../lib -ldoxygen -ldoxycfg -lqtools 
+win32-msvc:LIBS            += qtools.lib doxygen.lib doxycfg.lib shell32.lib 
 win32-msvc:TMAKE_LFLAGS    += /LIBPATH:..\..\lib
-win32-borland:LIBS         += qtools.lib doxygen.lib shell32.lib
+win32-borland:LIBS         += qtools.lib doxygen.lib doxycfg.lib shell32.lib
 win32-borland:TMAKE_LFLAGS += -L..\..\lib
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL
 INCLUDEPATH                += ../../qtools ../../src
 DESTDIR                    =  ../../bin
 TARGET                     =  doxygen_xml
-unix:TARGETDEPS            =  ../../lib/libdoxygen.a
-win32:TARGETDEPS           =  ..\..\lib\doxygen.lib
+unix:TARGETDEPS            =  ../../lib/libdoxygen.a ../../lib/libdoxycfg.a
+win32:TARGETDEPS           =  ..\..\lib\doxygen.lib ../../lib/doxycfg.lib
 OBJECTS_DIR                =  obj