whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Marc Mutz 2015-06-30 22:11:15 +02:00
parent a767014167
commit efeab107bf
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/printsupport/dialogs/qabstractprintdialog.h
View File

@ -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)

4
src/printsupport/dialogs/qpagesetupdialog.h
View File

@ -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)

4
src/printsupport/dialogs/qprintdialog.h
View File

@ -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;