summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin/quuid.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-08-16 23:57:02 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-20 10:23:27 +0200
commit8a16954661df231677f7ee2d03f91c161453e734 (patch)
treeb6706a00ed7f5289b542f18a4a797a2aae69915e /src/corelib/plugin/quuid.cpp
parentb534af36802eaff8721744c4a1d9e106d9da89ca (diff)
Fix more qdoc errors
Change-Id: Ieed340068327f37ea0f549d24ea49235994118f4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/plugin/quuid.cpp')
-rw-r--r--src/corelib/plugin/quuid.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 952e41851a..dc8958de4f 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -427,8 +427,8 @@ QUuid::QUuid(const QByteArray &text)
\since 5.0
\fn QUuid QUuid::createUuidV3(const QUuid &ns, const QByteArray &baseData);
- This functions returns a new UUID with variant QUuid::DCE and version QUuid::MD5.
- \a ns is the namespace and \a name is the name as described by RFC 4122.
+ This functions returns a new UUID with variant QUuid::DCE and version QUuid::Md5.
+ \a ns is the namespace and \a baseData is the basic data as described by RFC 4122.
\sa variant(), version(), createUuidV5()
*/
@@ -437,8 +437,8 @@ QUuid::QUuid(const QByteArray &text)
\since 5.0
\fn QUuid QUuid::createUuidV5(const QUuid &ns, const QByteArray &baseData);
- This functions returns a new UUID with variant QUuid::DCE and version QUuid::SHA1.
- \a ns is the namespace and \a name is the name as described by RFC 4122.
+ This functions returns a new UUID with variant QUuid::DCE and version QUuid::Sha1.
+ \a ns is the namespace and \a baseData is the basic data as described by RFC 4122.
\sa variant(), version(), createUuidV3()
*/
@@ -457,7 +457,7 @@ QUuid QUuid::createUuidV5(const QUuid &ns, const QByteArray &baseData)
/*!
Creates a QUuid object from the binary representation of the UUID, as
specified by RFC 4122 section 4.1.2. See toRfc4122() for a further
- explanation of the order of bytes required.
+ explanation of the order of \a bytes required.
The byte array accepted is NOT a human readable format.
@@ -757,7 +757,9 @@ bool QUuid::isNull() const
MAC network card address (if available) for the node sections
\value EmbeddedPOSIX DCE Security version, with embedded POSIX UUIDs
\value Name Name-based, by using values from a name for all sections
+ \value Md5 Alias for Name
\value Random Random-based, by using random numbers for all sections
+ \value Sha1
*/
/*!