diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-05-08 08:24:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 12:46:09 +0200 |
| commit | 929e08a3d6bbc4ea16be69b732a3df5191e66474 (patch) | |
| tree | d37a5ba322d8c0051ac7187f4373cd764fcd5ade /src | |
| parent | 508ee5616b80979f6800beeb4a52fa5cc0a4ad0a (diff) | |
Fix since version of new metatype conversion functions.
Change-Id: Icedd0942eaef9bdcf034d747f0a03a00ca461a95
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index fe7cc53181..5551880e30 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -478,14 +478,14 @@ Q_GLOBAL_STATIC(QMetaTypeConversionRegistry, customTypesConversionRegistry) /*! \fn bool QMetaType::registerConverter() - \since 5.1 + \since 5.2 Registers the possibility of an implicit conversion from type From to type To in the meta type system. Returns true if the registration succeeded, otherwise false. */ /*! \fn bool QMetaType::registerConverter(MemberFunction function) - \since 5.1 + \since 5.2 \overload Registers a method \a function like To From::function() const as converter from type From to type To in the meta type system. Returns true if the registration succeeded, otherwise false. @@ -493,7 +493,7 @@ Q_GLOBAL_STATIC(QMetaTypeConversionRegistry, customTypesConversionRegistry) /*! \fn bool QMetaType::registerConverter(MemberFunctionOk function) - \since 5.1 + \since 5.2 \overload Registers a method \a function like To From::function(bool *ok) const as converter from type From to type To in the meta type system. Returns true if the registration succeeded, otherwise false. @@ -501,7 +501,7 @@ Q_GLOBAL_STATIC(QMetaTypeConversionRegistry, customTypesConversionRegistry) /*! \fn bool QMetaType::registerConverter(UnaryFunction function) - \since 5.1 + \since 5.2 \overload Registers a unary function object \a function as converter from type From to type To in the meta type system. Returns true if the registration succeeded, otherwise false. @@ -511,7 +511,7 @@ Q_GLOBAL_STATIC(QMetaTypeConversionRegistry, customTypesConversionRegistry) Registers function \a f as converter function from type id \a from to \a to. If there's already a conversion registered, this does nothing but deleting \a f. Returns true if the registration succeeded, otherwise false. - \since 5.1 + \since 5.2 \internal */ bool QMetaType::registerConverterFunction(QtPrivate::AbstractConverterFunction *f, int from, int to) @@ -529,7 +529,7 @@ bool QMetaType::registerConverterFunction(QtPrivate::AbstractConverterFunction * /*! Converts the object at \a from from \a fromTypeId to the preallocated space at \a to typed \a toTypeId. Returns true, if the conversion succeeded, otherwise false. - \since 5.1 + \since 5.2 */ bool QMetaType::convert(const void *from, int fromTypeId, void *to, int toTypeId) { @@ -540,14 +540,14 @@ bool QMetaType::convert(const void *from, int fromTypeId, void *to, int toTypeId /*! \fn bool QMetaType::hasRegisteredConverterFunction() Returns true, if the meta type system has a registered conversion from type From to type To. - \since 5.1 + \since 5.2 \overload */ /*! Returns true, if the meta type system has a registered conversion from meta type id \a fromTypeId to \a toTypeId - \since 5.1 + \since 5.2 */ bool QMetaType::hasRegisteredConverterFunction(int fromTypeId, int toTypeId) { |