[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 


fix all but one of the enable-final bugs.  The last one is nasty because it's
an evil hack to begin with and I haven't found a way around it yet


  M +3 -0      dataobjectdialog.h   1.8
  M +1 -0      datawizard.ui   1.66
  M +1 -1      datawizard.ui.h   1.100
  M +1 -1      kst.cpp   1.260
  M +1 -0      kst.h   1.115
  M +1 -0      kst2dplot.cpp   1.302
  M +1 -1      kstcurvedialog_i.cpp   1.71
  M +1 -0      kstcurvedialog_i.h   1.17
  M +1 -1      ksthsdialog_i.cpp   1.73
  M +1 -0      ksthsdialog_i.h   1.20
  M +2 -2      kstimagedialog_i.cpp   1.26
  M +2 -2      kstmatrixdialog_i.cpp   1.18
  M +1 -1      kstpsddialog_i.cpp   1.67
  M +1 -0      kstpsddialog_i.h   1.16


--- kdeextragear-2/kst/kst/dataobjectdialog.h  #1.7:1.8
@@ -110,2 +110,5 @@ void DIALOGTYPE::reject() {
   QDialog::reject();
 }
+
+#undef DIALOGTYPE
+#undef DTYPE

--- kdeextragear-2/kst/kst/datawizard.ui  #1.65:1.66
@@ -1213,4 +1213,5 @@
 </includes>
 <variables>
+    <variable access="private">static const QString&amp; defaultTag;</variable>
     <variable access="private">QString _file;</variable>
     <variable access="private">QGuardedPtr&lt;QWidget&gt; _configWidget;</variable>

--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.99:1.100
@@ -7,5 +7,5 @@
 ** place of a destructor.
 *****************************************************************************/
-static const QString& defaultTag = KGlobal::staticQString("<Auto Name>");
+const QString& DataWizard::defaultTag = KGlobal::staticQString("<Auto Name>");
 
 void DataWizard::init()

--- kdeextragear-2/kst/kst/kst.cpp  #1.259:1.260
@@ -83,5 +83,5 @@
 static KstApp *inst = 0L;
 
-static const QString& defaultTag = KGlobal::staticQString("<Auto Name>");
+const QString& KstApp::defaultTag = KGlobal::staticQString("<Auto Name>");
 
 void KstApp::doubleCheckCleanup() {

--- kdeextragear-2/kst/kst/kst.h  #1.114:1.115
@@ -333,4 +333,5 @@ class KstApp : public KMdiMainFrm {
 
   private:
+    static const QString& defaultTag;
 
     /** the configuration object of the application */

--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.301:1.302
@@ -6054,4 +6054,5 @@ QString Kst2DPlot::menuTitle() const {
 }
 
+#undef LABEL_PRECISION
 #include "kst2dplot.moc"
 // vim: ts=2 sw=2 et

--- kdeextragear-2/kst/kst/kstcurvedialog_i.cpp  #1.70:1.71
@@ -35,5 +35,5 @@
 #include "dataobjectdialog.h"
 
-static const QString& defaultTag = KGlobal::staticQString("<Auto Name>");
+const QString& KstCurveDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
 
 KstCurveDialogI *KstCurveDialogI::_inst = 0L;

--- kdeextragear-2/kst/kst/kstcurvedialog_i.h  #1.16:1.17
@@ -56,4 +56,5 @@ public slots:
   void reject();
 private:
+  static const QString& defaultTag;
   void _fillFieldsForEdit();
   void _fillFieldsForNew();

--- kdeextragear-2/kst/kst/ksthsdialog_i.cpp  #1.72:1.73
@@ -40,5 +40,5 @@
 #include "dataobjectdialog.h"
 
-static const QString& defaultTag = KGlobal::staticQString("<Auto Name>");
+const QString& KstHsDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
 
 KstHsDialogI *KstHsDialogI::_inst = 0L;

--- kdeextragear-2/kst/kst/ksthsdialog_i.h  #1.19:1.20
@@ -61,4 +61,5 @@ class KstHsDialogI : public KstHsDialog 
     void reject();
   private:
+    static const QString& defaultTag;
     void _fillFieldsForEdit();
     void _fillFieldsForNew();

--- kdeextragear-2/kst/kst/kstimagedialog_i.cpp  #1.25:1.26
@@ -40,9 +40,9 @@
 
 KstImageDialogI *KstImageDialogI::_inst = 0L;
-static KStaticDeleter<KstImageDialogI> _cuInst;
+static KStaticDeleter<KstImageDialogI> _iuInst;
 
 KstImageDialogI *KstImageDialogI::globalInstance() {
   if (!_inst) {
-    _inst = _cuInst.setObject(new KstImageDialogI);
+    _inst = _iuInst.setObject(new KstImageDialogI);
   }
 return _inst;

--- kdeextragear-2/kst/kst/kstmatrixdialog_i.cpp  #1.17:1.18
@@ -35,9 +35,9 @@
 
 KstMatrixDialogI *KstMatrixDialogI::_inst = 0L;
-static KStaticDeleter<KstMatrixDialogI> _cuInst;
+static KStaticDeleter<KstMatrixDialogI> _muInst;
 
 KstMatrixDialogI *KstMatrixDialogI::globalInstance() {
   if (!_inst) {
-    _inst = _cuInst.setObject(new KstMatrixDialogI);
+    _inst = _muInst.setObject(new KstMatrixDialogI);
   }
   return _inst;

--- kdeextragear-2/kst/kst/kstpsddialog_i.cpp  #1.66:1.67
@@ -39,5 +39,5 @@
 #include "dataobjectdialog.h"
 
-static const QString& defaultTag = KGlobal::staticQString("<Auto Name>");
+const QString& KstPsdDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
 
 KstPsdDialogI *KstPsdDialogI::_inst = 0L;

--- kdeextragear-2/kst/kst/kstpsddialog_i.h  #1.15:1.16
@@ -57,4 +57,5 @@ class KstPsdDialogI : public KstPsdDialo
     void reject();
   private:
+    static const QString& defaultTag;
     void _fillFieldsForEdit();
     void _fillFieldsForNew();