[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

more lingering traces of filters, and include fixes


  M +0 -1      datawizard.ui   1.50
  M +0 -3      kstdatacollection.cpp   1.14
  M +0 -3      kstdatacollection.h   1.19
  M +6 -5      kstdefaultnames.cpp   1.5
  M +0 -4      kstdoc.cpp   1.112
  M +6 -5      kstiface_impl.cpp   1.44
  M +1 -0      kstviewfitsdialog_i.cpp   1.15


--- kdeextragear-2/kst/kst/datawizard.ui  #1.49:1.50
@@ -1131,5 +1131,4 @@
 <variables>
     <variable access="private">KstDataSourcePtr _ds;</variable>
-    <variable access="private">KstFilterSetPtr _filter;</variable>
 </variables>
 <slots>

--- kdeextragear-2/kst/kst/kstdatacollection.cpp  #1.13:1.14
@@ -38,7 +38,4 @@ KstScalarList KST::scalarList;
 KstDataObjectList KST::dataObjectList;
 
-/** The list of filter sets defined */
-KstFilterSetList KST::filterSetList;
-
 void KST::addVectorToList(KstVectorPtr v) {
   KST::vectorList.lock().writeLock();

--- kdeextragear-2/kst/kst/kstdatacollection.h  #1.18:1.19
@@ -39,7 +39,4 @@ namespace KST {
   extern KstDataObjectList dataObjectList;
 
-  /** The list of filter sets that are defined */
-  extern KstFilterSetList filterSetList;
-
   /** check that a tag has not been used by any other tags */
   extern bool tagNameNotUnique(const QString& tag, bool warn = true, void *parent = 0L);

--- kdeextragear-2/kst/kst/kstdefaultnames.cpp  #1.4:1.5
@@ -16,11 +16,12 @@
  ***************************************************************************/
 
-#include <qregexp.h>
-#include "kstvcurve.h"
-#include "kstpsdcurve.h"
-#include "ksthistogram.h"
-#include "kstdefaultnames.h"
 #include "kstdatacollection.h"
+#include "kstdefaultnames.h"
+#include "ksthistogram.h"
+#include "kstplugin.h"
+#include "kstpsdcurve.h"
+#include "kstvcurve.h"
 
+#include <qregexp.h>
 
 QString KST::suggestPlotName() {

--- kdeextragear-2/kst/kst/kstdoc.cpp  #1.111:1.112
@@ -508,8 +508,4 @@ void KstDoc::deleteContents() {
   KST::vectorDefaults.sync();
 
-  KST::filterSetList.lock().writeLock();
-  KST::filterSetList.clear();
-  KST::filterSetList.lock().writeUnlock();
-
   KstApp *app = KstApp::inst();
   if (app) { // Can be null on application exit

--- kdeextragear-2/kst/kst/kstiface_impl.cpp  #1.43:1.44
@@ -31,5 +31,4 @@
 #include "kst2dplot.h"
 #include "kstarray.h"
-#include "kstimage.h"
 #include "kstcolorsequence.h"
 #include "kstdatacollection.h"
@@ -37,5 +36,10 @@
 #include "kstdoc.h"
 #include "kstequationcurve.h"
+#include "ksteventmonitorentry.h"
+#include "ksthistogram.h"
 #include "kstiface_impl.h"
+#include "kstimage.h"
+#include "kstplugin.h"
+#include "kstpsdcurve.h"
 #include "kstscalar.h"
 #include "kstvcurve.h"
@@ -43,7 +47,4 @@
 #include "kstviewwindow.h"
 #include "plugincollection.h"
-#include "ksthistogram.h"
-#include "kstpsdcurve.h"
-#include "ksteventmonitorentry.h"
 
 KstIfaceImpl::KstIfaceImpl(KstDoc *doc, KstApp *app)
@@ -1289,5 +1290,5 @@ QStringList KstIfaceImpl::createPlugin(c
   QStringList::ConstIterator vectorParamIter;
 
-  KstPluginPtr kstplug_ptr = new KstPlugin();
+  KstPluginPtr kstplug_ptr = new KstPlugin;
 
   //iterate through inputs

--- kdeextragear-2/kst/kst/kstviewfitsdialog_i.cpp  #1.14:1.15
@@ -32,4 +32,5 @@
 #include "vectorselector.h"
 #include "kstfittable.h"
+#include "kstplugin.h"
 #include "kstrvector.h"
 #include "kstscalar.h"