diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
commit | 8427634773505f73ce030cf68761c4719eb03e5c (patch) | |
tree | 56d0e488e533778782b55c54aa3ab07f0d5e888d /src/datavisualization/data/qitemmodelscatterdataproxy.h | |
parent | 3fb7ce6a29ca69237c777cc65a3831768e938782 (diff) | |
parent | 364ed207af1becd2b85d93bc87d5db84624b4381 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
src/datavisualization/utils/qutils.h
Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
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); |