[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

I think this fixes the rest of enable-final


  M +1 -4      kstbasecurve.cpp   1.21
  M +9 -0      kstdatacollection-gui.cpp   1.12
  M +7 -0      kstdatacollection-nogui.cpp   1.6
  M +3 -0      kstdatacollection.h   1.23


--- kdeextragear-2/kst/kst/kstbasecurve.cpp  #1.20:1.21
@@ -172,8 +172,5 @@ double KstBaseCurve::minX() const {
 bool KstBaseCurve::deleteDependents() {
   bool rc = KstDataObject::deleteDependents();
-  Kst2DPlotList pl = Kst2DPlot::globalPlotList();
-  for (Kst2DPlotList::Iterator i = pl.begin(); i != pl.end(); ++i) {
-    (*i)->Curves.remove(this);
-  }
+  KST::removeCurveFromPlots(this);
   return rc;
 }

--- kdeextragear-2/kst/kst/kstdatacollection-gui.cpp  #1.11:1.12
@@ -112,3 +112,12 @@ int KST::vectorToFile(KstVectorPtr v, QF
 }
 
+
+void KST::removeCurveFromPlots(KstBaseCurve *c) {
+  Kst2DPlotList pl = Kst2DPlot::globalPlotList();
+  for (Kst2DPlotList::Iterator i = pl.begin(); i != pl.end(); ++i) {
+    (*i)->Curves.remove(c);
+  }
+}
+
+
 // vim: ts=2 sw=2 et

--- kdeextragear-2/kst/kst/kstdatacollection-nogui.cpp  #1.5:1.6
@@ -59,3 +59,10 @@ bool KST::vectorTagNameNotUnique(const Q
 }
 
+
+void KST::removeCurveFromPlots(KstBaseCurve *c) {
+  Q_UNUSED(c)
+  // meaningless in no GUI: no plots!
+}
+
+
 // vim: ts=2 sw=2 et

--- kdeextragear-2/kst/kst/kstdatacollection.h  #1.22:1.23
@@ -24,4 +24,5 @@
 
 class QFile;
+class KstBaseCurve;
 
 namespace KST {
@@ -47,4 +48,6 @@ namespace KST {
   extern bool vectorTagNameNotUniqueInternal(const QString& tag);
 
+  extern void removeCurveFromPlots(KstBaseCurve *c); // no sharedptr here
+
   /** Save a vector to a file */
   extern int vectorToFile(KstVectorPtr v, QFile *f, void *parent = 0L);