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/qitemmodelbardataproxy.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/qitemmodelbardataproxy.h')
-rw-r--r-- | src/datavisualization/data/qitemmodelbardataproxy.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h index 30a5933c..648984e5 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.h +++ b/src/datavisualization/data/qitemmodelbardataproxy.h @@ -70,24 +70,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); |