Change also SIP files to use WindowFlags instead of WFlags

qgis · Mar 27, 2014 · 7a70041 · 7a70041
1 parent 665f0a3
commit 7a70041
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 21 deletions.
diff --git a/python/core/qgsproviderregistry.sip b/python/core/qgsproviderregistry.sip
@@ -40,7 +40,7 @@ class QgsProviderRegistry
                                const QString & dataSource );
 
     QWidget *selectWidget( const QString & providerKey,
-                           QWidget * parent = 0, Qt::WFlags fl = 0 );
+                           QWidget * parent = 0, Qt::WindowFlags fl = 0 );
 
     /** Get pointer to provider function
         @param providerKey identificator of the provider

diff --git a/python/gui/qgsbusyindicatordialog.sip b/python/gui/qgsbusyindicatordialog.sip
@@ -16,7 +16,7 @@ class QgsBusyIndicatorDialog : QDialog
      * @param fl widget flags
      * @note added in 1.9
     */
-    QgsBusyIndicatorDialog( const QString& message = "", QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsBusyIndicatorDialog( const QString& message = "", QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsBusyIndicatorDialog();
 
     QString message() const;

diff --git a/python/gui/qgscharacterselectdialog.sip b/python/gui/qgscharacterselectdialog.sip
@@ -4,7 +4,7 @@ class QgsCharacterSelectorDialog : QDialog
 #include <qgscharacterselectdialog.h>
 %End
   public:
-    QgsCharacterSelectorDialog( QWidget* parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsCharacterSelectorDialog( QWidget* parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsCharacterSelectorDialog();
 
   public slots:

diff --git a/python/gui/qgscomposerview.sip b/python/gui/qgscomposerview.sip
@@ -60,7 +60,7 @@ class QgsComposerView : QGraphicsView
       ActiveUntilMouseRelease
     };
 
-    QgsComposerView( QWidget* parent = 0, const char* name = 0, Qt::WFlags f = 0 );
+    QgsComposerView( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags f = 0 );
 
     /**Add an item group containing the selected items*/
     void groupItems();

diff --git a/python/gui/qgscredentialdialog.sip b/python/gui/qgscredentialdialog.sip
@@ -8,7 +8,7 @@ class QgsCredentialDialog : QDialog, QgsCredentials
 %End
 
   public:
-    QgsCredentialDialog( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsCredentialDialog( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsCredentialDialog();
 
   protected:

diff --git a/python/gui/qgsdialog.sip b/python/gui/qgsdialog.sip
@@ -8,7 +8,7 @@ class QgsDialog : QDialog
 %End
 
   public:
-    QgsDialog( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags,
+    QgsDialog( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
                QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close,
                Qt::Orientation orientation = Qt::Horizontal );
     ~QgsDialog();

diff --git a/python/gui/qgserrordialog.sip b/python/gui/qgserrordialog.sip
@@ -4,7 +4,7 @@ class QgsErrorDialog : QDialog
 #include <qgserrordialog.h>
 %End
   public:
-    QgsErrorDialog( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsErrorDialog( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsErrorDialog();
 
     /** Show dialog with error
@@ -13,7 +13,7 @@ class QgsErrorDialog : QDialog
      * @param parent parent object
      * @param fl widget flags
      */
-    static void show( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    static void show( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
 
   public slots:
     void on_mDetailPushButton_clicked();

diff --git a/python/gui/qgsgenericprojectionselector.sip b/python/gui/qgsgenericprojectionselector.sip
@@ -14,7 +14,7 @@ class QgsGenericProjectionSelector : QDialog //, private Ui::QgsGenericProjectio
      * Constructor
      */
     QgsGenericProjectionSelector( QWidget *parent = 0,
-                                  Qt::WFlags fl = QgisGui::ModalDialogFlags );
+                                  Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
 
     //! Destructor
     ~QgsGenericProjectionSelector();

diff --git a/python/gui/qgsludialog.sip b/python/gui/qgsludialog.sip
@@ -5,7 +5,7 @@ class QgsLUDialog: QDialog
 %End
 
   public:
-    QgsLUDialog( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsLUDialog( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsLUDialog();
     QString lowerValue() const;
     void setLowerValue( QString val );

diff --git a/python/gui/qgsmessagelogviewer.sip b/python/gui/qgsmessagelogviewer.sip
@@ -9,7 +9,7 @@ class QgsMessageLogViewer: QDialog
 %End
 
   public:
-    QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsMessageLogViewer();
 
   public slots:

diff --git a/python/gui/qgsmessageviewer.sip b/python/gui/qgsmessageviewer.sip
@@ -6,7 +6,7 @@ class QgsMessageViewer: QDialog, QgsMessageOutput //, Ui::QgsMessageViewer
 %End
 
   public:
-    QgsMessageViewer( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsMessageViewer( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsMessageViewer();
 
     virtual void setMessage( const QString& message, MessageType msgType );

diff --git a/python/gui/qgsnewhttpconnection.sip b/python/gui/qgsnewhttpconnection.sip
@@ -6,7 +6,7 @@ class QgsNewHttpConnection : QDialog
 
   public:
     //! Constructor
-    QgsNewHttpConnection( QWidget *parent = 0, const QString& baseKey = "/Qgis/connections-wms/", const QString& connName = QString::null, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsNewHttpConnection( QWidget *parent = 0, const QString& baseKey = "/Qgis/connections-wms/", const QString& connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     //! Destructor
     ~QgsNewHttpConnection();
   public slots:

diff --git a/python/gui/qgsnewvectorlayerdialog.sip b/python/gui/qgsnewvectorlayerdialog.sip
@@ -9,7 +9,7 @@ class QgsNewVectorLayerDialog : QDialog
     // run the dialog, create the layer. Return file name if the creation was successful
     static QString runAndCreateLayer( QWidget* parent = 0, QString* enc = 0 );
 
-    QgsNewVectorLayerDialog( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    QgsNewVectorLayerDialog( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsNewVectorLayerDialog();
     /**Returns the selected geometry type*/
     QGis::WkbType selectedType() const;

diff --git a/python/gui/qgsoptionsdialogbase.sip b/python/gui/qgsoptionsdialogbase.sip
@@ -9,7 +9,7 @@ class QgsOptionsDialogBase : QDialog
      * @param parent parent object (owner)
      * @param fl widget flags
      */
-    QgsOptionsDialogBase( QString settingsKey, QWidget* parent = 0, Qt::WFlags fl = 0 );
+    QgsOptionsDialogBase( QString settingsKey, QWidget* parent = 0, Qt::WindowFlags fl = 0 );
     ~QgsOptionsDialogBase();
 
     /** Set up the base ui connections for vertical tabs.

diff --git a/python/gui/qgsowssourceselect.sip b/python/gui/qgsowssourceselect.sip
@@ -23,7 +23,7 @@ class QgsOWSSourceSelect : QDialog
     };
 
     //! Constructor
-    QgsOWSSourceSelect( QString service, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
+    QgsOWSSourceSelect( QString service, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
     //! Destructor
     ~QgsOWSSourceSelect();
 

diff --git a/python/gui/qgsprojectionselector.sip b/python/gui/qgsprojectionselector.sip
@@ -11,7 +11,7 @@ class QgsProjectionSelector : QWidget
 %End
 
   public:
-    QgsProjectionSelector( QWidget* parent, const char *name = "", Qt::WFlags fl = 0 );
+    QgsProjectionSelector( QWidget* parent, const char *name = "", Qt::WindowFlags fl = 0 );
 
     ~QgsProjectionSelector();
 

diff --git a/python/gui/qgsquerybuilder.sip b/python/gui/qgsquerybuilder.sip
@@ -12,7 +12,7 @@ class QgsQueryBuilder : QDialog
      * @param fl dialog flags
      */
     QgsQueryBuilder( QgsVectorLayer *layer, QWidget *parent = 0,
-                     Qt::WFlags fl = QgisGui::ModalDialogFlags );
+                     Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
 
     ~QgsQueryBuilder();
 

diff --git a/python/gui/qgssearchquerybuilder.sip b/python/gui/qgssearchquerybuilder.sip
@@ -7,7 +7,7 @@ class QgsSearchQueryBuilder : QDialog
   public:
     //! Constructor - takes pointer to vector layer as a parameter
     QgsSearchQueryBuilder( QgsVectorLayer* layer, QWidget *parent /TransferThis/ = 0,
-                           Qt::WFlags fl = QgisGui::ModalDialogFlags );
+                           Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
 
     ~QgsSearchQueryBuilder();
 

diff --git a/python/gui/qgssublayersdialog.sip b/python/gui/qgssublayersdialog.sip
@@ -12,7 +12,7 @@ class QgsSublayersDialog : QDialog
       Vsifile
     };
 
-    QgsSublayersDialog( ProviderType providerType, QString name, QWidget* parent = 0, Qt::WFlags fl = 0 );
+    QgsSublayersDialog( ProviderType providerType, QString name, QWidget* parent = 0, Qt::WindowFlags fl = 0 );
     ~QgsSublayersDialog();
 
     void populateLayerTable( QStringList theList, QString delim = ":" );

diff --git a/python/gui/symbology-ng/qgssvgselectorwidget.sip b/python/gui/symbology-ng/qgssvgselectorwidget.sip
@@ -62,7 +62,7 @@ class QgsSvgSelectorDialog : QDialog
 #include <qgssvgselectorwidget.h>
 %End
   public:
-    QgsSvgSelectorDialog( QWidget* parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags,
+    QgsSvgSelectorDialog( QWidget* parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
                           QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close | QDialogButtonBox::Ok,
                           Qt::Orientation orientation = Qt::Horizontal );
     ~QgsSvgSelectorDialog();