From 9b60566af57543310a7b5bec03b5de1e24c7f746 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Wed, 3 Mar 2010 18:30:51 +0100
Subject: Fix source compatibility of qRegisterMetaType

ActiveQt is having construct like
qRegisterMetaType("Foo*", (Foo*)0 );
instead of
qRegisterMetaType<Foo *>("Foo*");
Which the compiler could not disambiguate anymore since
commit 03daf059647c0a0222e8774b0a083f58c8e64934

Reviewed-by: Thierry
---
 src/corelib/kernel/qmetatype.h | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 98ed4bd..2108b92 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -173,7 +173,7 @@ namespace QtPrivate {
 template <typename T>
 int qRegisterMetaType(const char *typeName
 #ifndef qdoc
-    , typename QMetaTypeId2<T>::CustomType * dummy = 0
+    , T * dummy = 0
 #endif
 )
 {
@@ -190,17 +190,6 @@ int qRegisterMetaType(const char *typeName
                                    reinterpret_cast<QMetaType::Constructor>(cptr));
 }
 
-template <typename T>
-int qRegisterMetaType(const char *typeName
-#ifndef qdoc
-    , typename QMetaTypeId2<T>::BuiltinType * /* dummy */ = 0
-#endif
-)
-{
-    return QMetaType::registerTypedef(typeName, QMetaTypeId2<T>::MetaType);
-}
-
-
 #ifndef QT_NO_DATASTREAM
 template <typename T>
 void qRegisterMetaTypeStreamOperators(const char *typeName
@@ -229,7 +218,6 @@ struct QMetaTypeId
 template <typename T>
 struct QMetaTypeId2
 {
-    typedef T CustomType;
     enum { Defined = QMetaTypeId<T>::Defined };
     static inline int qt_metatype_id() { return QMetaTypeId<T>::qt_metatype_id(); }
 };
@@ -297,7 +285,6 @@ inline int qRegisterMetaTypeStreamOperators()
     QT_BEGIN_NAMESPACE \
     template<> struct QMetaTypeId2<TYPE> \
     { \
-        typedef TYPE BuiltinType; \
         enum { Defined = 1, MetaType = QMetaType::NAME }; \
         static inline int qt_metatype_id() { return QMetaType::NAME; } \
     }; \
-- 
cgit v0.12