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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/kconfig_compiler
From:       David Faure <faure () kde ! org>
Date:       2007-04-03 14:38:13
Message-ID: 1175611093.904588.32594.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 649964 by dfaure:

Dirk is right, we don't need three overloads. The QString one is enough.
 If someone wants QT_NO_ASCII_CAST he'll simply use QLatin1String.


 M  +0 -20     kconfig_compiler.cpp  


--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp #649963:649964
@@ -1417,8 +1417,6 @@
     h << "    static " << className << " *self();" << endl;
     if (cfgFileNameArg)
     {
-      h << "    static void instance(const char* cfgfilename);" << endl;
-      h << "    static void instance(const QByteArray& cfgfilename);" << endl;
       h << "    static void instance(const QString& cfgfilename);" << endl;
     }
   }
@@ -1723,24 +1721,6 @@
     cpp << "}" << endl << endl;
 
     if ( cfgFileNameArg ) {
-      cpp << "void " << className << "::instance(const char* cfgfilename)" << endl;
-      cpp << "{" << endl;
-      cpp << "  if (mSelf) {" << endl;
-      cpp << "     kDebug() << \"" << className << "::instance called after the \
                first use - ignoring\" << endl;" << endl;
-      cpp << "     return;" << endl;
-      cpp << "  }" << endl;
-      cpp << "  static" << className << "Deleter.setObject( mSelf, new " << \
                className << "(QFile::decodeName(cfgfilename)) );" << endl;
-      cpp << "  mSelf->readConfig();" << endl;
-      cpp << "}" << endl << endl;
-      cpp << "void " << className << "::instance(const QByteArray& cfgfilename)" << \
                endl;
-      cpp << "{" << endl;
-      cpp << "  if (mSelf) {" << endl;
-      cpp << "     kDebug() << \"" << className << "::instance called after the \
                first use - ignoring\" << endl;" << endl;
-      cpp << "     return;" << endl;
-      cpp << "  }" << endl;
-      cpp << "  static" << className << "Deleter.setObject( mSelf, new " << \
                className << "(QFile::decodeName(cfgfilename)) );" << endl;
-      cpp << "  mSelf->readConfig();" << endl;
-      cpp << "}" << endl << endl;
       cpp << "void " << className << "::instance(const QString& cfgfilename)" << \
endl;  cpp << "{" << endl;
       cpp << "  if (mSelf) {" << endl;


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