Skip to content

Commit

Permalink
Change also SIP files to use WindowFlags instead of WFlags
Browse files Browse the repository at this point in the history
  • Loading branch information
wonder-sk committed Mar 27, 2014
1 parent 665f0a3 commit 7a70041
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion python/core/qgsproviderregistry.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsbusyindicatordialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgscharacterselectdialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgscomposerview.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgscredentialdialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsdialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions python/gui/qgserrordialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsgenericprojectionselector.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsludialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsmessagelogviewer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsmessageviewer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsnewhttpconnection.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsnewvectorlayerdialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsoptionsdialogbase.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsowssourceselect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsprojectionselector.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsquerybuilder.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgssearchquerybuilder.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgssublayersdialog.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ":" );
Expand Down
2 changes: 1 addition & 1 deletion python/gui/symbology-ng/qgssvgselectorwidget.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 7a70041

Please sign in to comment.