From b49bd4aea2265de243e41c19ffa44f04759bcf8d Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 3 Jun 2014 14:15:50 +0300
Subject: Misc fixes found during testing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Memory leaks
- Y-axis placement issues in scatter and surface

Change-Id: I7ec6c9c3e53502445b52c049c973186a7c54c95f
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualization/data/baritemmodelhandler.cpp     | 2 ++
 src/datavisualization/data/surfaceitemmodelhandler.cpp | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/datavisualization/data')

diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index a899ef39..62e6390d 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -282,6 +282,8 @@ void BarItemModelHandler::resolveModel()
         rowLabels = rowList;
         columnLabels = columnList;
         m_columnCount = columnList.size();
+
+        delete matchCountMap;
     }
 
     m_proxy->resetArray(m_proxyArray, rowLabels, columnLabels);
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index e3d50a80..e6d1e70d 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -313,6 +313,8 @@ void SurfaceItemModelHandler::resolveModel()
                 newProxyRow[j].setPosition(itemPos);
             }
         }
+
+        delete matchCountMap;
     }
 
     m_proxy->resetArray(m_proxyArray);
-- 
cgit v1.2.3