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

[Zongyi Zhang]

SVN commit 1107053 by zhang:

continue kst1kde4

 M  +1 -1      ksteventmonitor.cpp  
 M  +1 -1      ksteventmonitor.h  
 M  +1 -1      kstimagedialog.h  
 M  +1 -1      kstmonochromedialog.cpp  
 M  +1 -1      kstmonochromedialog.h  
 M  +1 -1      kstpluginmanager.cpp  
 M  +2 -2      ksttoplevelview.cpp  
 M  +2 -2      ksttoplevelview.h  
 M  +1 -1      kstvectorsavedialog.h  
 M  +1 -1      kstviewfitsdialog.cpp  
 M  +1 -1      kstviewfitsdialog.h  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksteventmonitor.cpp #1107052:1107053
@@ -49,7 +49,7 @@
 }
 
 
-KstEventMonitor::KstEventMonitor(QWidget* parent, const char* name, bool modal, WFlags fl)
+KstEventMonitor::KstEventMonitor(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
 : KstDataDialog(parent, name, modal, fl) {
   setupUi(this);
   _w = new EventMonitorWidget(_contents);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksteventmonitor.h #1107052:1107053
@@ -26,7 +26,7 @@
 class KstEventMonitor : public QDialog, public Ui::KstDataDialog {
   Q_OBJECT
   public:
-    KstEventMonitor(QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+    KstEventMonitor(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
     virtual ~KstEventMonitor();
     static KstEventMonitor *globalInstance();
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstimagedialog.h #1107052:1107053
@@ -27,7 +27,7 @@
 class KST_EXPORT KstImageDialog : public KstDataDialog {
   Q_OBJECT
   public:
-    KstImageDialog(QWidget *parent = 0, const char *name = 0, bool modal = false, Qt::WFlags fl = 0 );
+    KstImageDialog(QWidget *parent = 0, const char *name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
     virtual ~KstImageDialog();
     static KstImageDialog *globalInstance();
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmonochromedialog.cpp #1107052:1107053
@@ -31,7 +31,7 @@
 KstMonochromeDialog::KstMonochromeDialog(QWidget* parent,
                                            const char* name,
                                            bool modal,
-                                           WFlags fl)
+                                           Qt::WindowFlags fl)
 : QDialog(parent, name, modal, fl) {
   setupUi(this);
   availableListBox->clear();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmonochromedialog.h #1107052:1107053
@@ -25,7 +25,7 @@
   public:
     KstMonochromeDialog(QWidget* parent = 0,
                          const char* name = 0,
-                         bool modal = TRUE, WFlags fl = 0 );
+                         bool modal = TRUE, Qt::WindowFlags fl = 0 );
     virtual ~KstMonochromeDialog();
 
     void setOptions(const QMap<QString,QString>& opts);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstpluginmanager.cpp #1107052:1107053
@@ -43,7 +43,7 @@
 #define COLUMN_LOADED         1
 #define COLUMN_NAME           5
 
-KstPluginManager::KstPluginManager(QWidget* parent, const char* name, bool modal, WFlags fl)
+KstPluginManager::KstPluginManager(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
 : PluginManager(parent, name, modal, fl) {
   setupUi(this);
   connect(_close, SIGNAL(clicked()), this, SLOT(close()));
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksttoplevelview.cpp #1107052:1107053
@@ -52,7 +52,7 @@
 
 #define STICKY_THRESHOLD 10
 
-KstTopLevelView::KstTopLevelView(QWidget *parent, const char *name, WFlags w)
+KstTopLevelView::KstTopLevelView(QWidget *parent, const char *name, Qt::WindowFlags w)
 : KstViewObject("TopLevelView"), _w(new KstViewWidget(this, parent, name, w)) {
   _onGrid = true;
   setTagName(KstObjectTag(name, KstObjectTag::globalTagContext));  // FIXME: tag context
@@ -60,7 +60,7 @@
 }
 
 
-KstTopLevelView::KstTopLevelView(const QDomElement& e, QWidget *parent, const char *name, WFlags w)
+KstTopLevelView::KstTopLevelView(const QDomElement& e, QWidget *parent, const char *name, Qt::WindowFlags w)
 : KstViewObject(e), _w(new KstViewWidget(this, parent, name, w)) {
   commonConstructor();
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksttoplevelview.h #1107052:1107053
@@ -38,8 +38,8 @@
   Q_PROPERTY(double marginBottom READ marginBottom WRITE setMarginBottom)
 
   public:
-    KstTopLevelView(QWidget *parent = 0L, const char *name = 0L, Qt::WFlags w = 0);
-    KstTopLevelView(const QDomElement& e, QWidget *parent = 0L, const char *name = 0L, Qt::WFlags w = 0);
+    KstTopLevelView(QWidget *parent = 0L, const char *name = 0L, Qt::WindowFlags w = 0);
+    KstTopLevelView(const QDomElement& e, QWidget *parent = 0L, const char *name = 0L, Qt::WindowFlags w = 0);
     KstTopLevelView(const KstTopLevelView& tlv);
     virtual ~KstTopLevelView();
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectorsavedialog.h #1107052:1107053
@@ -25,7 +25,7 @@
   public:
     KstVectorSaveDialog(QWidget* parent = 0,
                         const char* name = 0,
-                        bool modal = false, Qt::WFlags fl = 0 );
+                        bool modal = false, Qt::WindowFlags fl = 0 );
     virtual ~KstVectorSaveDialog();
 
   public slots:
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewfitsdialog.cpp #1107052:1107053
@@ -33,7 +33,7 @@
 KstViewFitsDialog::KstViewFitsDialog(QWidget* parent,
                                              const char* name,
                                              bool modal,
-                                             WFlags fl) 
+                                             Qt::WindowFlags fl) 
 : QDialog(parent, name, modal, fl) {
   setupUi(this);
   tableFits = new KstFitTable(this, "tableFits");
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewfitsdialog.h #1107052:1107053
@@ -26,7 +26,7 @@
   public:
     KstViewFitsDialog(QWidget* parent = 0,
                         const char* name = 0,
-                        bool modal = false, WFlags fl = 0 );
+                        bool modal = false, Qt::WindowFlags fl = 0 );
     virtual ~KstViewFitsDialog();
     KstFitTable* tableFits;