[Kst] branches/work/kst/kst1kde4/kst/src

[Zongyi Zhang]

SVN commit 1114836 by zhang:

replace kconfig with qsettings

 M  +3 -3      d2asc/d2asc.cpp  
 M  +4 -4      d2d/d2d.cpp  
 M  +1 -1      libkstmath/kstobjectdefaults.h  


--- branches/work/kst/kst1kde4/kst/src/d2asc/d2asc.cpp #1114835:1114836
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <stdlib.h>
-#include <kconfig.h>
+#include <QSettings>
 #include <kinstance.h>
 
 // hack to make main() a friend of kstdatasource
@@ -50,8 +50,8 @@
   KInstance inst("d2asc");
   KstDataSourcePtr file;
 
-  KConfig *kConfigObject = new KConfig("kstdatarc", false, false);
-  KstDataSource::setupOnStartup(kConfigObject);
+  QSettings *qSettingsObject = new QSettings("kstdatarc", QSettings::NativeFormat, false);
+  KstDataSource::setupOnStartup(qSettingsObject);
 
   fieldEntry field;
   QValueList<fieldEntry> fieldList;
--- branches/work/kst/kst1kde4/kst/src/d2d/d2d.cpp #1114835:1114836
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <stdlib.h> // atoi
-#include <kconfig.h>
+#include <QSettings>
 #include <kinstance.h>
 
 // hack to make main() a friend of kstdatasource
@@ -45,8 +45,8 @@
   atexit(exitHelper);
   KInstance inst("d2d");
 
-  KConfig *kConfigObject = new KConfig("kstdatarc", false, false);
-  KstDataSource::setupOnStartup(kConfigObject);
+  QSettings *qSettingsObject = new QSettings("kstdatarc", QSettings::NativeFormat, this);
+  KstDataSource::setupOnStartup(qSettingsObject);
 
   char field_list[40][120], in_filename[180], out_filename[180], out_type[40];
   int n_field=0;
@@ -128,7 +128,7 @@
   for (KService::List::ConstIterator it = sl.begin(); it != sl.end(); ++it) {
     if ((*it)->library() == out_type) {
       KstSharedPtr<KST::DataSourcePlugin> p = new KST::DataSourcePlugin(*it);
-      out_file = p->create(kConfigObject, out_filename, QString::null);
+      out_file = p->create(qSettingsObject, out_filename, QString::null);
       break;
     }
   } 
--- branches/work/kst/kst1kde4/kst/src/libkstmath/kstobjectdefaults.h #1114835:1114836
@@ -22,7 +22,7 @@
 #include <QSettings>
 #include "kst_export.h"
 
-class KConfig;
+// xxx class KConfig;
 
 class KST_EXPORT KstObjectDefaults {
   public: