summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/data')
-rw-r--r--src/datavisualization/data/qabstract3dseries.h2
-rw-r--r--src/datavisualization/data/qabstractdataproxy.h2
-rw-r--r--src/datavisualization/data/qbar3dseries.h4
-rw-r--r--src/datavisualization/data/qbardataproxy.h4
-rw-r--r--src/datavisualization/data/qcustom3ditem.h6
-rw-r--r--src/datavisualization/data/qcustom3dlabel.h4
-rw-r--r--src/datavisualization/data/qcustom3dvolume.h4
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.h8
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy.h36
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy.h18
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy.h44
-rw-r--r--src/datavisualization/data/qscatter3dseries.h6
-rw-r--r--src/datavisualization/data/qscatterdataproxy.h4
-rw-r--r--src/datavisualization/data/qsurface3dseries.h6
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.h4
15 files changed, 76 insertions, 76 deletions
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 346fa026..c6d26d0a 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -80,7 +80,7 @@ public:
};
protected:
- explicit QAbstract3DSeries(QAbstract3DSeriesPrivate *d, QObject *parent = 0);
+ explicit QAbstract3DSeries(QAbstract3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
public:
virtual ~QAbstract3DSeries();
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index 649628ba..c4388ad5 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -45,7 +45,7 @@ public:
};
protected:
- explicit QAbstractDataProxy(QAbstractDataProxyPrivate *d, QObject *parent = 0);
+ explicit QAbstractDataProxy(QAbstractDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
public:
virtual ~QAbstractDataProxy();
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index b9e08b0c..bca23e2f 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -38,8 +38,8 @@ class QT_DATAVISUALIZATION_EXPORT QBar3DSeries : public QAbstract3DSeries
Q_PROPERTY(float meshAngle READ meshAngle WRITE setMeshAngle NOTIFY meshAngleChanged)
public:
- explicit QBar3DSeries(QObject *parent = 0);
- explicit QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent = 0);
+ explicit QBar3DSeries(QObject *parent = Q_NULLPTR);
+ explicit QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
virtual ~QBar3DSeries();
void setDataProxy(QBarDataProxy *proxy);
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index aee38883..8db2fee0 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -47,7 +47,7 @@ class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
Q_PROPERTY(QStringList columnLabels READ columnLabels WRITE setColumnLabels NOTIFY columnLabelsChanged)
Q_PROPERTY(QBar3DSeries *series READ series NOTIFY seriesChanged)
public:
- explicit QBarDataProxy(QObject *parent = 0);
+ explicit QBarDataProxy(QObject *parent = Q_NULLPTR);
virtual ~QBarDataProxy();
QBar3DSeries *series() const;
@@ -102,7 +102,7 @@ Q_SIGNALS:
void seriesChanged(QBar3DSeries *series);
protected:
- explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = 0);
+ explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
QBarDataProxyPrivate *dptr();
const QBarDataProxyPrivate *dptrc() const;
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h
index d984b9d4..bec213f9 100644
--- a/src/datavisualization/data/qcustom3ditem.h
+++ b/src/datavisualization/data/qcustom3ditem.h
@@ -45,10 +45,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DItem : public QObject
Q_PROPERTY(bool scalingAbsolute READ isScalingAbsolute WRITE setScalingAbsolute NOTIFY scalingAbsoluteChanged REVISION 1)
public:
- explicit QCustom3DItem(QObject *parent = 0);
+ explicit QCustom3DItem(QObject *parent = Q_NULLPTR);
explicit QCustom3DItem(const QString &meshFile, const QVector3D &position,
const QVector3D &scaling, const QQuaternion &rotation,
- const QImage &texture, QObject *parent = 0);
+ const QImage &texture, QObject *parent = Q_NULLPTR);
virtual ~QCustom3DItem();
void setMeshFile(const QString &meshFile);
@@ -94,7 +94,7 @@ Q_SIGNALS:
Q_REVISION(1) void scalingAbsoluteChanged(bool scalingAbsolute);
protected:
- QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = 0);
+ QCustom3DItem(QCustom3DItemPrivate *d, QObject *parent = Q_NULLPTR);
QScopedPointer<QCustom3DItemPrivate> d_ptr;
diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h
index 81040a01..798303df 100644
--- a/src/datavisualization/data/qcustom3dlabel.h
+++ b/src/datavisualization/data/qcustom3dlabel.h
@@ -45,10 +45,10 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DLabel : public QCustom3DItem
Q_PROPERTY(bool facingCamera READ isFacingCamera WRITE setFacingCamera NOTIFY facingCameraChanged)
public:
- explicit QCustom3DLabel(QObject *parent = 0);
+ explicit QCustom3DLabel(QObject *parent = Q_NULLPTR);
explicit QCustom3DLabel(const QString &text, const QFont &font, const QVector3D &position,
const QVector3D &scaling, const QQuaternion &rotation,
- QObject *parent = 0);
+ QObject *parent = Q_NULLPTR);
virtual ~QCustom3DLabel();
void setText(const QString &text);
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);
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index d78722af..a6517cd4 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -42,9 +42,9 @@ class QT_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDa
Q_PROPERTY(float maxZValue READ maxZValue WRITE setMaxZValue NOTIFY maxZValueChanged)
public:
- explicit QHeightMapSurfaceDataProxy(QObject *parent = 0);
- explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = 0);
- explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = 0);
+ explicit QHeightMapSurfaceDataProxy(QObject *parent = Q_NULLPTR);
+ explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = Q_NULLPTR);
+ explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = Q_NULLPTR);
virtual ~QHeightMapSurfaceDataProxy();
void setHeightMap(const QImage &image);
@@ -71,7 +71,7 @@ Q_SIGNALS:
void maxZValueChanged(float value);
protected:
- explicit QHeightMapSurfaceDataProxy(QHeightMapSurfaceDataProxyPrivate *d, QObject *parent = 0);
+ explicit QHeightMapSurfaceDataProxy(QHeightMapSurfaceDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
QHeightMapSurfaceDataProxyPrivate *dptr();
const QHeightMapSurfaceDataProxyPrivate *dptrc() const;
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 2e756019..7de8ebf5 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -62,24 +62,24 @@ public:
MMBCumulative = 3
};
- explicit QItemModelBarDataProxy(QObject *parent = 0);
- QItemModelBarDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0);
- QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &valueRole,
- QObject *parent = 0);
- QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
- const QString &columnRole, const QString &valueRole,
- QObject *parent = 0);
- QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
- const QString &columnRole, const QString &valueRole,
- const QString &rotationRole, QObject *parent = 0);
- QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
- const QString &columnRole, const QString &valueRole,
- const QStringList &rowCategories, const QStringList &columnCategories,
- QObject *parent = 0);
- QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
- const QString &columnRole, const QString &valueRole,
- const QString &rotationRole, const QStringList &rowCategories,
- const QStringList &columnCategories, QObject *parent = 0);
+ explicit QItemModelBarDataProxy(QObject *parent = Q_NULLPTR);
+ explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+ explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &valueRole,
+ QObject *parent = Q_NULLPTR);
+ explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+ const QString &columnRole, const QString &valueRole,
+ QObject *parent = Q_NULLPTR);
+ explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+ const QString &columnRole, const QString &valueRole,
+ const QString &rotationRole, QObject *parent = Q_NULLPTR);
+ explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+ const QString &columnRole, const QString &valueRole,
+ const QStringList &rowCategories, const QStringList &columnCategories,
+ QObject *parent = Q_NULLPTR);
+ explicit QItemModelBarDataProxy(QAbstractItemModel *itemModel, const QString &rowRole,
+ const QString &columnRole, const QString &valueRole,
+ const QString &rotationRole, const QStringList &rowCategories,
+ const QStringList &columnCategories, QObject *parent = Q_NULLPTR);
virtual ~QItemModelBarDataProxy();
void setItemModel(QAbstractItemModel *itemModel);
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index 42666a70..ef186919 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -49,15 +49,15 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa
Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION 1)
public:
- explicit QItemModelScatterDataProxy(QObject *parent = 0);
- QItemModelScatterDataProxy(QAbstractItemModel *itemModel, QObject *parent = 0);
- QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
- const QString &xPosRole, const QString &yPosRole,
- const QString &zPosRole, QObject *parent = 0);
- QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
- const QString &xPosRole, const QString &yPosRole,
- const QString &zPosRole, const QString &rotationRole,
- QObject *parent = 0);
+ explicit QItemModelScatterDataProxy(QObject *parent = Q_NULLPTR);
+ explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel, QObject *parent = Q_NULLPTR);
+ explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
+ const QString &xPosRole, const QString &yPosRole,
+ const QString &zPosRole, QObject *parent = Q_NULLPTR);
+ explicit QItemModelScatterDataProxy(QAbstractItemModel *itemModel,
+ const QString &xPosRole, const QString &yPosRole,
+ const QString &zPosRole, const QString &rotationRole,
+ QObject *parent = Q_NULLPTR);
virtual ~QItemModelScatterDataProxy();
void setItemModel(QAbstractItemModel *itemModel);
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);
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 8a0bce5b..b88dcda2 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -37,8 +37,8 @@ class QT_DATAVISUALIZATION_EXPORT QScatter3DSeries : public QAbstract3DSeries
Q_PROPERTY(float itemSize READ itemSize WRITE setItemSize NOTIFY itemSizeChanged)
public:
- explicit QScatter3DSeries(QObject *parent = 0);
- explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = 0);
+ explicit QScatter3DSeries(QObject *parent = Q_NULLPTR);
+ explicit QScatter3DSeries(QScatterDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
virtual ~QScatter3DSeries();
void setDataProxy(QScatterDataProxy *proxy);
@@ -57,7 +57,7 @@ Q_SIGNALS:
void itemSizeChanged(float size);
protected:
- explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = 0);
+ explicit QScatter3DSeries(QScatter3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
QScatter3DSeriesPrivate *dptr();
const QScatter3DSeriesPrivate *dptrc() const;
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index 19c4c86a..92354354 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -43,7 +43,7 @@ class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
Q_PROPERTY(QScatter3DSeries *series READ series NOTIFY seriesChanged)
public:
- explicit QScatterDataProxy(QObject *parent = 0);
+ explicit QScatterDataProxy(QObject *parent = Q_NULLPTR);
virtual ~QScatterDataProxy();
QScatter3DSeries *series() const;
@@ -75,7 +75,7 @@ Q_SIGNALS:
void seriesChanged(QScatter3DSeries *series);
protected:
- explicit QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent = 0);
+ explicit QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
QScatterDataProxyPrivate *dptr();
const QScatterDataProxyPrivate *dptrc() const;
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index ffdbcb62..b99213ce 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -49,8 +49,8 @@ public:
};
Q_DECLARE_FLAGS(DrawFlags, DrawFlag)
- explicit QSurface3DSeries(QObject *parent = 0);
- explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = 0);
+ explicit QSurface3DSeries(QObject *parent = Q_NULLPTR);
+ explicit QSurface3DSeries(QSurfaceDataProxy *dataProxy, QObject *parent = Q_NULLPTR);
virtual ~QSurface3DSeries();
void setDataProxy(QSurfaceDataProxy *proxy);
@@ -83,7 +83,7 @@ Q_SIGNALS:
void textureFileChanged(const QString &filename);
protected:
- explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = 0);
+ explicit QSurface3DSeries(QSurface3DSeriesPrivate *d, QObject *parent = Q_NULLPTR);
QSurface3DSeriesPrivate *dptr();
const QSurface3DSeriesPrivate *dptrc() const;
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 609a6273..3c4ba7ac 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -45,7 +45,7 @@ class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
Q_PROPERTY(QSurface3DSeries *series READ series NOTIFY seriesChanged)
public:
- explicit QSurfaceDataProxy(QObject *parent = 0);
+ explicit QSurfaceDataProxy(QObject *parent = Q_NULLPTR);
virtual ~QSurfaceDataProxy();
QSurface3DSeries *series() const;
@@ -84,7 +84,7 @@ Q_SIGNALS:
void seriesChanged(QSurface3DSeries *series);
protected:
- explicit QSurfaceDataProxy(QSurfaceDataProxyPrivate *d, QObject *parent = 0);
+ explicit QSurfaceDataProxy(QSurfaceDataProxyPrivate *d, QObject *parent = Q_NULLPTR);
QSurfaceDataProxyPrivate *dptr();
const QSurfaceDataProxyPrivate *dptrc() const;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 19:37:06 +0000