diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-09-29 13:00:44 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-09-30 08:26:13 +0200 |
commit | 4f897584ec64d790ec8e58f10ad809847360d472 (patch) | |
tree | 4196f67880bfabe43b5856897934f940d0338f7a /src/corelib/kernel/qmetatype.h | |
parent | 684c9b82b9b8216f406c59deb35cd727ffb6d69b (diff) |
QMetaType: Expand and clean up converter/view function documentation
This adds a few snippets to show how the functions can be used, and also
removes workarounds for oldver versions of qdoc that weren't clang based
- those workarounds also seem to have caused some bitrot.
Remove documentation for an overload of registerMutableView that
currently does not exist (for a member function with an ok parameter).
Fixes: QTBUG-96963
Pick-to: 6.2
Change-Id: Ibc867d08bcacbc7add8c965df9864d6f339a5d54
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 9d4d7d3c88..327f918d6b 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -541,21 +541,6 @@ public: return registerConverter<From, To>(QtPrivate::convertImplicit<From, To>); } -#ifdef Q_CLANG_QDOC - template<typename MemberFunction, int> - static bool registerConverter(MemberFunction function); - template<typename MemberFunctionOk, char> - static bool registerConverter(MemberFunctionOk function); - template<typename UnaryFunction> - static bool registerConverter(UnaryFunction function); - - template<typename MemberFunction, int> - static bool registerMutableView(MemberFunction function); - template<typename MemberFunctionOk, char> - static bool registerMutableView(MemberFunctionOk function); - template<typename UnaryFunction> - static bool registerMutableView(UnaryFunction function); -#else // member function as in "QString QFont::toString() const" template<typename From, typename To> static bool registerConverter(To(From::*function)() const) @@ -675,7 +660,6 @@ private: return false; } } -#endif // Q_CLANG_DOC public: static bool convert(QMetaType fromType, const void *from, QMetaType toType, void *to); |