From 7c942cc0f497fe7e61ce6a10fce45771c0858e09 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 26 Nov 2013 14:53:50 +0200 Subject: Integrated item model mappings to item model proxies Separate mapping object was redundant. Task-number: QTRD-2564 Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3 Reviewed-by: Mika Salmela --- src/datavisualization/data/scatteritemmodelhandler.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/datavisualization/data/scatteritemmodelhandler.cpp') diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index 34230ae0..a70b35b0 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -35,8 +35,7 @@ ScatterItemModelHandler::~ScatterItemModelHandler() // Resolve entire item model into QScatterDataArray. void ScatterItemModelHandler::resolveModel() { - QItemModelScatterDataMapping *mapping = static_cast(m_activeMapping); - if (m_itemModel.isNull() || !mapping) { + if (m_itemModel.isNull()) { m_proxy->resetArray(0); m_proxyArray = 0; return; @@ -45,9 +44,9 @@ void ScatterItemModelHandler::resolveModel() static const int noRoleIndex = -1; QHash roleHash = m_itemModel->roleNames(); - const int xPosRole = roleHash.key(mapping->xPosRole().toLatin1(), noRoleIndex); - const int yPosRole = roleHash.key(mapping->yPosRole().toLatin1(), noRoleIndex); - const int zPosRole = roleHash.key(mapping->zPosRole().toLatin1(), noRoleIndex); + const int xPosRole = roleHash.key(m_proxy->xPosRole().toLatin1(), noRoleIndex); + const int yPosRole = roleHash.key(m_proxy->yPosRole().toLatin1(), noRoleIndex); + const int zPosRole = roleHash.key(m_proxy->zPosRole().toLatin1(), noRoleIndex); const int columnCount = m_itemModel->columnCount(); const int rowCount = m_itemModel->rowCount(); const int totalCount = rowCount * columnCount; -- cgit v1.2.3