summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/qcustom3dvolume.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-03 13:59:37 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 16:14:27 +0000
commit7d16c732127199bf2f26ef93d242b0d19b0d7944 (patch)
tree8a881b6c893a529f74500d29310c3af475853b25 /src/datavisualization/data/qcustom3dvolume.h
parenta3cd1d4b7d35f4c12d2a26283fcd346126a535e7 (diff)
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 <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/datavisualization/data/qcustom3dvolume.h')
-rw-r--r--src/datavisualization/data/qcustom3dvolume.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h
index 386a8045..966c01f2 100644
--- a/src/datavisualization/data/qcustom3dvolume.h
+++ b/src/datavisualization/data/qcustom3dvolume.h
@@ -54,12 +54,12 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem
public:
- explicit QCustom3DVolume(QObject *parent = 0);
+ explicit QCustom3DVolume(QObject *parent = Q_NULLPTR);
explicit QCustom3DVolume(const QVector3D &position, const QVector3D &scaling,
const QQuaternion &rotation, int textureWidth,
int textureHeight, int textureDepth,
QVector<uchar> *textureData, QImage::Format textureFormat,
- const QVector<QRgb> &colorTable, QObject *parent = 0);
+ const QVector<QRgb> &colorTable, QObject *parent = Q_NULLPTR);
virtual ~QCustom3DVolume();
void setTextureWidth(int value);