[Kst] branches/work/kst/kst1kde4/kst/src/libkstapp

[Zongyi Zhang]

SVN commit 1107051 by zhang:

continue kst1kde4

 M  +1 -1      kstchangefiledialog.h  
 M  +1 -1      kstchangenptsdialog.h  
 M  +1 -1      kstchoosecolordialog.h  
 M  +1 -1      kstcsddialog.h  
 M  +1 -1      kstcurvedifferentiate.cpp  
 M  +1 -1      kstcurvedifferentiate.h  
 M  +2 -2      kstdatamanager.cpp  
 M  +1 -1      kstdatawizard.cpp  
 M  +1 -1      kstdatawizard.h  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstchangefiledialog.h #1107050:1107051
@@ -25,7 +25,7 @@
   public:
     KstChangeFileDialog(QWidget* parent = 0,
                          const char* name = 0,
-                         bool modal = FALSE, Qt::WFlags fl = 0 );
+                         bool modal = FALSE, Qt::WindowFlags fl = 0 );
     virtual ~KstChangeFileDialog();
 
   public slots:
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstchangenptsdialog.h #1107050:1107051
@@ -26,7 +26,7 @@
 public:
     KstChangeNptsDialog(QWidget* parent = 0,
                          const char* name = 0,
-                         bool modal = FALSE, Qt::WFlags fl = 0 );
+                         bool modal = FALSE, Qt::WindowFlags fl = 0 );
     virtual ~KstChangeNptsDialog();
 
 public slots:
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstchoosecolordialog.h #1107050:1107051
@@ -28,7 +28,7 @@
 public:
   KstChooseColorDialog(QWidget* parent = 0,
                         const char* name = 0,
-                        bool modal = FALSE, WFlags fl = 0 );
+                        bool modal = FALSE, Qt::WindowFlags fl = 0 );
   virtual ~KstChooseColorDialog();
 
   void updateChooseColorDialog();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstcsddialog.h #1107050:1107051
@@ -29,7 +29,7 @@
 class KstCsdDialog : public KstDataDialog {
   Q_OBJECT
   public:
-    KstCsdDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+    KstCsdDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
     virtual ~KstCsdDialog();
     KST_EXPORT static KstCsdDialog *globalInstance();
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstcurvedifferentiate.cpp #1107050:1107051
@@ -24,7 +24,7 @@
 #include "kstnumbersequence.h"
 #include "kstviewwindow.h"
 
-KstCurveDifferentiate::KstCurveDifferentiate(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstCurveDifferentiate::KstCurveDifferentiate(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
 : QDialog(parent, fl) {
   Q_UNUSED(name)
   Q_UNUSED(modal)
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstcurvedifferentiate.h #1107050:1107051
@@ -31,7 +31,7 @@
   Q_OBJECT
   public:
     KST_EXPORT KstCurveDifferentiate(QWidget* parent = 0,
-                         const char* name = 0, bool modal = TRUE, Qt::WFlags fl = 0 );
+                         const char* name = 0, bool modal = TRUE, Qt::WindowFlags fl = 0 );
     virtual ~KstCurveDifferentiate();
 
     void setOptions();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdatamanager.cpp #1107050:1107051
@@ -704,8 +704,8 @@
   return _yesPixmap;
 }
 
-KstDataManager::KstDataManager(KstDoc *in_doc, QWidget* parent, const char* name, bool modal, WFlags fl)
-: KstDataManager(parent, name, modal, fl) {
+KstDataManager::KstDataManager(KstDoc *in_doc, QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
+: QDialog(parent, fl) {
   setupUi(this);
   doc = in_doc;
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdatawizard.cpp #1107050:1107051
@@ -57,7 +57,7 @@
 
 const QString& KstDataWizard::defaultTag = KGlobal::staticQString("<Auto Name>");
 
-KstDataWizard::KstDataWizard(QWidget* parent, const char* name, bool modal, WFlags fl) :
+KstDataWizard::KstDataWizard(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl) :
 DataWizard(parent, name, modal, fl )
 {
   _configWidget = 0L;
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdatawizard.h #1107050:1107051
@@ -30,7 +30,7 @@
   Q_OBJECT
 
   public:
-    KstDataWizard(QWidget* parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
+    KstDataWizard(QWidget* parent = 0, const char *name = 0, bool modal = false, Qt::WindowFlags fl = 0);
     virtual ~KstDataWizard();
 
   public: