mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-24 10:52:56 +00:00
use boolean instead of pointer as qRegisterMetaType<T>() argument [ci reset]
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
641529f690
commit
96a8f8f5f4
1 changed files with 3 additions and 4 deletions
|
@ -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; \
|
||||
} \
|
||||
}; \
|
||||
|
|
Loading…
Add table
Reference in a new issue