From 1dc86cbe8570a9aea746700c3564beeabc7aede9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@nokia.com>
Date: Mon, 19 Dec 2011 16:55:47 +0100
Subject: [PATCH] Remove redundant template parameter from QMetaType's internal
 classes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Filter doesn't have to be a parameter because we always use
DefinedTypesFilter.

Change-Id: I19b8eb47a4c50e290cf712f909aaead8fdc94cd9
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/corelib/kernel/qmetatype.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 02cf9ae49cf..e72cd7c5751 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1410,9 +1410,8 @@ void QMetaType::destroy(int type, void *data)
 }
 
 namespace {
-template<class Filter>
 class TypeConstructor {
-    template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
+    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
     struct ConstructorImpl {
         static void *Construct(const int /*type*/, void *where, const T *copy) { return qMetaTypeConstructHelper(where, copy); }
     };
@@ -1497,15 +1496,14 @@ void *QMetaType::construct(int type, void *where, const void *copy)
 {
     if (!where)
         return 0;
-    TypeConstructor<DefinedTypesFilter> constructor(type, where);
+    TypeConstructor constructor(type, where);
     return QMetaTypeSwitcher::switcher<void*>(constructor, type, copy);
 }
 
 
 namespace {
-template<class Filter>
 class TypeDestructor {
-    template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
+    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
     struct DestructorImpl {
         static void Destruct(const int /* type */, T *where) { qMetaTypeDestructHelper(where); }
     };
@@ -1573,15 +1571,14 @@ void QMetaType::destruct(int type, void *where)
 {
     if (!where)
         return;
-    TypeDestructor<DefinedTypesFilter> destructor(type);
+    TypeDestructor destructor(type);
     QMetaTypeSwitcher::switcher<void>(destructor, type, where);
 }
 
 
 namespace {
-template<class Filter>
 class SizeOf {
-    template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
+    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
     struct SizeOfImpl {
         static int Size(const int) { return sizeof(T); }
     };
@@ -1640,7 +1637,7 @@ private:
 */
 int QMetaType::sizeOf(int type)
 {
-    SizeOf<DefinedTypesFilter> sizeOf(type);
+    SizeOf sizeOf(type);
     return QMetaTypeSwitcher::switcher<int>(sizeOf, type, 0);
 }