[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

cleanup dead code, fix rather random indenting, eliminate a QMessageBox in
favour of KMessageBox


  M +0 -1      kstdatamanager_i.cpp   1.71
  M +0 -6      kstdatamanager_i.h   1.19
  M +1 -3      kstdoc.cpp   1.109
  M +1 -1      scalarselector.ui   1.7
  M +9 -17     scalarselector.ui.h   1.7
  R            kstfilteredvector.cpp   1.9
  R            kstfilteredvector.h   1.4


--- kdeextragear-2/kst/kst/kstdatamanager_i.cpp  #1.70:1.71
@@ -47,5 +47,4 @@
 #include "ksteqdialog_i.h"
 #include "ksteventmonitor_i.h"
-//#include "kstfilteredvector.h"
 #include "ksthsdialog_i.h"
 #include "kstimage.h"

--- kdeextragear-2/kst/kst/kstdatamanager_i.h  #1.18:1.19
@@ -21,9 +21,4 @@
 class KstDoc;
 
-#include "kst.h"
-#include "kstdatacollection.h"
-#include "kstdataobject.h"
-#include "kstfilteredvector.h"
-#include "kstrvector.h"
 #include "datamanager.h"
 #include <qlistview.h>
@@ -59,5 +54,4 @@ class KstObjectItem : public QObject, pu
   Q_OBJECT
   public:
-    KstObjectItem(QListView *parent, KstFilteredVectorPtr x, KstDataManagerI *dm);
     KstObjectItem(QListView *parent, KstRVectorPtr x, KstDataManagerI *dm);
     KstObjectItem(QListViewItem *parent, KstVectorPtr x, KstDataManagerI *dm);

--- kdeextragear-2/kst/kst/kstdoc.cpp  #1.108:1.109
@@ -40,5 +40,4 @@
 #include <qtextstream.h>
 #include <qwidget.h>
-#include <qmessagebox.h>
 
 // include files for KDE
@@ -48,9 +47,9 @@
 #include <kfiledialog.h>
 #include <klocale.h>
+#include <kmdimainfrm.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
 #include <ksavefile.h>
 #include <kurl.h>
-#include <kmdimainfrm.h>
 
 // application specific includes
@@ -62,5 +61,4 @@
 #include "kstdoc.h"
 #include "kstequationcurve.h"
-//#include "kstfilteredvector.h"
 #include "ksthistogram.h"
 #include "kstimage.h"

--- kdeextragear-2/kst/kst/scalarselector.ui  #1.6:1.7
@@ -76,5 +76,5 @@
     <include location="global" impldecl="in implementation">qlineedit.h</include>
     <include location="global" impldecl="in implementation">qvalidator.h</include>
-    <include location="global" impldecl="in implementation">qmessagebox.h</include>
+    <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="global" impldecl="in implementation">qlistbox.h</include>
     <include location="global" impldecl="in implementation">qtimer.h</include>

--- kdeextragear-2/kst/kst/scalarselector.ui.h  #1.6:1.7
@@ -29,5 +29,5 @@ void ScalarSelector::update()
               _scalar->insertItem((*i)->tagName());
       }
-            if (!found && (*i)->tagName() == prev) {
+        if ((*i)->tagName() == prev) {
               found = true;
             }
@@ -55,5 +55,5 @@ void ScalarSelector::createNewScalar()
             setSelection(s);
         } else {
-            QMessageBox::warning(0L, tr("Kst"), tr("Error saving your new scalar."));
+            KMessageBox::sorry(0L, tr("Kst"), tr("Error saving your new scalar."));
         }
     }
@@ -97,12 +97,4 @@ QString ScalarSelector::selectedScalar()
 void ScalarSelector::allowDirectEntry( bool allowed )
 {
-  if (allowed) {
-    if( !_scalar->editable()) {
-      _scalar->setEditable( TRUE );
-    }
-  } else {
-    if( _scalar->editable()) {
-      _scalar->setEditable( FALSE );
-    }
-  }
+    _scalar->setEditable(allowed);
 }