[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

remove dead code, eliminate a fixme


  M +10 -26    datawizard.ui.h   1.69


--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.68:1.69
@@ -90,6 +90,6 @@ void DataWizard::sourceChanged( const QS
     if (!txt.isEmpty()) {
         QString file = txt;
-        if (file.find( "file:" ) == 0 ) {
-            file.remove(0, strlen("file:"));
+        if (file.startsWith("file:")) {
+            file.remove(0, 5);
         }
         KstDataSourcePtr ds = *KST::dataSourceList.findFileName(file);
@@ -151,24 +151,7 @@ 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());
-        }
-
-        QListBoxItem *i = _filterList->findItem(save);
-        if (i) {
-            _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());
-        } else {
-            _filter = 0L;
-        }
-#endif
 
         // count the vectors we are about to make, so we can guess defaults
@@ -353,5 +336,4 @@ void DataWizard::finished()
     KProgressDialog *dlg = new KProgressDialog(this, "Progress Dialog");
     KstVectorList l;
-    KstVectorPtr xv;
     QString name = QString("V%1-%2").arg(KST::vectorList.count()).arg(_xVector->currentText());
     int ptype = 0;
@@ -379,5 +361,5 @@ void DataWizard::finished()
     // It's been reported that BlueCurve has a style bug that causes a crash
     // here if Skip is disabled and we query value().
-    xv = new KstRVector(_ds, _xVector->currentText(),
+    KstVectorPtr xv = new KstRVector(_ds, _xVector->currentText(),
             name, _kstDataRange->CountFromEnd->isChecked() ? -1 : _kstDataRange->F0->value(),
             _kstDataRange->ReadToEnd->isChecked() ? -1 : _kstDataRange->N->value(),
@@ -603,5 +585,5 @@ void DataWizard::finished()
 
     if (relayout) {
-        // FIXMEPLOTLIST KST::plotList.arrangePlots(QMAX(KST::plotList.getPlotCols(), unsigned(sqrt(plots.count()))));
+        w->view()->cleanup(QMAX(w->view()->columns(), unsigned(sqrt(plots.count()))));
     }
     w->view()->paint(P_DATA);
@@ -667,2 +649,4 @@ void DataWizard::_enableWindowEntries()
     _windowGroup->setEnabled(true);
 }
+
+// vim: ts=8 sw=4 noet