[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

compile fixes (removed references to filterlists), fixed cdf makefile


  M +4 -0      datawizard.ui.h   1.68
  M +2 -0      kstdatamanager_i.cpp   1.67
  M +0 -2      kstiface.h   1.22
  M +0 -31     kstiface_impl.cpp   1.42
  M +0 -2      kstiface_impl.h   1.22
  M +2 -2      datasources/cdf/Makefile.am   1.2


--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.67:1.68
@@ -151,4 +151,5 @@ void DataWizard::showPage( QWidget *page
         QString save = _filterList->currentText();
         _filterList->clear();
+#if 0
         for (KstFilterSetList::Iterator it = KST::filterSetList.begin(); it != KST::filterSetList.end(); ++it) {
             _filterList->insertItem((*it)->name());
@@ -159,7 +160,9 @@ void DataWizard::showPage( QWidget *page
             _filterList->setSelected(i, true);
         }
+#endif
     } else if (page == _pagePlot) {
         KST::vectorDefaults.setWizardXVector(_xVector->currentText());
         KST::vectorDefaults.sync();
+#if 0
         if (!_filterList->currentText().isEmpty() && (!_filter || _filter->name() != _filterList->currentText())) {
             _filter = KST::filterSetList.find(_filterList->currentText());
@@ -167,4 +170,5 @@ void DataWizard::showPage( QWidget *page
             _filter = 0L;
         }
+#endif
 
         // count the vectors we are about to make, so we can guess defaults

--- kdeextragear-2/kst/kst/kstdatamanager_i.cpp  #1.66:1.67
@@ -503,4 +503,5 @@ void KstDataManagerI::contextMenu(QListV
     id = 500;
     FilterMap.clear();
+#if 0 
     KST::filterSetList.lock().readLock();
     for (KstFilterSetList::Iterator f = KST::filterSetList.begin(); f != KST::filterSetList.end(); ++f) {
@@ -510,4 +511,5 @@ void KstDataManagerI::contextMenu(QListV
     }
     KST::filterSetList.lock().readUnlock();
+#endif
     id = m->insertItem(i18n("Apply &Filter"), fMenu);
     m->setItemEnabled(id, !FilterMap.isEmpty());

--- kdeextragear-2/kst/kst/kstiface.h  #1.21:1.22
@@ -41,6 +41,4 @@ k_dcop:
   virtual QStringList pluginList() = 0;
   virtual QStringList filterList() = 0;
-  virtual QStringList filterSetList() = 0;
-  virtual QStringList filterSetContents(const QString& filter) = 0;
 
 

--- kdeextragear-2/kst/kst/kstiface_impl.cpp  #1.41:1.42
@@ -175,35 +175,4 @@ QStringList KstIfaceImpl::filterList() {
 
 
-QStringList KstIfaceImpl::filterSetList() {
-  QStringList rc;
-  KstReadLocker ml(&KST::filterSetList.lock());
-
-  for (KstFilterSetList::Iterator it = KST::filterSetList.begin(); it != KST::filterSetList.end(); ++it) {
-    (*it)->lock().readLock();
-    rc += (*it)->name();
-    (*it)->lock().readUnlock();
-  }
-
-  return rc;
-}
-
-
-QStringList KstIfaceImpl::filterSetContents(const QString& filter) {
-  QStringList rc;
-  KstReadLocker ml(&KST::filterSetList.lock());
-
-  KstFilterSetPtr fs = KST::filterSetList.find(filter);
-  if (fs) {
-    for (KstFilterSet::Iterator it = fs->begin(); it != fs->end(); ++it) {
-      (*it)->readLock();
-      rc += (*it)->tagName();
-      (*it)->readUnlock();
-    }
-  }
-
-  return rc;
-}
-
-
 bool KstIfaceImpl::plotEquation(double start, double end, int numSamples, const QString& equation, const QString& plotName, const QColor& color) {
   Kst2DPlotPtr plot;

--- kdeextragear-2/kst/kst/kstiface_impl.h  #1.21:1.22
@@ -42,6 +42,4 @@ public:
   virtual QStringList pluginList();
   virtual QStringList filterList();
-  virtual QStringList filterSetList();
-  virtual QStringList filterSetContents(const QString& filter);
 
         virtual bool plotEquation(const QString& xvector, const QString& equation, const QString& plotName, const QColor& color);

--- kdeextragear-2/kst/kst/datasources/cdf/Makefile.am  #1.1:1.2
@@ -1,7 +1,7 @@
-INCLUDES=-I$(srcdir)/../.. -I/opt/cdf/src/include $(all_includes)
+INCLUDES=-I$(srcdir)/../.. $(all_includes)
 
 kde_module_LTLIBRARIES=kstdata_cdf.la
 
-kstdata_cdf_la_LIBADD=-L/opt/cdf/src/lib -lcdf
+kstdata_cdf_la_LIBADD=$(CDFLIBS)
 kstdata_cdf_la_LDFLAGS=$(all_libraries) -module -avoid-version
 kstdata_cdf_la_SOURCES=cdf.cpp