diff options
| author | Martin Smith <martin.smith@theqtcompany.com> | 2016-04-08 14:53:41 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@theqtcompany.com> | 2016-04-08 14:11:40 +0000 |
| commit | 5380808453728a354ae28aae76e85ac448245cf1 (patch) | |
| tree | d7a51ab4bf5980ae21051ccbbb70add7116df83e /src | |
| parent | b333c3396af80d63b40734293ae59d2e00cd714b (diff) | |
qdoc: Remove Q_QDOC for int type() in qmetatype.h
It probably wasn't necessary in the first place, but it
certainly isn't needed now. Also changed a pair of internal
qdoc comments on static functions that are not declared
outside the .cpp file. Now they are no longer qdoc comments.
This change does not require clang in qdoc.
Change-Id: I39df3eb1e3f57ba1da93f27892d0c3af8f9481ef
Task-number: QTBUG-52454
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 3ac1f28638..cf0e88c7cd 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -870,8 +870,7 @@ const char *QMetaType::typeName(int typeId) return result; } -/*! - \internal +/* Similar to QMetaType::type(), but only looks in the static set of types. */ static inline int qMetaTypeStaticType(const char *typeName, int length) @@ -884,8 +883,7 @@ static inline int qMetaTypeStaticType(const char *typeName, int length) return types[i].type; } -/*! - \internal +/* Similar to QMetaType::type(), but only looks in the custom set of types, and doesn't lock the mutex. The extra \a firstInvalidIndex parameter is an easy way to avoid diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 48011f795d..60a260f4e7 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -506,11 +506,8 @@ public: static int registerTypedef(const char *typeName, int aliasId); static int registerNormalizedTypedef(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName, int aliasId); static int type(const char *typeName); -#ifndef Q_QDOC + static int type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName); -#else - static int type(const QByteArray &typeName); -#endif static const char *typeName(int type); static int sizeOf(int type); static TypeFlags typeFlags(int type); |