diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 10:32:58 +0000 |
| commit | efeab107bfd631b9e372f4d69923f2f788919467 (patch) | |
| tree | a7e88ee77171c89f08ef136750e62847252d3fd5 /src | |
| parent | a767014167d4f7b258a2bd83637dc1ef25b364f0 (diff) | |
QtPrintSupport: Use Q_NULLPTR instead of 0 in all public headers
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: I6f591a42a8e8ea471d27666eb1cbc77b572b3e0d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog.h | 4 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog.h | 4 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index cf55cfade8..6148502096 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -74,7 +74,7 @@ public: Q_DECLARE_FLAGS(PrintDialogOptions, PrintDialogOption) #ifndef QT_NO_PRINTDIALOG - explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = 0); + explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR); ~QAbstractPrintDialog(); virtual int exec() = 0; @@ -101,7 +101,7 @@ public: QPrinter *printer() const; protected: - QAbstractPrintDialog(QAbstractPrintDialogPrivate &ptr, QPrinter *printer, QWidget *parent = 0); + QAbstractPrintDialog(QAbstractPrintDialogPrivate &ptr, QPrinter *printer, QWidget *parent = Q_NULLPTR); private: Q_DISABLE_COPY(QAbstractPrintDialog) diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 43b642b8f1..824d63f2d7 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -51,8 +51,8 @@ class Q_PRINTSUPPORT_EXPORT QPageSetupDialog : public QDialog Q_DECLARE_PRIVATE(QPageSetupDialog) public: - explicit QPageSetupDialog(QPrinter *printer, QWidget *parent = 0); - explicit QPageSetupDialog(QWidget *parent = 0); + explicit QPageSetupDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR); + explicit QPageSetupDialog(QWidget *parent = Q_NULLPTR); ~QPageSetupDialog(); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 1332fcc1fd..cf0115cc28 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -53,8 +53,8 @@ class Q_PRINTSUPPORT_EXPORT QPrintDialog : public QAbstractPrintDialog Q_PROPERTY(PrintDialogOptions options READ options WRITE setOptions) public: - explicit QPrintDialog(QPrinter *printer, QWidget *parent = 0); - explicit QPrintDialog(QWidget *parent = 0); + explicit QPrintDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR); + explicit QPrintDialog(QWidget *parent = Q_NULLPTR); ~QPrintDialog(); int exec() Q_DECL_OVERRIDE; |