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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/kconfig_compiler
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-05-21 17:36:43
Message-ID: 1179769003.761598.29779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 667046 by chehrlic:

include kglobal.h instead kstaticdeleter
add a small fix for msvc

 M  +5 -2      kconfig_compiler.cpp  


--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp #667045:667046
@@ -1672,7 +1672,7 @@
 
   // Header required by singleton implementation
   if ( singleton )
-    cpp << "#include <kstaticdeleter.h>" << endl << "#include <QtCore/QFile>" << endl << endl;
+    cpp << "#include <kglobal.h>" << endl << "#include <QtCore/QFile>" << endl << endl;
   if ( singleton && cfgFileNameArg )
     cpp << "#include <kdebug.h>" << endl << endl;
 
@@ -1719,7 +1719,10 @@
 
   // Singleton implementation
   if ( singleton ) {
-    cpp << "class " << className << "Helper" << endl;
+    if( nameSpace.isEmpty() )
+      cpp << "class " << className << "Helper" << endl;
+    else
+      cpp << "class " << nameSpace << "::" << className << "Helper" << endl;
     cpp << '{' << endl;
     cpp << "  public:" << endl;
     cpp << "    " << className << "Helper() : q(0) {}" << endl;
[prev in list] [next in list] [prev in thread] [next in thread]