diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-10-25 15:19:25 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-11-04 21:23:06 +0000 |
| commit | f7f55c0b294f03932b205f8eae4335928647f57b (patch) | |
| tree | 24ab14cee0da980bed8c187ba09ed58613d5381e /src/corelib/plugin/quuid.h | |
| parent | 59dbf1786f22ec4ac88d8f9d38cac5cfb82acaea (diff) | |
Add Objective-C specific type converters to QUuid.
This patch adds the Objective-C NSUUID/CFUUIDRef converters to QUuid
[ChangeLog][QtCore][Objective-C] Added NSUUID/CFUUIDRef converters for
QUuid
Change-Id: Ifebf6fd5ce9f46dcdc06f221e189cb1fd9079e18
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Diffstat (limited to 'src/corelib/plugin/quuid.h')
| -rw-r--r-- | src/corelib/plugin/quuid.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index f004cba77e..07cd9c4103 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -49,6 +49,12 @@ typedef struct _GUID #endif #endif +#ifdef Q_OS_DARWIN +Q_FORWARD_DECLARE_CF_TYPE(CFUUID); +# ifdef __OBJC__ +Q_FORWARD_DECLARE_OBJC_CLASS(NSUUID); +# endif +#endif QT_BEGIN_NAMESPACE @@ -195,6 +201,15 @@ public: QUuid::Variant variant() const Q_DECL_NOTHROW; QUuid::Version version() const Q_DECL_NOTHROW; +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) + static QUuid fromCFUUID(CFUUIDRef uuid); + CFUUIDRef toCFUUID() const Q_DECL_CF_RETURNS_RETAINED; +# if defined(__OBJC__) || defined(Q_QDOC) + static QUuid fromNSUUID(const NSUUID *uuid); + NSUUID *toNSUUID() const Q_DECL_NS_RETURNS_AUTORELEASED; +# endif +#endif + uint data1; ushort data2; ushort data3; |