whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMetaType: Add namespace where necessary 

Change-Id: I973522331bec057bcf0ddb72e46776249dff8aa8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Fabian Kosmale 2020-04-02 08:37:48 +02:00
parent f4e6106047
commit b51218483b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qmetatype.cpp
View File

@ -659,7 +659,7 @@ void QMetaType::destruct(void *data) const
}
}
void QtMetaTypePrivate::derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr)
void QtMetaTypePrivate::derefAndDestroy(NS(QtPrivate::QMetaTypeInterface) *d_ptr)
{
if (d_ptr && !d_ptr->ref.deref()) {
if (auto reg = customTypeRegistry())

6
src/corelib/kernel/qmetatype_p.h
View File

@ -193,12 +193,12 @@ template<> struct TypeDefinition<QIcon> { static const bool IsAvailable = false;
#endif
template<typename T>
static QtPrivate::QMetaTypeInterface *getInterfaceFromType()
static QT_PREPEND_NAMESPACE(QtPrivate::QMetaTypeInterface) *getInterfaceFromType()
{
if constexpr (std::is_same_v<T, void>) {
return nullptr;
} else if constexpr (QtMetaTypePrivate::TypeDefinition<T>::IsAvailable) {
return &QtPrivate::QMetaTypeForType<T>::metaType;
return &QT_PREPEND_NAMESPACE(QtPrivate::QMetaTypeForType)<T>::metaType;
}
return nullptr;
}
@ -217,7 +217,7 @@ static QtPrivate::QMetaTypeInterface *getInterfaceFromType()
QtMetaTypePrivate::QMetaTypeFunctionHelper<RealName, QtMetaTypePrivate::TypeDefinition<RealName>::IsAvailable>::Load(stream, data); \
return true;
void derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr);
void derefAndDestroy(QT_PREPEND_NAMESPACE(QtPrivate::QMetaTypeInterface) *d_ptr);
} //namespace QtMetaTypePrivate