[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

refactoring to make d2asc build cleanly (it works most places, but not all)
basic principle is that UI code can't intermix with math/data code.


  A            kstuinames.cpp   1.1 [GPL (v2+)]
  A            kstuinames.h   1.1 [GPL (v2+)]
  M +1 -0      Makefile.am   1.166
  M +1 -0      datawizard.ui   1.67
  M +2 -1      kst.cpp   1.261
  M +1 -0      kstcurvedialog_i.cpp   1.72
  M +0 -10     kstdefaultnames.cpp   1.9
  M +0 -2      kstdefaultnames.h   1.6
  M +2 -0      ksteqdialog_i.cpp   1.71
  M +3 -2      ksthsdialog_i.cpp   1.74
  M +1 -0      kstimagedialog_i.cpp   1.27
  M +1 -0      kstpsddialog_i.cpp   1.68


--- kdeextragear-2/kst/kst/Makefile.am  #1.165:1.166
@@ -77,4 +77,5 @@
 libkstguiapp_la_SOURCES = kstdatacollection-gui.cpp \
         dialoglauncher-gui.cpp \
+        kstuinames.cpp \
         vectordialog.ui \
         stringeditor.ui \

--- kdeextragear-2/kst/kst/datawizard.ui  #1.66:1.67
@@ -1190,4 +1190,5 @@
     <include location="local" impldecl="in implementation">kstcolorsequence.h</include>
     <include location="local" impldecl="in implementation">kstvcurve.h</include>
+    <include location="local" impldecl="in implementation">kstuinames.h</include>
     <include location="local" impldecl="in implementation">kstpsd.h</include>
     <include location="local" impldecl="in implementation">kstrvector.h</include>

--- kdeextragear-2/kst/kst/kst.cpp  #1.260:1.261
@@ -61,5 +61,7 @@
 #include "kstprintoptionspage.h"
 #include "kstpsddialog_i.h"
+#include "kstquickstartdialog_i.h"
 #include "kstsettingsdlg.h"
+#include "kstuinames.h"
 #include "kstvectordefaults.h"
 #include "kstvectordialog_i.h"
@@ -68,5 +70,4 @@
 #include "kstviewfitsdialog_i.h"
 #include "kstviewwindow.h"
-#include "kstquickstartdialog_i.h"
 #include "pluginmanager.h"
 #include "psversion.h"

--- kdeextragear-2/kst/kst/kstcurvedialog_i.cpp  #1.71:1.72
@@ -29,4 +29,5 @@
 #include "kstcurvedialog_i.h"
 #include "kstviewwindow.h"
+#include "kstuinames.h"
 #include "vectorselector.h"
 

--- kdeextragear-2/kst/kst/kstdefaultnames.cpp  #1.8:1.9
@@ -16,5 +16,4 @@
  ***************************************************************************/
 
-#include "kst.h"
 #include "kstdatacollection.h"
 #include "kstdefaultnames.h"
@@ -31,13 +30,4 @@ QString KST::suggestPlotName() {
 }
 
-QString KST::suggestWinName() {
-  static int last = 0;
-  QString suggestedName = "W" + QString::number(++last);
-  while (KstApp::inst()->findWindow(suggestedName)) {
-    suggestedName = "W" + QString::number(++last);
-  }
-  return suggestedName;
-}
-
 /* takes a vector or plugin name of the form V2-GYRO1 and returns a unique */
 /* curve name of the form C1-GYRO1 */

--- kdeextragear-2/kst/kst/kstdefaultnames.h  #1.5:1.6
@@ -24,6 +24,4 @@ namespace KST {
   extern QString suggestPlotName();
 
-  extern QString suggestWinName();
-
   extern QString suggestCurveName(const QString& vector_name);
   extern QString suggestPSDName(const QString& vector_name);

--- kdeextragear-2/kst/kst/ksteqdialog_i.cpp  #1.70:1.71
@@ -31,5 +31,7 @@
 #include "curveplacementwidget.h"
 #include "eparse-eh.h"
+#include "kstdefaultnames.h"
 #include "ksteqdialog_i.h"
+#include "kstuinames.h"
 #include "kstvcurve.h"
 #include "kstviewwindow.h"

--- kdeextragear-2/kst/kst/ksthsdialog_i.cpp  #1.73:1.74
@@ -31,8 +31,9 @@
 #include "curveappearancewidget.h"
 #include "curveplacementwidget.h"
+#include "kstsettings.h"
+#include "kstuinames.h"
+#include "kstvcurve.h"
 #include "kstviewwindow.h"
 #include "vectorselector.h"
-#include "kstvcurve.h"
-#include "kstsettings.h"
 
 #define DIALOGTYPE KstHsDialogI

--- kdeextragear-2/kst/kst/kstimagedialog_i.cpp  #1.26:1.27
@@ -32,4 +32,5 @@
 #include "curveplacementwidget.h"
 #include "kstimagedialog_i.h"
+#include "kstuinames.h"
 #include "kstviewwindow.h"
 #include "matrixselector.h"

--- kdeextragear-2/kst/kst/kstpsddialog_i.cpp  #1.67:1.68
@@ -31,4 +31,5 @@
 #include "curveplacementwidget.h"
 #include "kstpsddialog_i.h"
+#include "kstuinames.h"
 #include "kstvcurve.h"
 #include "kstviewwindow.h"