diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-03 17:30:51 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-03 17:36:54 (GMT) |
| commit | 9b60566af57543310a7b5bec03b5de1e24c7f746 (patch) | |
| tree | 314e1aab999ca4d5f2f2b96580d0234853043090 /src/corelib | |
| parent | bfd0d6557dc54c0fd0270de6c138ea1031ea092c (diff) | |
| download | Qt-9b60566af57543310a7b5bec03b5de1e24c7f746.zip Qt-9b60566af57543310a7b5bec03b5de1e24c7f746.tar.gz Qt-9b60566af57543310a7b5bec03b5de1e24c7f746.tar.bz2 | |
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
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 15 |
1 files changed, 1 insertions, 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; } \ }; \ |