From: Marc Mutz <marc.mutz@kdab.com>
Date: Wed, 25 Jul 2012 13:27:59 +0000 (+0200)
Subject: tst_qmetatype: fix two more unused typedefs (GCC 4.8 warning)
X-Git-Tag: v5.0.0-beta1~600
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff453fa757c154e9234541c5cda47014a0803538;p=profile%2Fivi%2Fqtbase.git

tst_qmetatype: fix two more unused typedefs (GCC 4.8 warning)

Also check the return value of
DefaultValueFactory<QMetaType::Void>::create(), the same way it's
done in testCreateHelper<QMetaType::Void>().

Change-Id: I3e6d7fca4ea74dbe65009f2eb2c64a1b3a370d68
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---

diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index b5169fe..8247385 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -628,7 +628,6 @@ static void testCreateHelper()
 template<>
 void testCreateHelper<QMetaType::Void>()
 {
-    typedef MetaEnumToType<QMetaType::Void>::Type Type;
     void *actual = QMetaType::create(QMetaType::Void);
     if (DefaultValueTraits<QMetaType::Void>::IsInitialized) {
         QVERIFY(DefaultValueFactory<QMetaType::Void>::create());
@@ -968,13 +967,12 @@ static void testConstructHelper()
 template<>
 void testConstructHelper<QMetaType::Void>()
 {
-    typedef MetaEnumToType<QMetaType::Void>::Type Type;
     /*int size = */ QMetaType::sizeOf(QMetaType::Void);
     void *storage = 0;
     void *actual = QMetaType::construct(QMetaType::Void, storage, /*copy=*/0);
     QCOMPARE(actual, storage);
     if (DefaultValueTraits<QMetaType::Void>::IsInitialized) {
-        /*Type *expected = */ DefaultValueFactory<QMetaType::Void>::create();
+        QVERIFY(DefaultValueFactory<QMetaType::Void>::create());
     }
     QMetaType::destruct(QMetaType::Void, actual);
     qFreeAligned(storage);