Skip to content
Permalink
Browse files

Replace WFlags with WindowFlags

It has long been in Qt 4 that the WFlags window flags argument has been
renamed to WindowFlags. In fact, WFlags is just a typedef to WindowFlags.
In Qt 5, this will go away, so we can change this now to make transition
easier in the future.

This should not have any affect on API or ABI, as the symbol names already
have WindowFlags in them anyway.

This change concentrates on the sources in the src directory. There are
a few more places in the python directory that can be done later.
  • Loading branch information
simonsonc authored and wonder-sk committed Mar 27, 2014
1 parent a838700 commit 665f0a32fe0645ab60180523f6c8d8f42e99f275
Showing with 181 additions and 181 deletions.
  1. +1 −1 src/app/ogr/qgsnewogrconnection.cpp
  2. +1 −1 src/app/ogr/qgsnewogrconnection.h
  3. +1 −1 src/app/ogr/qgsopenvectorlayerdialog.cpp
  4. +1 −1 src/app/ogr/qgsopenvectorlayerdialog.h
  5. +2 −2 src/app/ogr/qgsvectorlayersaveasdialog.cpp
  6. +2 −2 src/app/ogr/qgsvectorlayersaveasdialog.h
  7. +1 −1 src/app/pluginmanager/qgspluginmanager.cpp
  8. +1 −1 src/app/pluginmanager/qgspluginmanager.h
  9. +1 −1 src/app/qgisapp.cpp
  10. +1 −1 src/app/qgisapp.h
  11. +1 −1 src/app/qgsaddattrdialog.cpp
  12. +2 −2 src/app/qgsaddattrdialog.h
  13. +1 −1 src/app/qgsbookmarks.cpp
  14. +1 −1 src/app/qgsbookmarks.h
  15. +1 −1 src/app/qgscustomprojectiondialog.cpp
  16. +1 −1 src/app/qgscustomprojectiondialog.h
  17. +1 −1 src/app/qgsdisplayangle.cpp
  18. +1 −1 src/app/qgsidentifyresultsdialog.cpp
  19. +1 −1 src/app/qgsidentifyresultsdialog.h
  20. +1 −1 src/app/qgsmeasuredialog.cpp
  21. +1 −1 src/app/qgsmeasuredialog.h
  22. +1 −1 src/app/qgsnewspatialitelayerdialog.cpp
  23. +1 −1 src/app/qgsnewspatialitelayerdialog.h
  24. +1 −1 src/app/qgsoptions.cpp
  25. +1 −1 src/app/qgsoptions.h
  26. +1 −1 src/app/qgsprojectproperties.cpp
  27. +1 −1 src/app/qgsprojectproperties.h
  28. +1 −1 src/app/qgsrasterlayerproperties.cpp
  29. +1 −1 src/app/qgsrasterlayerproperties.h
  30. +1 −1 src/app/qgsvectorlayerproperties.cpp
  31. +1 −1 src/app/qgsvectorlayerproperties.h
  32. +1 −1 src/browser/qgsbrowser.cpp
  33. +1 −1 src/browser/qgsbrowser.h
  34. +2 −2 src/core/qgsproviderregistry.cpp
  35. +1 −1 src/core/qgsproviderregistry.h
  36. +1 −1 src/gui/qgisgui.h
  37. +1 −1 src/gui/qgsbusyindicatordialog.cpp
  38. +1 −1 src/gui/qgsbusyindicatordialog.h
  39. +1 −1 src/gui/qgscharacterselectdialog.cpp
  40. +1 −1 src/gui/qgscharacterselectdialog.h
  41. +1 −1 src/gui/qgscomposerview.cpp
  42. +1 −1 src/gui/qgscomposerview.h
  43. +1 −1 src/gui/qgscredentialdialog.cpp
  44. +1 −1 src/gui/qgscredentialdialog.h
  45. +1 −1 src/gui/qgsdialog.cpp
  46. +1 −1 src/gui/qgsdialog.h
  47. +2 −2 src/gui/qgserrordialog.cpp
  48. +2 −2 src/gui/qgserrordialog.h
  49. +1 −1 src/gui/qgsgenericprojectionselector.cpp
  50. +1 −1 src/gui/qgsgenericprojectionselector.h
  51. +1 −1 src/gui/qgsludialog.cpp
  52. +1 −1 src/gui/qgsludialog.h
  53. +1 −1 src/gui/qgsmessagelogviewer.cpp
  54. +1 −1 src/gui/qgsmessagelogviewer.h
  55. +1 −1 src/gui/qgsmessageviewer.cpp
  56. +1 −1 src/gui/qgsmessageviewer.h
  57. +1 −1 src/gui/qgsnewhttpconnection.cpp
  58. +1 −1 src/gui/qgsnewhttpconnection.h
  59. +1 −1 src/gui/qgsnewvectorlayerdialog.cpp
  60. +1 −1 src/gui/qgsnewvectorlayerdialog.h
  61. +1 −1 src/gui/qgsoptionsdialogbase.cpp
  62. +1 −1 src/gui/qgsoptionsdialogbase.h
  63. +1 −1 src/gui/qgsowssourceselect.cpp
  64. +1 −1 src/gui/qgsowssourceselect.h
  65. +1 −1 src/gui/qgsprojectionselector.cpp
  66. +1 −1 src/gui/qgsprojectionselector.h
  67. +1 −1 src/gui/qgsquerybuilder.cpp
  68. +1 −1 src/gui/qgsquerybuilder.h
  69. +1 −1 src/gui/qgssearchquerybuilder.cpp
  70. +1 −1 src/gui/qgssearchquerybuilder.h
  71. +1 −1 src/gui/qgssublayersdialog.cpp
  72. +1 −1 src/gui/qgssublayersdialog.h
  73. +1 −1 src/gui/symbology-ng/qgssvgselectorwidget.cpp
  74. +1 −1 src/gui/symbology-ng/qgssvgselectorwidget.h
  75. +1 −1 src/helpviewer/qgshelpviewer.cpp
  76. +1 −1 src/helpviewer/qgshelpviewer.h
  77. +1 −1 src/plugins/compass/qgscompassplugingui.cpp
  78. +1 −1 src/plugins/compass/qgscompassplugingui.h
  79. +1 −1 src/plugins/coordinate_capture/coordinatecapturegui.cpp
  80. +1 −1 src/plugins/coordinate_capture/coordinatecapturegui.h
  81. +1 −1 src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp
  82. +1 −1 src/plugins/dxf2shp_converter/dxf2shpconvertergui.h
  83. +1 −1 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
  84. +1 −1 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h
  85. +1 −1 src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp
  86. +1 −1 src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.h
  87. +2 −2 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  88. +2 −2 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h
  89. +1 −1 src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
  90. +1 −1 src/plugins/evis/eventbrowser/evisimagedisplaywidget.h
  91. +1 −1 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  92. +1 −1 src/plugins/georeferencer/qgsgeorefplugingui.h
  93. +1 −1 src/plugins/globe/globe_plugin_dialog.cpp
  94. +1 −1 src/plugins/globe/globe_plugin_dialog.h
  95. +1 −1 src/plugins/gps_importer/qgsgpsplugingui.cpp
  96. +1 −1 src/plugins/gps_importer/qgsgpsplugingui.h
  97. +1 −1 src/plugins/grass/qgsgrassattributes.cpp
  98. +2 −2 src/plugins/grass/qgsgrassattributes.h
  99. +1 −1 src/plugins/grass/qgsgrassbrowser.cpp
  100. +1 −1 src/plugins/grass/qgsgrassbrowser.h
  101. +1 −1 src/plugins/grass/qgsgrassedit.cpp
  102. +1 −1 src/plugins/grass/qgsgrassedit.h
  103. +2 −2 src/plugins/grass/qgsgrassmapcalc.cpp
  104. +2 −2 src/plugins/grass/qgsgrassmapcalc.h
  105. +2 −2 src/plugins/grass/qgsgrassmodule.cpp
  106. +2 −2 src/plugins/grass/qgsgrassmodule.h
  107. +1 −1 src/plugins/grass/qgsgrassnewmapset.cpp
  108. +1 −1 src/plugins/grass/qgsgrassnewmapset.h
  109. +1 −1 src/plugins/grass/qgsgrassregion.cpp
  110. +1 −1 src/plugins/grass/qgsgrassregion.h
  111. +1 −1 src/plugins/grass/qgsgrasstools.cpp
  112. +1 −1 src/plugins/grass/qgsgrasstools.h
  113. +1 −1 src/plugins/heatmap/heatmapgui.cpp
  114. +1 −1 src/plugins/heatmap/heatmapgui.h
  115. +1 −1 src/plugins/offline_editing/offline_editing_plugin_gui.cpp
  116. +1 −1 src/plugins/offline_editing/offline_editing_plugin_gui.h
  117. +1 −1 src/plugins/offline_editing/offline_editing_progress_dialog.cpp
  118. +1 −1 src/plugins/offline_editing/offline_editing_progress_dialog.h
  119. +1 −1 src/plugins/oracle_raster/qgsoracleconnect_ui.cpp
  120. +1 −1 src/plugins/oracle_raster/qgsoracleconnect_ui.h
  121. +1 −1 src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
  122. +1 −1 src/plugins/oracle_raster/qgsselectgeoraster_ui.h
  123. +1 −1 src/plugins/plugin_template/plugingui.cpp
  124. +1 −1 src/plugins/plugin_template/plugingui.h
  125. +1 −1 src/plugins/roadgraph/exportdlg.cpp
  126. +1 −1 src/plugins/roadgraph/exportdlg.h
  127. +1 −1 src/plugins/roadgraph/settingsdlg.cpp
  128. +1 −1 src/plugins/roadgraph/settingsdlg.h
  129. +1 −1 src/plugins/spit/qgsspit.cpp
  130. +1 −1 src/plugins/spit/qgsspit.h
  131. +1 −1 src/plugins/sqlanywhere/sanewconnection.cpp
  132. +1 −1 src/plugins/sqlanywhere/sanewconnection.h
  133. +1 −1 src/plugins/sqlanywhere/sasourceselect.cpp
  134. +1 −1 src/plugins/sqlanywhere/sasourceselect.h
  135. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  136. +1 −1 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
  137. +1 −1 src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
  138. +1 −1 src/providers/mssql/qgsmssqlnewconnection.cpp
  139. +1 −1 src/providers/mssql/qgsmssqlnewconnection.h
  140. +1 −1 src/providers/mssql/qgsmssqlprovider.cpp
  141. +1 −1 src/providers/mssql/qgsmssqlsourceselect.cpp
  142. +1 −1 src/providers/mssql/qgsmssqlsourceselect.h
  143. +1 −1 src/providers/oracle/qgsoraclenewconnection.cpp
  144. +1 −1 src/providers/oracle/qgsoraclenewconnection.h
  145. +1 −1 src/providers/oracle/qgsoracleprovider.cpp
  146. +1 −1 src/providers/oracle/qgsoraclesourceselect.cpp
  147. +1 −1 src/providers/oracle/qgsoraclesourceselect.h
  148. +2 −2 src/providers/ows/qgsowsdataitems.cpp
  149. +1 −1 src/providers/postgres/qgspgnewconnection.cpp
  150. +1 −1 src/providers/postgres/qgspgnewconnection.h
  151. +1 −1 src/providers/postgres/qgspgsourceselect.cpp
  152. +1 −1 src/providers/postgres/qgspgsourceselect.h
  153. +1 −1 src/providers/postgres/qgspostgresprovider.cpp
  154. +1 −1 src/providers/spatialite/qgsspatialitedataitems.cpp
  155. +1 −1 src/providers/spatialite/qgsspatialitesourceselect.cpp
  156. +1 −1 src/providers/spatialite/qgsspatialitesourceselect.h
  157. +1 −1 src/providers/wcs/qgswcsdataitems.cpp
  158. +1 −1 src/providers/wcs/qgswcssourceselect.cpp
  159. +1 −1 src/providers/wcs/qgswcssourceselect.h
  160. +1 −1 src/providers/wfs/qgswfsdataitems.cpp
  161. +1 −1 src/providers/wfs/qgswfssourceselect.cpp
  162. +1 −1 src/providers/wfs/qgswfssourceselect.h
  163. +1 −1 src/providers/wms/qgswmsdataitems.cpp
  164. +1 −1 src/providers/wms/qgswmssourceselect.cpp
  165. +1 −1 src/providers/wms/qgswmssourceselect.h
  166. +1 −1 src/providers/wms/qgswmtsdimensions.cpp
  167. +1 −1 src/providers/wms/qgswmtsdimensions.h
@@ -31,7 +31,7 @@
#define TO8F(x) QFile::encodeName( x ).constData()
#endif

QgsNewOgrConnection::QgsNewOgrConnection( QWidget *parent, const QString& connType, const QString& connName, Qt::WFlags fl )
QgsNewOgrConnection::QgsNewOgrConnection( QWidget *parent, const QString& connType, const QString& connName, Qt::WindowFlags fl )
: QDialog( parent, fl ),
mOriginalConnName( connName )
{
@@ -31,7 +31,7 @@ class QgsNewOgrConnection : public QDialog, private Ui::QgsNewOgrConnectionBase

public:
//! Constructor
QgsNewOgrConnection( QWidget *parent = 0, const QString& connType = QString::null, const QString& connName = QString::null, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QgsNewOgrConnection( QWidget *parent = 0, const QString& connType = QString::null, const QString& connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
//! Destructor
~QgsNewOgrConnection();
//! Tests the connection using the parameters supplied
@@ -32,7 +32,7 @@
#include "qgsogrhelperfunctions.h"
#include "qgscontexthelp.h"

QgsOpenVectorLayerDialog::QgsOpenVectorLayerDialog( QWidget* parent, Qt::WFlags fl )
QgsOpenVectorLayerDialog::QgsOpenVectorLayerDialog( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
setupUi( this );
@@ -32,7 +32,7 @@ class QgsOpenVectorLayerDialog : public QDialog, private Ui::QgsOpenVectorLayerD
Q_OBJECT

public:
QgsOpenVectorLayerDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
QgsOpenVectorLayerDialog( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~QgsOpenVectorLayerDialog();
//! Opens a dialog to select a file datasource*/
QStringList openFile();
@@ -25,14 +25,14 @@
#include <QFileDialog>
#include <QTextCodec>

QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent, Qt::WFlags fl )
QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
, mCRS( srsid )
{
setup();
}

QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, const QgsRectangle& layerExtent, bool layerHasSelectedFeatures, int options, QWidget* parent, Qt::WFlags fl )
QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, const QgsRectangle& layerExtent, bool layerHasSelectedFeatures, int options, QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
, mCRS( srsid )
, mLayerExtent( layerExtent )
@@ -38,8 +38,8 @@ class QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSav
AllOptions = ~0
};

QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent = 0, Qt::WFlags fl = 0 );
QgsVectorLayerSaveAsDialog( long srsid, const QgsRectangle& layerExtent, bool layerHasSelectedFeatures, int options = AllOptions, QWidget* parent = 0, Qt::WFlags fl = 0 );
QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent = 0, Qt::WindowFlags fl = 0 );
QgsVectorLayerSaveAsDialog( long srsid, const QgsRectangle& layerExtent, bool layerHasSelectedFeatures, int options = AllOptions, QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~QgsVectorLayerSaveAsDialog();

QString format() const;
@@ -54,7 +54,7 @@
#endif


QgsPluginManager::QgsPluginManager( QWidget * parent, bool pluginsAreEnabled, Qt::WFlags fl )
QgsPluginManager::QgsPluginManager( QWidget * parent, bool pluginsAreEnabled, Qt::WindowFlags fl )
: QgsOptionsDialogBase( "PluginManager", parent, fl )
{
// initialize pointer
@@ -46,7 +46,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
Q_OBJECT
public:
//! Constructor; set pluginsAreEnabled to false in --noplugins mode
QgsPluginManager( QWidget *parent = 0, bool pluginsAreEnabled = true, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QgsPluginManager( QWidget *parent = 0, bool pluginsAreEnabled = true, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );

//! Destructor
~QgsPluginManager();
@@ -443,7 +443,7 @@ static bool cmpByText_( QAction* a, QAction* b )
QgisApp *QgisApp::smInstance = 0;

// constructor starts here
QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent, Qt::WFlags fl )
QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent, Qt::WindowFlags fl )
: QMainWindow( parent, fl )
, mSplash( splash )
, mMousePrecisionDecimalPlaces( 0 )
@@ -113,7 +113,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
Q_OBJECT
public:
//! Constructor
QgisApp( QSplashScreen *splash, bool restorePlugins = true, QWidget * parent = 0, Qt::WFlags fl = Qt::Window );
QgisApp( QSplashScreen *splash, bool restorePlugins = true, QWidget * parent = 0, Qt::WindowFlags fl = Qt::Window );
//! Constructor for unit tests
QgisApp( );
//! Destructor
@@ -22,7 +22,7 @@

#include <QMessageBox>

QgsAddAttrDialog::QgsAddAttrDialog( QgsVectorLayer *vlayer, QWidget *parent, Qt::WFlags fl )
QgsAddAttrDialog::QgsAddAttrDialog( QgsVectorLayer *vlayer, QWidget *parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
, mIsShapeFile( vlayer && vlayer->providerType() == "ogr" && vlayer->storageType() == "ESRI Shapefile" )
{
@@ -29,9 +29,9 @@ class APP_EXPORT QgsAddAttrDialog: public QDialog, private Ui::QgsAddAttrDialogB
Q_OBJECT
public:
QgsAddAttrDialog( QgsVectorLayer *vlayer,
QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
QgsAddAttrDialog( const std::list<QString>& typelist,
QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );

QgsField field() const;

@@ -34,7 +34,7 @@

QgsBookmarks *QgsBookmarks::sInstance = 0;

QgsBookmarks::QgsBookmarks( QWidget *parent, Qt::WFlags fl )
QgsBookmarks::QgsBookmarks( QWidget *parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
setupUi( this );
@@ -38,7 +38,7 @@ class APP_EXPORT QgsBookmarks : public QDialog, private Ui::QgsBookmarksBase
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

private:
QgsBookmarks( QWidget *parent = 0, Qt::WFlags fl = 0 );
QgsBookmarks( QWidget *parent = 0, Qt::WindowFlags fl = 0 );
~QgsBookmarks();

void saveWindowLocation();
@@ -43,7 +43,7 @@ extern "C"
}


QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget *parent, Qt::WFlags fl )
QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget *parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
setupUi( this );
@@ -33,7 +33,7 @@ class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCust
{
Q_OBJECT
public:
QgsCustomProjectionDialog( QWidget *parent = 0, Qt::WFlags fl = 0 );
QgsCustomProjectionDialog( QWidget *parent = 0, Qt::WindowFlags fl = 0 );
~QgsCustomProjectionDialog();

public slots:
@@ -20,7 +20,7 @@
#include <QSettings>
#include <cmath>

QgsDisplayAngle::QgsDisplayAngle( QgsMapToolMeasureAngle * tool, Qt::WFlags f )
QgsDisplayAngle::QgsDisplayAngle( QgsMapToolMeasureAngle * tool, Qt::WindowFlags f )
: QDialog( tool->canvas()->topLevelWidget(), f ), mTool( tool )
{
setupUi( this );
@@ -252,7 +252,7 @@ void QgsIdentifyResultsWebViewItem::loadFinished( bool ok )
// action
// name value

QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent, Qt::WFlags f )
QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent, Qt::WindowFlags f )
: QDialog( parent, f )
, mActionPopup( 0 )
, mCanvas( canvas )
@@ -100,7 +100,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti

//! Constructor - takes it own copy of the QgsAttributeAction so
// that it is independent of whoever created it.
QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent = 0, Qt::WFlags f = 0 );
QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent = 0, Qt::WindowFlags f = 0 );

~QgsIdentifyResultsDialog();

@@ -31,7 +31,7 @@
#include <QPushButton>


QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool* tool, Qt::WFlags f )
QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f )
: QDialog( tool->canvas()->topLevelWidget(), f ), mTool( tool )
{
setupUi( this );
@@ -33,7 +33,7 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
public:

//! Constructor
QgsMeasureDialog( QgsMeasureTool* tool, Qt::WFlags f = 0 );
QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f = 0 );

//! Save position
void saveWindowLocation( void );
@@ -40,7 +40,7 @@

#include <spatialite.h>

QgsNewSpatialiteLayerDialog::QgsNewSpatialiteLayerDialog( QWidget *parent, Qt::WFlags fl )
QgsNewSpatialiteLayerDialog::QgsNewSpatialiteLayerDialog( QWidget *parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
setupUi( this );
@@ -34,7 +34,7 @@ class APP_EXPORT QgsNewSpatialiteLayerDialog: public QDialog, private Ui::QgsNew
Q_OBJECT

public:
QgsNewSpatialiteLayerDialog( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QgsNewSpatialiteLayerDialog( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
~QgsNewSpatialiteLayerDialog();

protected slots:
@@ -66,7 +66,7 @@
* \class QgsOptions - Set user options and preferences
* Constructor
*/
QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
QgsOptionsDialogBase( "Options", parent, fl )
{
setupUi( this );
@@ -43,7 +43,7 @@ class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOption
* @param name name for the widget
* @param modal true for modal dialog
*/
QgsOptions( QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QgsOptions( QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
//! Destructor
~QgsOptions();
/**
@@ -58,7 +58,7 @@ const char * QgsProjectProperties::GEO_NONE_DESC = QT_TRANSLATE_NOOP( "QgsOption

//stdc++ includes

QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *parent, Qt::WFlags fl )
QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *parent, Qt::WindowFlags fl )
: QgsOptionsDialogBase( "ProjectProperties", parent, fl )
, mMapCanvas( mapCanvas )
, mEllipsoidList()
@@ -38,7 +38,7 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:

public:
//! Constructor
QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );

//! Destructor
~QgsProjectProperties();
@@ -66,7 +66,7 @@
#include <QMouseEvent>
#include <QVector>

QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanvas* theCanvas, QWidget *parent, Qt::WFlags fl )
QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanvas* theCanvas, QWidget *parent, Qt::WindowFlags fl )
: QgsOptionsDialogBase( "RasterLayerProperties", parent, fl ),
// Constant that signals property not used.
TRSTRING_NOT_SET( tr( "Not Set" ) ),
@@ -46,7 +46,7 @@ class APP_EXPORT QgsRasterLayerProperties : public QgsOptionsDialogBase, private
/** \brief Constructor
* @param ml Map layer for which properties will be displayed
*/
QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanvas* theCanvas, QWidget *parent = 0, Qt::WFlags = QgisGui::ModalDialogFlags );
QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanvas* theCanvas, QWidget *parent = 0, Qt::WindowFlags = QgisGui::ModalDialogFlags );
/** \brief Destructor */
~QgsRasterLayerProperties();

@@ -68,7 +68,7 @@
QgsVectorLayerProperties::QgsVectorLayerProperties(
QgsVectorLayer *lyr,
QWidget * parent,
Qt::WFlags fl
Qt::WindowFlags fl
)
: QgsOptionsDialogBase( "VectorLayerProperties", parent, fl )
, layer( lyr )
@@ -53,7 +53,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
DB,
};

QgsVectorLayerProperties( QgsVectorLayer *lyr = 0, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QgsVectorLayerProperties( QgsVectorLayer *lyr = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
~QgsVectorLayerProperties();
/**Returns the display name entered in the dialog*/
QString displayName();
@@ -41,7 +41,7 @@
#define QGIS_ICON_SIZE 24
#endif

QgsBrowser::QgsBrowser( QWidget *parent, Qt::WFlags flags )
QgsBrowser::QgsBrowser( QWidget *parent, Qt::WindowFlags flags )
: QMainWindow( parent, flags )
, mDirtyMetadata( true )
, mDirtyPreview( true )
@@ -30,7 +30,7 @@ class QgsBrowser : public QMainWindow, private Ui::QgsBrowserBase
{
Q_OBJECT
public:
QgsBrowser( QWidget *parent = 0, Qt::WFlags flags = 0 );
QgsBrowser( QWidget *parent = 0, Qt::WindowFlags flags = 0 );
~QgsBrowser();

// Expand to given path
@@ -372,10 +372,10 @@ QgsDataProvider *QgsProviderRegistry::provider( QString const & providerKey, QSt
} // QgsProviderRegistry::setDataProvider

// This should be QWidget, not QDialog
typedef QWidget * selectFactoryFunction_t( QWidget * parent, Qt::WFlags fl );
typedef QWidget * selectFactoryFunction_t( QWidget * parent, Qt::WindowFlags fl );

QWidget* QgsProviderRegistry::selectWidget( const QString & providerKey,
QWidget * parent, Qt::WFlags fl )
QWidget * parent, Qt::WindowFlags fl )
{
selectFactoryFunction_t * selectFactory =
( selectFactoryFunction_t * ) cast_to_fptr( function( providerKey, "selectWidget" ) );
@@ -69,7 +69,7 @@ class CORE_EXPORT 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
@@ -44,7 +44,7 @@ namespace QgisGui
* Qt::WindowMaximizeButtonHint is included but will be ignored if
* the dialog is a fixed size and does not have a size grip.
*/
static const Qt::WFlags ModalDialogFlags = 0;
static const Qt::WindowFlags ModalDialogFlags = 0;

/**
Open files, preferring to have the default file selector be the
@@ -22,7 +22,7 @@
#include <QLabel>
#include <QProgressBar>

QgsBusyIndicatorDialog::QgsBusyIndicatorDialog( const QString& message, QWidget* parent, Qt::WFlags fl )
QgsBusyIndicatorDialog::QgsBusyIndicatorDialog( const QString& message, QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl ), mMessage( QString( message ) ), mMsgLabel( 0 )
{
setWindowTitle( tr( "QGIS" ) );
@@ -39,7 +39,7 @@ class GUI_EXPORT QgsBusyIndicatorDialog : public 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 { return mMessage; }
@@ -18,7 +18,7 @@
#include "qgscharacterselectdialog.h"


QgsCharacterSelectorDialog::QgsCharacterSelectorDialog( QWidget *parent, Qt::WFlags fl )
QgsCharacterSelectorDialog::QgsCharacterSelectorDialog( QWidget *parent, Qt::WindowFlags fl )
: QDialog( parent, fl ), mChar( QChar::Null )
{
setupUi( this );
@@ -32,7 +32,7 @@ class GUI_EXPORT QgsCharacterSelectorDialog : public QDialog, private Ui::QgsCha
Q_OBJECT

public:
QgsCharacterSelectorDialog( QWidget* parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
QgsCharacterSelectorDialog( QWidget* parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
~QgsCharacterSelectorDialog();

public slots:
@@ -46,7 +46,7 @@
#include "qgsmapcanvas.h" //for QgsMapCanvas::WheelAction
#include "qgscursors.h"

QgsComposerView::QgsComposerView( QWidget* parent, const char* name, Qt::WFlags f )
QgsComposerView::QgsComposerView( QWidget* parent, const char* name, Qt::WindowFlags f )
: QGraphicsView( parent )
, mRubberBandItem( 0 )
, mRubberBandLineItem( 0 )
@@ -90,7 +90,7 @@ class GUI_EXPORT QgsComposerView: public 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();

0 comments on commit 665f0a3

Please sign in to comment.
You can’t perform that action at this time.