Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use boolean instead of pointer as qRegisterMetaType<T>() argument [ci reset]

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-08-27 03:35:58 +03:00
parent 641529f690
commit 96a8f8f5f4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/kernel/qmetatype.h
View file

@ -155,9 +155,9 @@ namespace QtPrivate {
} }
template <typename T> 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) if (typedefOf != -1)
return QMetaType::registerTypedef(typeName, typedefOf); return QMetaType::registerTypedef(typeName, typedefOf);
@ -224,8 +224,7 @@ inline int qRegisterMetaTypeStreamOperators()
static int qt_metatype_id() \ static int qt_metatype_id() \
{ \ { \
static int metatype_id = \ static int metatype_id = \
qRegisterMetaType< TYPE >(#TYPE, \ qRegisterMetaType< TYPE >(#TYPE, true); \
reinterpret_cast< TYPE *>(quintptr(-1))); \
return metatype_id; \ return metatype_id; \
} \ } \
}; \ }; \