Integrated item model mappings to item model proxies

Separate mapping object was redundant.

Task-number: QTRD-2564
Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 13 insertions, 15 deletions

diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index e602dedc..10b4ccc5 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "surfaceitemmodelhandler_p.h"
-#include "qitemmodelsurfacedatamapping_p.h"
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
@@ -35,15 +34,14 @@ SurfaceItemModelHandler::~SurfaceItemModelHandler()
 // Resolve entire item model into QSurfaceDataArray.
 void SurfaceItemModelHandler::resolveModel()
 {
-    QItemModelSurfaceDataMapping *mapping = static_cast<QItemModelSurfaceDataMapping *>(m_activeMapping);
-    if (m_itemModel.isNull() || !mapping) {
+    if (m_itemModel.isNull()) {
         m_proxy->resetArray(0);
         m_proxyArray = 0;
         return;
     }
 
-    if (!mapping->useModelCategories()
-            && (mapping->rowRole().isEmpty() || mapping->columnRole().isEmpty())) {
+    if (!m_proxy->useModelCategories()
+            && (m_proxy->rowRole().isEmpty() || m_proxy->columnRole().isEmpty())) {
         m_proxy->resetArray(0);
         m_proxyArray = 0;
         return;
@@ -52,11 +50,11 @@ void SurfaceItemModelHandler::resolveModel()
     QHash<int, QByteArray> roleHash = m_itemModel->roleNames();
 
     // Default to display role if no mapping
-    int valueRole = roleHash.key(mapping->valueRole().toLatin1(), Qt::DisplayRole);
+    int valueRole = roleHash.key(m_proxy->valueRole().toLatin1(), Qt::DisplayRole);
     int rowCount = m_itemModel->rowCount();
     int columnCount = m_itemModel->columnCount();
 
-    if (mapping->useModelCategories()) {
+    if (m_proxy->useModelCategories()) {
         // If dimensions have changed, recreate the array
         if (m_proxyArray != m_proxy->array() || columnCount != m_proxy->columnCount()
                 || rowCount != m_proxyArray->size()) {
@@ -75,11 +73,11 @@ void SurfaceItemModelHandler::resolveModel()
             }
         }
     } else {
-        int rowRole = roleHash.key(mapping->rowRole().toLatin1());
-        int columnRole = roleHash.key(mapping->columnRole().toLatin1());
+        int rowRole = roleHash.key(m_proxy->rowRole().toLatin1());
+        int columnRole = roleHash.key(m_proxy->columnRole().toLatin1());
 
-        bool generateRows = mapping->autoRowCategories();
-        bool generateColumns = mapping->autoColumnCategories();
+        bool generateRows = m_proxy->autoRowCategories();
+        bool generateColumns = m_proxy->autoColumnCategories();
 
         QStringList rowList;
         QStringList columnList;
@@ -109,14 +107,14 @@ void SurfaceItemModelHandler::resolveModel()
         }
 
         if (generateRows)
-            mapping->dptr()->m_rowCategories = rowList;
+            m_proxy->dptr()->m_rowCategories = rowList;
         else
-            rowList = mapping->rowCategories();
+            rowList = m_proxy->rowCategories();
 
         if (generateColumns)
-            mapping->dptr()->m_columnCategories = columnList;
+            m_proxy->dptr()->m_columnCategories = columnList;
         else
-            columnList = mapping->columnCategories();
+            columnList = m_proxy->columnCategories();
 
         // If dimensions have changed, recreate the array
         if (m_proxyArray != m_proxy->array() || columnList.size() != m_proxy->columnCount()