[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdoctools
From:       Adriaan de Groot <adridg () cs ! kun ! nl>
Date:       2003-07-25 10:35:30
[Download RAW message or body]

CVS commit by adridg: 

Initialize before use


  M +8 -8      meinproc.cpp   1.31
  M +4 -6      xslt.cpp   1.66
  M +1 -1      xslt.h   1.13


--- kdelibs/kdoctools/meinproc.cpp  #1.30:1.31
@@ -28,5 +28,4 @@
 
 extern int xmlLoadExtDtdDefaultValue;
-extern QString *SRCDIR;
 
 class MyPair {
@@ -101,7 +100,4 @@ int main(int argc, char **argv) {
     KGlobal::locale();
 
-    fillInstance(ins);
-
-    SRCDIR=new QString;
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -111,4 +107,11 @@ int main(int argc, char **argv) {
     }
 
+    // Need to set SRCDIR before calling fillInstance
+    QString srcdir;
+    if ( args->isSet( "srcdir" ) ) {
+        srcdir = args->getOption("srcdir") ;
+    }
+    fillInstance(ins,srcdir);
+
     LIBXML_TEST_VERSION
 
@@ -131,7 +134,4 @@ int main(int argc, char **argv) {
     }
 
-    if ( args->isSet( "srcdir" ) ) {
-        *SRCDIR = args->getOption("srcdir") ;
-    }
     if ( args->isSet( "check" ) ) {
         char pwd_buffer[250];

--- kdelibs/kdoctools/xslt.h  #1.12:1.13
@@ -7,5 +7,5 @@ QString transform(const QString &file, c
 QString transform(xmlParserCtxtPtr ctxt, const QString &tss);
 QString splitOut(const QString &parsed, int index);
-void fillInstance(KInstance &ins);
+void fillInstance(KInstance &ins, const QString &srcdir = QString::null );
 bool saveToCache( const QString &contents, const QString &filename );
 QString lookForCache( const QString &filename );

--- kdelibs/kdoctools/xslt.cpp  #1.65:1.66
@@ -27,6 +27,4 @@
 #include <klibloader.h>
 
-QString *SRCDIR=0L;
-
 #if !defined( SIMPLE_XSLT )
 extern HelpProtocol *slave;
@@ -269,8 +267,8 @@ QString splitOut(const QString &parsed, 
 }
 
-void fillInstance(KInstance &ins) {
+void fillInstance(KInstance &ins, const QString &srcdir) {
     QString catalogs;
 
-    if ( !SRCDIR || SRCDIR->isEmpty() ) {
+    if ( srcdir.isEmpty() ) {
         catalogs += ins.dirs()->findResource("data", \
"ksgmltools2/customization/catalog");  catalogs += ':';
@@ -278,6 +276,6 @@ void fillInstance(KInstance &ins) {
         ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data") + \
"ksgmltools2");  } else {
-        catalogs += (*SRCDIR) +"/customization/catalog:" + (*SRCDIR) + \
                "/docbook/xml-dtd-4.2/docbook.cat";
-        ins.dirs()->addResourceDir("dtd", (*SRCDIR));
+        catalogs += srcdir +"/customization/catalog:" + srcdir + \
"/docbook/xml-dtd-4.2/docbook.cat"; +        ins.dirs()->addResourceDir("dtd", \
srcdir);  }
 


[prev in list] [next in list] [prev in thread] [next in thread]