diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-01 14:47:33 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-04 06:03:52 +0000 |
commit | 9cb68cdea0fbf646315d972d8926b8d55c87cb02 (patch) | |
tree | 70eedbad84ba4298525c73d6513231323ccef05a /src/widgets/widgets | |
parent | c3addaca1743325f1bd75a24a84e56fcb6d80694 (diff) |
Make QWidget *=0, Qt::WindowFlags f=0 functions use Q_NULLPTR
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: If9721e8b1ab3b4cd6e3e366362cae314f451bbed
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qdockwidget.h | 5 | ||||
-rw-r--r-- | src/widgets/widgets/qframe.h | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qlabel.h | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindow.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmdiarea.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmdisubwindow.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qsplashscreen.h | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbox.h | 2 |
8 files changed, 13 insertions, 12 deletions
diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index af4a5521bf..25e4d4d0a4 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -58,8 +58,9 @@ class Q_WIDGETS_EXPORT QDockWidget : public QWidget Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle DESIGNABLE true) public: - explicit QDockWidget(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0); - explicit QDockWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0); + explicit QDockWidget(const QString &title, QWidget *parent = Q_NULLPTR, + Qt::WindowFlags flags = Qt::WindowFlags()); + explicit QDockWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); ~QDockWidget(); QWidget *widget() const; diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index c32e38f311..eb4d74c72a 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -54,7 +54,7 @@ class Q_WIDGETS_EXPORT QFrame : public QWidget Q_PROPERTY(QRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false) public: - explicit QFrame(QWidget* parent = 0, Qt::WindowFlags f = 0); + explicit QFrame(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); ~QFrame(); int frameStyle() const; @@ -108,7 +108,7 @@ protected: protected: - QFrame(QFramePrivate &dd, QWidget* parent = 0, Qt::WindowFlags f = 0); + QFrame(QFramePrivate &dd, QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); void initStyleOption(QStyleOptionFrame *option) const; private: diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 330626a9c5..1a3a68db60 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -58,8 +58,8 @@ class Q_WIDGETS_EXPORT QLabel : public QFrame Q_PROPERTY(QString selectedText READ selectedText) public: - explicit QLabel(QWidget *parent=0, Qt::WindowFlags f=0); - explicit QLabel(const QString &text, QWidget *parent=0, Qt::WindowFlags f=0); + explicit QLabel(QWidget *parent=Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QLabel(const QString &text, QWidget *parent=Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); ~QLabel(); QString text() const; diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 0bd70c87a6..ab6ee22748 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -83,7 +83,7 @@ public: Q_ENUM(DockOption) Q_DECLARE_FLAGS(DockOptions, DockOption) - explicit QMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); + explicit QMainWindow(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); ~QMainWindow(); QSize iconSize() const; diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index 461282f8a8..f1361fffc6 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -89,7 +89,7 @@ public: QMdiSubWindow *activeSubWindow() const; QList<QMdiSubWindow *> subWindowList(WindowOrder order = CreationOrder) const; - QMdiSubWindow *addSubWindow(QWidget *widget, Qt::WindowFlags flags = 0); + QMdiSubWindow *addSubWindow(QWidget *widget, Qt::WindowFlags flags = Qt::WindowFlags()); void removeSubWindow(QWidget *widget); QBrush background() const; diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index 693477c894..e7d0ca4e44 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -60,7 +60,7 @@ public: }; Q_DECLARE_FLAGS(SubWindowOptions, SubWindowOption) - QMdiSubWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); + QMdiSubWindow(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); ~QMdiSubWindow(); QSize sizeHint() const Q_DECL_OVERRIDE; diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index 58b8484f4c..dec24a5608 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -47,8 +47,8 @@ class Q_WIDGETS_EXPORT QSplashScreen : public QWidget { Q_OBJECT public: - explicit QSplashScreen(const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = 0); - QSplashScreen(QWidget *parent, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = 0); + explicit QSplashScreen(const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags()); + QSplashScreen(QWidget *parent, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags()); virtual ~QSplashScreen(); void setPixmap(const QPixmap &pixmap); diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index cff5ae09ae..42b06e205c 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -51,7 +51,7 @@ class Q_WIDGETS_EXPORT QToolBox : public QFrame Q_PROPERTY(int count READ count) public: - explicit QToolBox(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit QToolBox(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); ~QToolBox(); int addItem(QWidget *widget, const QString &text); |