[Kst] kdeextragear-2/kst/kst/datasources/frame

[George Staikos]

CVS commit by staikos: 

implement reset() (untested)


  M +8 -5      frame.cpp   1.12
  M +2 -0      frame.h   1.9


--- kdeextragear-2/kst/kst/datasources/frame/frame.cpp  #1.11:1.12
@@ -34,7 +34,5 @@
 FrameSource::FrameSource(KConfig *cfg, const QString& filename, const QString& type)
 : KstDataSource(cfg, filename, type) {
-  if (init()) {
-    _valid = true;
-  }
+  _valid = init();
 }
 
@@ -44,4 +42,10 @@ FrameSource::~FrameSource() {
 
 
+bool FrameSource::reset() {
+  _fieldList.clear();
+  return _valid = init();
+}
+
+
 bool FrameSource::init() {
   int buf[4], err = 0;
@@ -55,6 +59,5 @@ bool FrameSource::init() {
 
   if (err != E_OK) {
-    // FIXME: BAD IDEA!!
-    kdFatal() << "Problem reading FFINFO in from Frame Type File" << endl;
+    return false;
   }
 

--- kdeextragear-2/kst/kst/datasources/frame/frame.h  #1.8:1.9
@@ -48,4 +48,6 @@ class FrameSource : public KstDataSource
     bool fieldListIsComplete() const;
 
+    bool reset();
+
   private:
     int _frameCount;