| -rw-r--r-- | qmake/include/quuid.h | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/qmake/include/quuid.h b/qmake/include/quuid.h index 664c149..f5d8a86 100644 --- a/qmake/include/quuid.h +++ b/qmake/include/quuid.h @@ -1,8 +1,8 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QUuid class ** ** Created : 010523 ** ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. @@ -36,13 +36,13 @@ **********************************************************************/ #ifndef QUUID_H #define QUUID_H #ifndef QT_H -#include <qstring.h> +#include "qstring.h" #endif // QT_H #include <string.h> #if defined(Q_OS_WIN32) #ifndef GUID_DEFINED @@ -54,14 +54,31 @@ typedef struct _GUID ushort Data3; uchar Data4[ 8 ]; } GUID, *REFGUID, *LPGUID; #endif #endif + struct Q_EXPORT QUuid { + enum Variant { + VarUnknown =-1, + NCS = 0, // 0 - - + DCE = 2, // 1 0 - + Microsoft = 6, // 1 1 0 + Reserved = 7 // 1 1 1 + }; + + enum Version { + VerUnknown =-1, + Time = 1, // 0 0 0 1 + EmbeddedPOSIX = 2, // 0 0 1 0 + Name = 3, // 0 0 1 1 + Random = 4 // 0 1 0 0 + }; + QUuid() { memset( this, 0, sizeof(QUuid) ); } QUuid( uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8 ) { @@ -111,12 +128,15 @@ struct Q_EXPORT QUuid bool operator!=(const QUuid &orig ) const { return !( *this == orig ); } + bool operator<(const QUuid &other ) const; + bool operator>(const QUuid &other ) const; + #if defined(Q_OS_WIN32) // On Windows we have a type GUID that is used by the platform API, so we // provide convenience operators to cast from and to this type. QUuid( const GUID &guid ) { memcpy( this, &guid, sizeof(GUID) ); @@ -150,12 +170,15 @@ struct Q_EXPORT QUuid bool operator!=( const GUID &guid ) const { return !( *this == guid ); } #endif + static QUuid createUuid(); + QUuid::Variant variant() const; + QUuid::Version version() const; uint data1; ushort data2; ushort data3; uchar data4[ 8 ]; }; |