From efeab107bfd631b9e372f4d69923f2f788919467 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jun 2015 22:11:15 +0200 Subject: 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 --- src/printsupport/dialogs/qabstractprintdialog.h | 4 ++-- src/printsupport/dialogs/qpagesetupdialog.h | 4 ++-- src/printsupport/dialogs/qprintdialog.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/printsupport') 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; -- cgit v1.2.3