diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-02 08:37:48 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-02 09:09:38 +0200 |
| commit | b51218483bdd877bf89c0634e798916df4aec2ab (patch) | |
| tree | 02eb1e87cb64fbe625350a2bdd6f3fd1ceb6eed1 /src/corelib/kernel/qmetatype_p.h | |
| parent | f4e610604715d9e9a2aab4c368b2ca35287c14e5 (diff) | |
QMetaType: Add namespace where necessary
Change-Id: I973522331bec057bcf0ddb72e46776249dff8aa8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype_p.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 00d57a7e68..e4e2aa9e43 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -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 |