From 7554105eee2060a53f9825d5db067468e50112f8 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 4 Apr 2011 14:39:28 +0200
Subject: [PATCH] Fix memcheck test compiler warnings.

Merge-request: 284
Reviewed-by: hjk <qtc-committer@nokia.com>
---
 tests/valgrind/memcheck/testapps/leak1/main.cpp |  2 +-
 tests/valgrind/memcheck/testapps/leak4/main.cpp |  2 +-
 tests/valgrind/memcheck/testrunner.cpp          | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/valgrind/memcheck/testapps/leak1/main.cpp b/tests/valgrind/memcheck/testapps/leak1/main.cpp
index 540a6806f0d..db71561a6bb 100644
--- a/tests/valgrind/memcheck/testapps/leak1/main.cpp
+++ b/tests/valgrind/memcheck/testapps/leak1/main.cpp
@@ -2,6 +2,6 @@
 
 int main()
 {
-    qint64 *i = new qint64;
+    new qint64;
     return 0;
 }
diff --git a/tests/valgrind/memcheck/testapps/leak4/main.cpp b/tests/valgrind/memcheck/testapps/leak4/main.cpp
index d0874353399..79999a5c9ad 100644
--- a/tests/valgrind/memcheck/testapps/leak4/main.cpp
+++ b/tests/valgrind/memcheck/testapps/leak4/main.cpp
@@ -11,7 +11,7 @@ struct Foo
 
 int main()
 {
-    Foo *f = new Foo;
+    new Foo;
 
     return 0;
 }
diff --git a/tests/valgrind/memcheck/testrunner.cpp b/tests/valgrind/memcheck/testrunner.cpp
index 5d6f5bc19a4..ee0bcdcaf4f 100644
--- a/tests/valgrind/memcheck/testrunner.cpp
+++ b/tests/valgrind/memcheck/testrunner.cpp
@@ -264,7 +264,7 @@ void TestRunner::testLeak4()
     {
         const Frame frame = stack.frames().at(2);
         QCOMPARE(frame.functionName(), QString("main"));
-        QCOMPARE(frame.line(), 13);
+        QCOMPARE(frame.line(), 14);
 
         QCOMPARE(frame.object(), binary);
         QCOMPARE(frame.file(), QLatin1String("main.cpp"));
@@ -272,8 +272,8 @@ void TestRunner::testLeak4()
     }
     {
         const Frame frame = stack.frames().at(1);
-        QCOMPARE(frame.functionName(), QString("foo::foo()"));
-        QCOMPARE(frame.line(), 5);
+        QCOMPARE(frame.functionName(), QString("Foo::Foo()"));
+        QCOMPARE(frame.line(), 6);
 
         QCOMPARE(frame.object(), binary);
         QCOMPARE(frame.file(), QLatin1String("main.cpp"));
@@ -282,7 +282,7 @@ void TestRunner::testLeak4()
     {
         const Frame frame = stack.frames().at(2);
         QCOMPARE(frame.functionName(), QString("main"));
-        QCOMPARE(frame.line(), 13);
+        QCOMPARE(frame.line(), 14);
 
         QCOMPARE(frame.object(), binary);
         QCOMPARE(frame.file(), QLatin1String("main.cpp"));
@@ -306,7 +306,7 @@ void TestRunner::testLeak4()
     {
         const Frame frame = stack.frames().at(1);
         QCOMPARE(frame.functionName(), QString("main"));
-        QCOMPARE(frame.line(), 13);
+        QCOMPARE(frame.line(), 14);
 
         QCOMPARE(frame.object(), binary);
         QCOMPARE(frame.file(), QLatin1String("main.cpp"));
@@ -444,7 +444,7 @@ void TestRunner::uninit3()
 
     const Frame frame = stack.frames().first();
     QCOMPARE(frame.functionName(), QString("main"));
-    QCOMPARE(frame.line(), 3);
+    QCOMPARE(frame.line(), 4);
 
     QCOMPARE(frame.object(), binary);
     QCOMPARE(frame.file(), QLatin1String("main.cpp"));
@@ -458,7 +458,7 @@ void TestRunner::uninit3()
 
     const Frame frame = stack.frames().first();
     QCOMPARE(frame.functionName(), QString("main"));
-    QCOMPARE(frame.line(), 1);
+    QCOMPARE(frame.line(), 2);
 
     QCOMPARE(frame.object(), binary);
     QCOMPARE(frame.file(), QLatin1String("main.cpp"));
@@ -477,7 +477,7 @@ void TestRunner::uninit3()
 
     const Frame frame = stack.frames().first();
     QCOMPARE(frame.functionName(), QString("main"));
-    QCOMPARE(frame.line(), 3);
+    QCOMPARE(frame.line(), 4);
 
     QCOMPARE(frame.object(), binary);
     QCOMPARE(frame.file(), QLatin1String("main.cpp"));