diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-03 12:26:53 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-03 12:31:43 +0200 |
commit | 5a3abb2517126239f1b916b7b0cbaaa624b1cb44 (patch) | |
tree | 22c868698454c7e13179f9c0e91d1b34a3d8d513 /src/datavisualization/data/qitemmodelscatterdataproxy.cpp | |
parent | f44e0e8e858c8687e40eba679f865f142b73be01 (diff) |
move connectItemModelHandler() from public proxies to private
Task-id: QTRD-2672
Change-Id: I64983784e600fb4e21d7d51a2099b1f57bd8fc0f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/data/qitemmodelscatterdataproxy.cpp')
-rw-r--r-- | src/datavisualization/data/qitemmodelscatterdataproxy.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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<const QItemModelScatterDataProxyPrivate *>(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 |