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

List:       kde-commits
Subject:    kdelibs/kdecore/kconfig_compiler
From:       Michael Brade <brade () kde ! org>
Date:       2005-02-16 19:59:11
Message-ID: 20050216195911.C687E1C6A8 () office ! kde ! org
[Download RAW message or body]

CVS commit by brade: 

Fix singleton class inheriting a normal class. Needed for KNotes.


  M +5 -2      kconfig_compiler.cpp   1.63


--- kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp  #1.62:1.63
@@ -964,4 +964,7 @@ int main( int argc, char **argv )
   if ( headerIncludes.count() > 0 ) h << endl;
 
+  if ( !singleton && cfgFileNameArg && parameters.isEmpty() )
+    h << "#include <kglobal.h>" << endl;
+
   h << "#include <kconfigskeleton.h>" << endl << endl;
 
@@ -1020,5 +1023,5 @@ int main( int argc, char **argv )
     h << "    " << className << "(";
     if (cfgFileNameArg)
-       h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " " : ", ");
+       h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = \
KGlobal::sharedConfig()" : ", ");  for (QValueList<Param>::ConstIterator it = \
parameters.begin();  it != parameters.end(); ++it)
@@ -1264,5 +1267,5 @@ int main( int argc, char **argv )
   // Constructor
   cpp << className << "::" << className << "( ";
-  if (cfgFileNameArg ) {
+  if ( cfgFileNameArg ) {
     if ( !singleton )
       cpp << " KSharedConfig::Ptr config";


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