diff options
author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-05-02 19:01:55 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-05-03 15:20:30 +0000 |
commit | 224db5e6eb07154ba2e974a96ee617bf7d740134 (patch) | |
tree | 4fba1c56f9ef01bf1723ca07da297283004746cb /src/corelib/plugin | |
parent | 597df79c27a2573d540e231bb7b88baf40e5e58e (diff) |
darwin: Move conversion function documentation to function definition
It's easier to maintain the function and the docs when they live together.
Change-Id: I1e047b4ac1eb61a36849188da560dd899e05509f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r-- | src/corelib/plugin/quuid.cpp | 33 | ||||
-rw-r--r-- | src/corelib/plugin/quuid_darwin.mm | 29 |
2 files changed, 29 insertions, 33 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 5876bb84c3..1780039928 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -809,39 +809,6 @@ QUuid::Version QUuid::version() const Q_DECL_NOTHROW return ver; } -/*! \fn QUuid QUuid::fromCFUUID(CFUUIDRef uuid) - \since 5.7 - - Constructs a new QUuid containing a copy of the \a uuid CFUUID. - - \note this function is only available on Apple platforms. -*/ - -/*! \fn CFUUIDRef QUuid::toCFUUID() const - \since 5.7 - - Creates a CFUUID from a QUuid. The caller owns the CFUUID and is - responsible for releasing it. - - \note this function is only available on Apple platforms. -*/ - -/*! \fn QUuid QUuid::fromNSUUID(const NSUUID *uuid) - \since 5.7 - - Constructs a new QUuid containing a copy of the \a uuid NSUUID. - - \note this function is only available on Apple platforms. -*/ - -/*! \fn NSUUID QUuid::toNSUUID() const - \since 5.7 - - Creates a NSUUID from a QUuid. The NSUUID is autoreleased. - - \note this function is only available on Apple platforms. -*/ - /*! \fn bool QUuid::operator<(const QUuid &other) const diff --git a/src/corelib/plugin/quuid_darwin.mm b/src/corelib/plugin/quuid_darwin.mm index c2a7240f3b..aa67e0b7dc 100644 --- a/src/corelib/plugin/quuid_darwin.mm +++ b/src/corelib/plugin/quuid_darwin.mm @@ -43,6 +43,13 @@ QT_BEGIN_NAMESPACE +/*! \fn QUuid QUuid::fromCFUUID(CFUUIDRef uuid) + \since 5.7 + + Constructs a new QUuid containing a copy of the \a uuid CFUUID. + + \note this function is only available on Apple platforms. +*/ QUuid QUuid::fromCFUUID(CFUUIDRef uuid) { if (!uuid) @@ -51,12 +58,27 @@ QUuid QUuid::fromCFUUID(CFUUIDRef uuid) return QUuid::fromRfc4122(QByteArray::fromRawData(reinterpret_cast<const char *>(&bytes), sizeof(bytes))); } +/*! \fn CFUUIDRef QUuid::toCFUUID() const + \since 5.7 + + Creates a CFUUID from a QUuid. The caller owns the CFUUID and is + responsible for releasing it. + + \note this function is only available on Apple platforms. +*/ CFUUIDRef QUuid::toCFUUID() const { const QByteArray bytes = toRfc4122(); return CFUUIDCreateFromUUIDBytes(0, *reinterpret_cast<const CFUUIDBytes *>(bytes.constData())); } +/*! \fn QUuid QUuid::fromNSUUID(const NSUUID *uuid) + \since 5.7 + + Constructs a new QUuid containing a copy of the \a uuid NSUUID. + + \note this function is only available on Apple platforms. +*/ QUuid QUuid::fromNSUUID(const NSUUID *uuid) { if (!uuid) @@ -66,6 +88,13 @@ QUuid QUuid::fromNSUUID(const NSUUID *uuid) return QUuid::fromRfc4122(QByteArray::fromRawData(reinterpret_cast<const char *>(bytes), sizeof(bytes))); } +/*! \fn NSUUID QUuid::toNSUUID() const + \since 5.7 + + Creates a NSUUID from a QUuid. The NSUUID is autoreleased. + + \note this function is only available on Apple platforms. +*/ NSUUID *QUuid::toNSUUID() const { const QByteArray bytes = toRfc4122(); |