[Kst] branches/work/kst/portto4/kst

[Mike Fenton]

SVN commit 940593 by fenton:

Update tests / tools for DataSource::init()


 M  +1 -2      src/d2asc/d2asc.cpp  
 M  +1 -2      src/d2d/d2d.cpp  
 M  +1 -2      tests/testdatasource.cpp  


--- branches/work/kst/portto4/kst/src/d2asc/d2asc.cpp #940592:940593
@@ -42,8 +42,7 @@
   Kst::DataSourcePtr file;
   int i;
 
-  QSettings *settingsObject = new QSettings("kstdatarc", QSettings::IniFormat);
-  Kst::DataSource::setupOnStartup(settingsObject);
+  Kst::DataSource::init();
 
   char field_list[40][120], filename[180];
   bool do_hex[40];
--- branches/work/kst/portto4/kst/src/d2d/d2d.cpp #940592:940593
@@ -42,8 +42,7 @@
 int main(int argc, char *argv[]) {
   atexit(exitHelper);
 
-  QSettings *settingsObject = new QSettings("kstdatarc", QSettings::IniFormat);
-  Kst::DataSource::setupOnStartup(settingsObject);
+  Kst::DataSource::init();
 
   char field_list[40][120], in_filename[180], out_filename[180], out_type[40];
   int n_field=0;
--- branches/work/kst/portto4/kst/tests/testdatasource.cpp #940592:940593
@@ -30,8 +30,7 @@
 static Kst::ObjectStore _store;
 
 void TestDataSource::initTestCase() {
-  QSettings *settingsObject = new QSettings("kstdatarc", QSettings::IniFormat);
-  Kst::DataSource::setupOnStartup(settingsObject);
+  Kst::DataSource::init();
   _plugins = Kst::DataSource::pluginList();
 }