diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-03 12:11:38 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-08 19:10:50 +0000 |
| commit | 0fd0059a1328723199641ced96f0c4b98e44e9d9 (patch) | |
| tree | 2a461cae1d85571e8af0dd452a792a6ee8d6219c /src/corelib/kernel/qmetatype.cpp | |
| parent | beeb748b2ce1d4aab60213778e9342ad330e1e07 (diff) | |
doc: Correct qdoc warnings in qobject.cpp and qmetatype.cpp
clang required adding template clauses to a few \fn commands.
There were also a few cases where Q_QDOC was changed to Q_CLANG_QDOC
and a few cases where special declarations for qdoc were removed in
favor of the actual declarations.
Unfortunately, a few qdoc warnings remain unfixed for classes
QObject and QMetaType, but these might be caused by minor bugs
in clang-qdoc itself, so they will be fixed there.
Change-Id: Ib586628cb6d2aa9cf4bcad303b5af09b412a7e57
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index e48807ea49..091dfa8d37 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -586,7 +586,7 @@ Q_GLOBAL_STATIC(QMetaTypeDebugStreamRegistry, customTypesDebugStreamRegistry) */ /*! - \fn bool QMetaType::registerConverter(MemberFunction function) + \fn template<typename MemberFunction, int> bool QMetaType::registerConverter(MemberFunction function) \since 5.2 \overload Registers a method \a function like To From::function() const as converter from type From @@ -594,7 +594,7 @@ Q_GLOBAL_STATIC(QMetaTypeDebugStreamRegistry, customTypesDebugStreamRegistry) */ /*! - \fn bool QMetaType::registerConverter(MemberFunctionOk function) + \fn template<typename MemberFunctionOk, char> bool QMetaType::registerConverter(MemberFunctionOk function) \since 5.2 \overload Registers a method \a function like To From::function(bool *ok) const as converter from type From @@ -602,7 +602,7 @@ Q_GLOBAL_STATIC(QMetaTypeDebugStreamRegistry, customTypesDebugStreamRegistry) */ /*! - \fn bool QMetaType::registerConverter(UnaryFunction function) + \fn template<typename UnaryFunction> bool QMetaType::registerConverter(UnaryFunction function) \since 5.2 \overload Registers a unary function object \a function as converter from type From |