OSDN Git Service

use boolean instead of pointer as qRegisterMetaType<T>() argument [ci reset]
authorIvailo Monev <xakepa10@gmail.com>
Fri, 27 Aug 2021 00:35:58 +0000 (03:35 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Fri, 27 Aug 2021 00:35:58 +0000 (03:35 +0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/kernel/qmetatype.h

index 8d1dbba..f8cd0ca 100644 (file)
@@ -155,9 +155,9 @@ namespace QtPrivate {
 }
 
 template <typename T>
-int qRegisterMetaType(const char *typeName, T * dummy = nullptr)
+int qRegisterMetaType(const char *typeName, bool notypedef = false)
 {
-    const int typedefOf = dummy ? -1 : QtPrivate::QMetaTypeIdHelper<T>::qt_metatype_id();
+    const int typedefOf = (notypedef ? -1 : QtPrivate::QMetaTypeIdHelper<T>::qt_metatype_id());
     if (typedefOf != -1)
         return QMetaType::registerTypedef(typeName, typedefOf);
 
@@ -224,8 +224,7 @@ inline int qRegisterMetaTypeStreamOperators()
         static int qt_metatype_id()                                     \
             {                                                           \
                 static int metatype_id =                                \
-                    qRegisterMetaType< TYPE >(#TYPE,                    \
-                    reinterpret_cast< TYPE *>(quintptr(-1)));           \
+                    qRegisterMetaType< TYPE >(#TYPE, true);             \
                 return metatype_id;                                     \
             }                                                           \
     };                                                                  \