From b6bf8a4b70091f836a20f4848d3dc00e82bafe3c Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Thu, 6 Nov 2014 11:36:23 +0200
Subject: Fixed Valgrind reported issues in cpp tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I284832fc697e0ac6ef1ba1bb857892a10cbcd8fd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 .../auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp  | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp')

diff --git a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
index c65e151b..ef7e0663 100644
--- a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
@@ -164,7 +164,7 @@ void tst_proxy::initializeProperties()
 {
     QVERIFY(m_proxy);
 
-    QTableWidget *table = new QTableWidget();
+    QTableWidget table;
 
     m_proxy->setAutoColumnCategories(false);
     m_proxy->setAutoRowCategories(false);
@@ -172,7 +172,7 @@ void tst_proxy::initializeProperties()
     m_proxy->setColumnRole("column");
     m_proxy->setColumnRolePattern(QRegExp("/^.*-(\\d\\d)$/"));
     m_proxy->setColumnRoleReplace("\\\\1");
-    m_proxy->setItemModel(table->model());
+    m_proxy->setItemModel(table.model());
     m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBAverage);
     m_proxy->setRotationRole("rotation");
     m_proxy->setRotationRolePattern(QRegExp("/-/"));
@@ -209,28 +209,28 @@ void tst_proxy::initializeProperties()
 
 void tst_proxy::multiMatch()
 {
-    Q3DBars *graph = new Q3DBars();
+    Q3DBars graph;
 
-    QTableWidget *table = new QTableWidget();
+    QTableWidget table;
     QStringList rows;
     rows << "row 1" << "row 2" << "row 3";
     QStringList columns;
     columns << "col 1";
     const char *values[1][3] = {{"0/0/3.5/30", "0/0/5.0/30", "0/0/6.5/30"}};
 
-    table->setRowCount(1);
-    table->setColumnCount(3);
+    table.setRowCount(1);
+    table.setColumnCount(3);
 
     for (int col = 0; col < columns.size(); col++) {
         for (int row = 0; row < rows.size(); row++) {
-            QModelIndex index = table->model()->index(col, row);
-            table->model()->setData(index, values[col][row]);
+            QModelIndex index = table.model()->index(col, row);
+            table.model()->setData(index, values[col][row]);
         }
     }
 
-    m_proxy->setItemModel(table->model());
-    m_proxy->setRowRole(table->model()->roleNames().value(Qt::DisplayRole));
-    m_proxy->setColumnRole(table->model()->roleNames().value(Qt::DisplayRole));
+    m_proxy->setItemModel(table.model());
+    m_proxy->setRowRole(table.model()->roleNames().value(Qt::DisplayRole));
+    m_proxy->setColumnRole(table.model()->roleNames().value(Qt::DisplayRole));
     m_proxy->setRowRolePattern(QRegExp(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setRowRoleReplace(QStringLiteral("\\2"));
     m_proxy->setValueRolePattern(QRegExp(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$")));
@@ -240,27 +240,29 @@ void tst_proxy::multiMatch()
 
     QBar3DSeries *series = new QBar3DSeries(m_proxy);
 
-    graph->addSeries(series);
+    graph.addSeries(series);
 
     QCoreApplication::processEvents();
-    QCOMPARE(graph->valueAxis()->max(), 6.5f);
+    QCOMPARE(graph.valueAxis()->max(), 6.5f);
     m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBFirst);
     QCoreApplication::processEvents();
-    QCOMPARE(graph->valueAxis()->max(), 3.5f);
+    QCOMPARE(graph.valueAxis()->max(), 3.5f);
     m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBLast);
     QCoreApplication::processEvents();
-    QCOMPARE(graph->valueAxis()->max(), 6.5f);
+    QCOMPARE(graph.valueAxis()->max(), 6.5f);
     m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBAverage);
     QCoreApplication::processEvents();
-    QCOMPARE(graph->valueAxis()->max(), 5.0f);
+    QCOMPARE(graph.valueAxis()->max(), 5.0f);
     m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBCumulative);
     QCoreApplication::processEvents();
-    QCOMPARE(graph->valueAxis()->max(), 15.0f);
+    QCOMPARE(graph.valueAxis()->max(), 15.0f);
 
     QCOMPARE(m_proxy->columnLabels().count(), 1);
     QCOMPARE(m_proxy->rowCount(), 1);
     QCOMPARE(m_proxy->rowLabels().count(), 1);
     QVERIFY(m_proxy->series());
+
+    m_proxy = 0; // Proxy gets deleted as graph gets deleted
 }
 
 QTEST_MAIN(tst_proxy)
-- 
cgit v1.2.3