aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-22 10:57:38 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-22 10:21:03 +0000
commit5c20b1672365cf341ed6415ee71ec5c781f715ff (patch)
tree047f893c724ab85d485498533c70aba24304dc33 /src
parentfd3e39535f98d7d26e83b7094236982401bf1d69 (diff)
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I832c3e6f411280643004dc6dd9361b2ea63a6dca Task-number: QTBUG-45291 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/macextras/qmactoolbar.h4
-rw-r--r--src/macextras/qmactoolbaritem.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/macextras/qmactoolbar.h b/src/macextras/qmactoolbar.h
index 9f5b52a..a136686 100644
--- a/src/macextras/qmactoolbar.h
+++ b/src/macextras/qmactoolbar.h
@@ -53,8 +53,8 @@ class Q_MACEXTRAS_EXPORT QMacToolBar : public QObject
{
Q_OBJECT
public:
- explicit QMacToolBar(QObject *parent = 0);
- QMacToolBar(const QString &identifier, QObject *parent = 0);
+ explicit QMacToolBar(QObject *parent = Q_NULLPTR);
+ QMacToolBar(const QString &identifier, QObject *parent = Q_NULLPTR);
~QMacToolBar();
QMacToolBarItem *addItem(const QIcon &icon, const QString &text);
diff --git a/src/macextras/qmactoolbaritem.h b/src/macextras/qmactoolbaritem.h
index 6b73ced..c7bb2a1 100644
--- a/src/macextras/qmactoolbaritem.h
+++ b/src/macextras/qmactoolbaritem.h
@@ -62,7 +62,7 @@ public:
FlexibleSpace
};
- QMacToolBarItem(QObject *parent = 0);
+ QMacToolBarItem(QObject *parent = Q_NULLPTR);
virtual ~QMacToolBarItem();
bool selectable() const;