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

[Barth Netterfield]

SVN commit 737323 by netterfield:

Move stuff to dialogdefaults.cpp.



 A             libkst/dialogdefaults.cpp   [License: GPL (v2+)]
 M  +2 -0      libkst/libkst.pro  
 M  +1 -3      libkstapp/application.cpp  
 M  +0 -23     libkstapp/vectordialog.cpp  


--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #737322:737323
@@ -26,6 +26,7 @@
     datavector.cpp \
     dateparser.cpp \
     debug.cpp \
+    dialogdefaults.cpp\
     editablematrix.cpp \
     editablevector.cpp \
     extension.cpp \
@@ -71,6 +72,7 @@
     datavector.h \
     dateparser.h \
     debug.h \
+    dialogdefaults.h\
     editablematrix.h \
     editablevector.h \
     events.h \
--- branches/work/kst/portto4/kst/src/libkstapp/application.cpp #737322:737323
@@ -26,8 +26,6 @@
 
 namespace Kst {
 
-  QSettings *dialogDefaults;
-  
 Application::Application(int &argc, char **argv)
     : QApplication(argc, argv) {
 
@@ -46,7 +44,7 @@
   DataSource::setupOnStartup(settingsObject);
 
   // Initialize the dialogDefaults settings
-  dialogDefaults = new QSettings("kstdialogrc", QSettings::NativeFormat);
+  //dialogDefaults = new QSettings("kstdialogrc", QSettings::NativeFormat);
 
   _mainWindow = new MainWindow;
 
--- branches/work/kst/portto4/kst/src/libkstapp/vectordialog.cpp #737322:737323
@@ -416,28 +416,5 @@
 }
 
 }
-//---------------------------------------------------------------------------
-// what follows belongs in dialogdefaults.cpp, but cbn hasn't figured out how
-// to add a file to the list of things to get built and linked...
-void Kst::setDataVectorDefaults(DataVectorPtr V) {
-  //FIXME Do we need a V->readLock() here?
-  Kst::dialogDefaults->setValue("vector/datasource", V->filename());
-  Kst::dialogDefaults->setValue("vector/range", V->reqNumFrames());
-  Kst::dialogDefaults->setValue("vector/start", V->reqStartFrame());
-  Kst::dialogDefaults->setValue("vector/countFromEnd", V->countFromEOF());
-  Kst::dialogDefaults->setValue("vector/readToEnd", V->readToEOF());
-  Kst::dialogDefaults->setValue("vector/skip", V->skip());
-  Kst::dialogDefaults->setValue("vector/doSkip", V->doSkip());
-  Kst::dialogDefaults->setValue("vector/doAve", V->doAve());
-}
 
-//FIXME: move to dialogdefaults.cpp... (How do you add a file to the build system??)
-void Kst::setGenVectorDefaults(GeneratedVectorPtr V) {
-  //FIXME Do we need a V->readLock() here?
-  Kst::dialogDefaults->setValue("genVector/min", V->min());
-  Kst::dialogDefaults->setValue("genVector/max", V->max()); 
-  Kst::dialogDefaults->setValue("genVector/length", V->length());
-}
-//---------------------------------------------------------------------------
-
 // vim: ts=2 sw=2 et