[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 19:00:47
Message-ID: 1179774047.673640.6347.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 667065 by chehrlic:

make gcc happy

 M  +5 -4      kconfig_compiler.cpp  


--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp #667064:667065
@@ -1719,16 +1719,17 @@
 
   // Singleton implementation
   if ( singleton ) {
-    if( nameSpace.isEmpty() )
-      cpp << "class " << className << "Helper" << endl;
-    else
-      cpp << "class " << nameSpace << "::" << className << "Helper" << endl;
+    if( !nameSpace.isEmpty() )
+      cpp << "namespace " << nameSpace << " {" << endl;
+    cpp << "class " << className << "Helper" << endl;
     cpp << '{' << endl;
     cpp << "  public:" << endl;
     cpp << "    " << className << "Helper() : q(0) {}" << endl;
     cpp << "    ~" << className << "Helper() { delete q; }" << endl;
     cpp << "    " << className << " *q;" << endl;
     cpp << "};" << endl;
+    if( !nameSpace.isEmpty() )
+      cpp << "}" << endl;
     cpp << "K_GLOBAL_STATIC(" << className << "Helper, s_global" << className << ")" << endl;
 
     cpp << className << " *" << className << "::self()" << endl;
[prev in list] [next in list] [prev in thread] [next in thread]