From 5a3abb2517126239f1b916b7b0cbaaa624b1cb44 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 3 Dec 2013 12:26:53 +0200 Subject: move connectItemModelHandler() from public proxies to private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-id: QTRD-2672 Change-Id: I64983784e600fb4e21d7d51a2099b1f57bd8fc0f Reviewed-by: Tomi Korpipää --- .../data/qitemmodelbardataproxy.cpp | 50 +++++++++++----------- .../data/qitemmodelbardataproxy.h | 1 - .../data/qitemmodelbardataproxy_p.h | 2 + .../data/qitemmodelscatterdataproxy.cpp | 24 +++++------ .../data/qitemmodelscatterdataproxy.h | 1 - .../data/qitemmodelscatterdataproxy_p.h | 2 + .../data/qitemmodelsurfacedataproxy.cpp | 50 +++++++++++----------- .../data/qitemmodelsurfacedataproxy.h | 1 - .../data/qitemmodelsurfacedataproxy_p.h | 2 + tests/qmldynamicdata/qml/qmldynamicdata/main.qml | 6 +-- 10 files changed, 71 insertions(+), 68 deletions(-) diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp index 71bb6c75..e3354015 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.cpp +++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp @@ -143,7 +143,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE QItemModelBarDataProxy::QItemModelBarDataProxy(QObject *parent) : QBarDataProxy(new QItemModelBarDataProxyPrivate(this), parent) { - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -154,7 +154,7 @@ QItemModelBarDataProxy::QItemModelBarDataProxy(const QAbstractItemModel *itemMod : QBarDataProxy(new QItemModelBarDataProxyPrivate(this), parent) { setItemModel(itemModel); - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -171,7 +171,7 @@ QItemModelBarDataProxy::QItemModelBarDataProxy(const QAbstractItemModel *itemMod dptr()->m_itemModelHandler->setItemModel(itemModel); dptr()->m_valueRole = valueRole; dptr()->m_useModelCategories = true; - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -189,7 +189,7 @@ QItemModelBarDataProxy::QItemModelBarDataProxy(const QAbstractItemModel *itemMod dptr()->m_rowRole = rowRole; dptr()->m_columnRole = columnRole; dptr()->m_valueRole = valueRole; - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -216,7 +216,7 @@ QItemModelBarDataProxy::QItemModelBarDataProxy(const QAbstractItemModel *itemMod dptr()->m_columnCategories = columnCategories; dptr()->m_autoRowCategories = false; dptr()->m_autoColumnCategories = false; - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -446,26 +446,26 @@ const QItemModelBarDataProxyPrivate *QItemModelBarDataProxy::dptrc() const return static_cast(d_ptr.data()); } -void QItemModelBarDataProxy::connectItemModelHandler() -{ - QObject::connect(dptr()->m_itemModelHandler, &BarItemModelHandler::itemModelChanged, - this, &QItemModelBarDataProxy::itemModelChanged); - QObject::connect(this, &QItemModelBarDataProxy::rowRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelBarDataProxy::columnRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelBarDataProxy::valueRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelBarDataProxy::rowCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelBarDataProxy::columnCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelBarDataProxy::useModelCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelBarDataProxy::autoRowCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelBarDataProxy::autoColumnCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); +void QItemModelBarDataProxyPrivate::connectItemModelHandler() +{ + QObject::connect(m_itemModelHandler, &BarItemModelHandler::itemModelChanged, + qptr(), &QItemModelBarDataProxy::itemModelChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::rowRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::columnRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::valueRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::rowCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::columnCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::useModelCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::autoRowCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelBarDataProxy::autoColumnCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } // QItemModelBarDataProxyPrivate diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h index 81c46926..597ab48f 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.h +++ b/src/datavisualization/data/qitemmodelbardataproxy.h @@ -99,7 +99,6 @@ protected: const QItemModelBarDataProxyPrivate *dptrc() const; private: - void connectItemModelHandler(); Q_DISABLE_COPY(QItemModelBarDataProxy) friend class BarItemModelHandler; diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h index 6f71429c..63c5b3ff 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy_p.h +++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h @@ -43,6 +43,8 @@ public: QItemModelBarDataProxyPrivate(QItemModelBarDataProxy *q); virtual ~QItemModelBarDataProxyPrivate(); + void connectItemModelHandler(); + private: QItemModelBarDataProxy *qptr(); diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp index 471033e8..50b57423 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp @@ -96,7 +96,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE QItemModelScatterDataProxy::QItemModelScatterDataProxy(QObject *parent) : QScatterDataProxy(new QItemModelScatterDataProxyPrivate(this), parent) { - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -108,7 +108,7 @@ QItemModelScatterDataProxy::QItemModelScatterDataProxy(const QAbstractItemModel : QScatterDataProxy(new QItemModelScatterDataProxyPrivate(this), parent) { dptr()->m_itemModelHandler->setItemModel(itemModel); - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -128,7 +128,7 @@ QItemModelScatterDataProxy::QItemModelScatterDataProxy(const QAbstractItemModel dptr()->m_xPosRole = xPosRole; dptr()->m_yPosRole = yPosRole; dptr()->m_zPosRole = zPosRole; - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -235,16 +235,16 @@ const QItemModelScatterDataProxyPrivate *QItemModelScatterDataProxy::dptrc() con return static_cast(d_ptr.data()); } -void QItemModelScatterDataProxy::connectItemModelHandler() +void QItemModelScatterDataProxyPrivate::connectItemModelHandler() { - QObject::connect(dptr()->m_itemModelHandler, &ScatterItemModelHandler::itemModelChanged, - this, &QItemModelScatterDataProxy::itemModelChanged); - QObject::connect(this, &QItemModelScatterDataProxy::xPosRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelScatterDataProxy::yPosRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelScatterDataProxy::zPosRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(m_itemModelHandler, &ScatterItemModelHandler::itemModelChanged, + qptr(), &QItemModelScatterDataProxy::itemModelChanged); + QObject::connect(qptr(), &QItemModelScatterDataProxy::xPosRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelScatterDataProxy::yPosRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelScatterDataProxy::zPosRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } // QItemModelScatterDataProxyPrivate diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index 7c63ce2a..f2a7d78c 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -66,7 +66,6 @@ protected: const QItemModelScatterDataProxyPrivate *dptrc() const; private: - void connectItemModelHandler(); Q_DISABLE_COPY(QItemModelScatterDataProxy) friend class ScatterItemModelHandler; diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h index 43ab0ac2..8c86ef09 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h @@ -43,6 +43,8 @@ public: QItemModelScatterDataProxyPrivate(QItemModelScatterDataProxy *q); virtual ~QItemModelScatterDataProxyPrivate(); + void connectItemModelHandler(); + private: QItemModelScatterDataProxy *qptr(); diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp index 920878d5..191e0d7f 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp @@ -153,7 +153,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(QObject *parent) : QSurfaceDataProxy(new QItemModelSurfaceDataProxyPrivate(this), parent) { - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -164,7 +164,7 @@ QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel : QSurfaceDataProxy(new QItemModelSurfaceDataProxyPrivate(this), parent) { dptr()->m_itemModelHandler->setItemModel(itemModel); - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -181,7 +181,7 @@ QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel dptr()->m_itemModelHandler->setItemModel(itemModel); dptr()->m_valueRole = valueRole; dptr()->m_useModelCategories = true; - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -199,7 +199,7 @@ QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel dptr()->m_rowRole = rowRole; dptr()->m_columnRole = columnRole; dptr()->m_valueRole = valueRole; - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -226,7 +226,7 @@ QItemModelSurfaceDataProxy::QItemModelSurfaceDataProxy(const QAbstractItemModel dptr()->m_columnCategories = columnCategories; dptr()->m_autoRowCategories = false; dptr()->m_autoColumnCategories = false; - connectItemModelHandler(); + dptr()->connectItemModelHandler(); } /*! @@ -456,26 +456,26 @@ const QItemModelSurfaceDataProxyPrivate *QItemModelSurfaceDataProxy::dptrc() con return static_cast(d_ptr.data()); } -void QItemModelSurfaceDataProxy::connectItemModelHandler() -{ - QObject::connect(dptr()->m_itemModelHandler, &SurfaceItemModelHandler::itemModelChanged, - this, &QItemModelSurfaceDataProxy::itemModelChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::rowRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::columnRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::valueRoleChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::rowCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::columnCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::useModelCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::autoRowCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(this, &QItemModelSurfaceDataProxy::autoColumnCategoriesChanged, - dptr()->m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); +void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler() +{ + QObject::connect(m_itemModelHandler, &SurfaceItemModelHandler::itemModelChanged, + qptr(), &QItemModelSurfaceDataProxy::itemModelChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::rowRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::columnRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::valueRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::rowCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::columnCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::useModelCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::autoRowCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelSurfaceDataProxy::autoColumnCategoriesChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } // QItemModelSurfaceDataProxyPrivate diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h index 843fa3af..ee6b4d99 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h @@ -99,7 +99,6 @@ protected: const QItemModelSurfaceDataProxyPrivate *dptrc() const; private: - void connectItemModelHandler(); Q_DISABLE_COPY(QItemModelSurfaceDataProxy) friend class SurfaceItemModelHandler; diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h index 9af8d3ae..e4505c40 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h @@ -43,6 +43,8 @@ public: QItemModelSurfaceDataProxyPrivate(QItemModelSurfaceDataProxy *q); virtual ~QItemModelSurfaceDataProxyPrivate(); + void connectItemModelHandler(); + private: QItemModelSurfaceDataProxy *qptr(); diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml index 7453606a..e8e23b75 100644 --- a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml +++ b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml @@ -43,7 +43,7 @@ Item { if (isIncreasing) { graphModel.append({"xPos": Math.random(), "yPos": Math.random(), "zPos": Math.random()}); if (graphModel.count == 500) { - scatterGraph.theme.type = AbstractGraph3D.ThemeIsabelle; + scatterGraph.theme.type = Theme3D.ThemeIsabelle; isIncreasing = false; } } else { @@ -51,7 +51,7 @@ Item { // random index to add coverage. graphModel.remove(2); if (graphModel.count == 2) { - scatterGraph.theme.type = AbstractGraph3D.ThemeDigia; + scatterGraph.theme.type = Theme3D.ThemeDigia; isIncreasing = true; } } @@ -68,7 +68,7 @@ Item { id: scatterGraph width: dataView.width height: dataView.height - theme: Theme3D { type: AbstractGraph3D.ThemeDigia } + theme: Theme3D { type: Theme3D.ThemeDigia } shadowQuality: AbstractGraph3D.ShadowQualitySoftMedium scene.activeCamera.yRotation: 30.0 inputHandler: null -- cgit v1.2.3