[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 430062 by staikos:

remove the binary compatibility stuff from the data source since we don't
preserve it anymore.


 M  +3 -20     kstdatasource.cpp  
 M  +4 -10     kstdatasource.h  


--- trunk/extragear/graphics/kst/kst/kstdatasource.cpp #430061:430062
@@ -550,19 +550,11 @@
 }
 
 
-class KstDataSourcePrivate {
-  public:
-    KstDataSourcePrivate() { _reusable = true; }
-    ~KstDataSourcePrivate() {}
-    bool _reusable;
-};
-
-
 KstDataSource::KstDataSource(KConfig *cfg, const QString& filename, const QString& type)
 : KstObject(), _filename(filename), _cfg(cfg) {
   Q_UNUSED(type)
   _valid = false;
-  d = new KstDataSourcePrivate;
+  _reusable = true;
   _numFramesScalar = new KstScalar(filename + i18n("-frames"));
   // Don't set provider - this is always up-to-date
 }
@@ -573,8 +565,6 @@
   KST::scalarList.remove(_numFramesScalar);
   KST::scalarList.lock().writeUnlock();
   _numFramesScalar = 0L;
-  delete d;
-  d = 0L;
 }
 
 
@@ -667,13 +657,6 @@
 }
 
 
-void KstDataSource::virtual_hook(int id, void *data) {
-  Q_UNUSED(id)
-  Q_UNUSED(data)
-  //KstObject::virtual_hook(id, data);
-}
-
-
 void *KstDataSource::bufferMalloc(size_t size) {
   return KST::malloc(size);
 }
@@ -773,12 +756,12 @@
 
 
 bool KstDataSource::reusable() const {
-  return d->_reusable;
+  return _reusable;
 }
 
 
 void KstDataSource::disableReuse() {
-  d->_reusable = false;
+  _reusable = false;
 }
 
 
--- trunk/extragear/graphics/kst/kst/kstdatasource.h #430061:430062
@@ -163,13 +163,13 @@
     virtual int relativeTimeForSample(int sample, bool *ok = 0L);
 
   protected:
-    virtual void virtual_hook(int id, void *data);
-
     void updateNumFramesScalar();
 
     /** Is the object valid? */
     bool _valid;
 
+    bool _reusable;
+
     /** Place to store the list of fields.  Base implementation returns this. */
     QStringList _fieldList;
 
@@ -187,14 +187,8 @@
 
     KstScalarPtr _numFramesScalar;
 
-  private:
-    KstDataSourcePrivate *d;
-
-    // NOTE: In order to preserve binary compatibility with plugins, you must
-    //       not add, remove, or change member variables or virtual functions.
-    //       You must also not remove or change non-virtual functions.  You can
-    //       add new variables to the KstDataSourcePrivate pointer if you need
-    //       them.  You can simulate virtual functions with the virtual_hook().
+    // NOTE: You must bump the version key if you add new member variables
+    //       or change or add virtual functions.
 };