Skip to content

Commit 4d9f3ff

Browse files
committedJul 22, 2016
Fix inadequate usage of nullptr
1 parent 578962f commit 4d9f3ff

File tree

89 files changed

+104
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+104
-104
lines changed
 

‎src/app/composer/qgsattributeselectiondialog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ class QgsAttributeSelectionDialog: public QDialog, private Ui::QgsAttributeSelec
114114
{
115115
Q_OBJECT
116116
public:
117-
QgsAttributeSelectionDialog( QgsComposerAttributeTableV2* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
117+
QgsAttributeSelectionDialog( QgsComposerAttributeTableV2* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
118118

119119
//todo - remove for QGIS 3.0
120-
QgsAttributeSelectionDialog( QgsComposerAttributeTable* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
120+
QgsAttributeSelectionDialog( QgsComposerAttributeTable* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
121121

122122

123123
~QgsAttributeSelectionDialog();

‎src/app/composer/qgscomposerimageexportoptionsdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class QgsComposerImageExportOptionsDialog: public QDialog, private Ui::QgsCompos
3535
* @param parent parent widget
3636
* @param flags window flags
3737
*/
38-
QgsComposerImageExportOptionsDialog( QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr );
38+
QgsComposerImageExportOptionsDialog( QWidget* parent = nullptr, Qt::WindowFlags flags = 0 );
3939

4040
~QgsComposerImageExportOptionsDialog();
4141

0 commit comments

Comments
 (0)