[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

remove more traces of filters


  M +1 -0      devel-docs/RELEASE_PLAN   1.4
  M +1 -4      kst/Makefile.am   1.123
  M +6 -2      kst/kst.cpp   1.188
  M +3 -3      kst/kst.h   1.86
  M +1 -1      kst/kstdatamanager_i.cpp   1.61


--- kdeextragear-2/kst/devel-docs/RELEASE_PLAN  #1.3:1.4
@@ -11,4 +11,5 @@
 - usage counts are all wrong
 - very wide windows apparently cause huge cpu usage (tall doesn't?)
+- invalid memory accesses on closing the data wizard - Qt bug?
 
 

--- kdeextragear-2/kst/kst/Makefile.am  #1.122:1.123
@@ -39,5 +39,4 @@
         kstiface.skel \
         kstiface_impl.cpp \
-        variableeditor.cpp \
         kstdataobject.cpp \
         kstscalartable.cpp \
@@ -114,6 +113,4 @@
         debugdialog.ui \
         datawizard.ui \
-        variablelisteditor.ui \
-        filterlisteditor.ui \
         scalarselector.ui \
         vectorselector.ui \
@@ -194,5 +191,5 @@
 scalarselector.o: scalarselector.ui.h scalarselector.ui
 vectorsavedialog.o: vectorsavedialog.ui.h vectorsavedialog.ui
-filterlisteditor.o: filterlisteditor.ui.h filterlisteditor.ui
+#filterlisteditor.o: filterlisteditor.ui.h filterlisteditor.ui
 kstsettingsdlg.o: kstsettingsdlg.ui.h kstsettingsdlg.ui
 datawizard.o: datawizard.ui.h datawizard.ui

--- kdeextragear-2/kst/kst/kst.cpp  #1.187:1.188
@@ -114,5 +114,5 @@ KstApp::KstApp(QWidget *parent, const ch
   _plotDialog = new KstPlotDialogI(doc, this);
   dataManager = new KstDataManagerI(doc, this);
-  filterListEditor = new FilterListEditor(this);
+//  filterListEditor = new FilterListEditor(this);
   viewScalarsDialog = new KstViewScalarsDialogI(this);
   viewVectorsDialog = new KstViewVectorsDialogI(this);
@@ -151,6 +151,8 @@ KstApp::KstApp(QWidget *parent, const ch
   connect(_plotDialog, SIGNAL(docChanged()), this, SLOT(registerDocChange()));
 
+#if 0
   connect(filterListEditor, SIGNAL(docChanged()),
           this,             SLOT(registerDocChange()));
+#endif
 
   /*** ***/
@@ -1198,7 +1200,9 @@ void KstApp::showGraphFileDialog() {
 }
 
+#if 0
 void KstApp::showFilterListEditor() {
   filterListEditor->show();
 }
+#endif
 
 void KstApp::showDebugDialog() {
@@ -1247,5 +1251,5 @@ void KstApp::updateDialogs() {
     changeFileDialog->updateChangeFileDialog();
     changeNptsDialog->updateChangeNptsDialog();
-    filterListEditor->update();
+    //filterListEditor->update();
     updateDataDialogs(false);
     vectorSaveDialog->init();

--- kdeextragear-2/kst/kst/kst.h  #1.85:1.86
@@ -40,5 +40,5 @@
 
 // forward declaration of the Kst classes
-class FilterListEditor;
+//class FilterListEditor;
 class KstChangeFileDialogI;
 class KstChangeNptsDialogI;
@@ -266,5 +266,5 @@ class KstApp : public KMdiMainFrm {
 
     /** just calls filterListEditor->show() */
-    void showFilterListEditor();
+//    void showFilterListEditor();
 
     /** just calls debugDialog->show() */
@@ -314,5 +314,5 @@ class KstApp : public KMdiMainFrm {
     KstDoc *doc;
 
-    FilterListEditor *filterListEditor;
+    //FilterListEditor *filterListEditor;
 
     /* Dialog for viewing the scalar values */

--- kdeextragear-2/kst/kst/kstdatamanager_i.cpp  #1.60:1.61
@@ -420,5 +420,5 @@ void KstDataManagerI::update() {
 
 void KstDataManagerI::filter_I() {
-  static_cast<KstApp*>(doc->parent())->showFilterListEditor();
+//  static_cast<KstApp*>(doc->parent())->showFilterListEditor();
 }