From 7d16c732127199bf2f26ef93d242b0d19b0d7944 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 13:59:37 +0100 Subject: Add explicit and 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. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen --- .../data/qitemmodelsurfacedataproxy.h | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/datavisualization/data/qitemmodelsurfacedataproxy.h') diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h index 8ac5f832..a7848e22 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h @@ -66,28 +66,28 @@ public: MMBCumulativeY = 3 }; - explicit QItemModelSurfaceDataProxy(QObject *parent = 0); - QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0); - QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &yPosRole, - QObject *parent = 0); - QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, - const QString &columnRole, const QString &yPosRole, - QObject *parent = 0); - QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, - const QString &columnRole, const QString &xPosRole, - const QString &yPosRole, const QString &zPosRole, - QObject *parent = 0); - QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, - const QString &columnRole, const QString &yPosRole, - const QStringList &rowCategories, - const QStringList &columnCategories, - QObject *parent = 0); - QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, - const QString &columnRole, const QString &xPosRole, - const QString &yPosRole, const QString &zPosRole, - const QStringList &rowCategories, - const QStringList &columnCategories, - QObject *parent = 0); + explicit QItemModelSurfaceDataProxy(QObject *parent = Q_NULLPTR); + explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR); + explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &yPosRole, + QObject *parent = Q_NULLPTR); + explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, + const QString &columnRole, const QString &yPosRole, + QObject *parent = Q_NULLPTR); + explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, + const QString &columnRole, const QString &xPosRole, + const QString &yPosRole, const QString &zPosRole, + QObject *parent = Q_NULLPTR); + explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, + const QString &columnRole, const QString &yPosRole, + const QStringList &rowCategories, + const QStringList &columnCategories, + QObject *parent = Q_NULLPTR); + explicit QItemModelSurfaceDataProxy(QAbstractItemModel *itemModel, const QString &rowRole, + const QString &columnRole, const QString &xPosRole, + const QString &yPosRole, const QString &zPosRole, + const QStringList &rowCategories, + const QStringList &columnCategories, + QObject *parent = Q_NULLPTR); virtual ~QItemModelSurfaceDataProxy(); void setItemModel(QAbstractItemModel *itemModel); -- cgit v1.2.3