diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:33 +0200 |
| commit | 13a8c4eb9977a962fd70a91c6e5801f7a6506900 (patch) | |
| tree | c7baf2d0bfedcea8e51d996d5a336d29064d73d7 /src/datavisualization/data/qitemmodelscatterdataproxy.h | |
| parent | 5ad9e88e1a08efc57739e9ea6d98199b416a4178 (diff) | |
| parent | 8427634773505f73ce030cf68761c4719eb03e5c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I17383a4cdebb3c54489f6f39e1ad7ae136d80971
Diffstat (limited to 'src/datavisualization/data/qitemmodelscatterdataproxy.h')
| -rw-r--r-- | src/datavisualization/data/qitemmodelscatterdataproxy.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index 5015f1df..5e74d052 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -57,15 +57,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); |