author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/quuid.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/quuid.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/library/quuid.h b/library/quuid.h index 4f7a720..841a00f 100644 --- a/library/quuid.h +++ b/library/quuid.h | |||
@@ -1,8 +1,8 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
@@ -89,8 +89,18 @@ struct Q_EXPORT QUuid | |||
89 | { | 89 | { |
90 | return !( *this == orig ); | 90 | return !( *this == orig ); |
91 | } | 91 | } |
92 | 92 | ||
93 | inline bool operator<(const QUuid &orig) const | ||
94 | { | ||
95 | return ( memcmp(this, &orig, sizeof(QUuid)) < 0); | ||
96 | } | ||
97 | |||
98 | inline bool operator>(const QUuid &orig) const | ||
99 | { | ||
100 | return ( memcmp(this, &orig, sizeof(QUuid) ) > 0); | ||
101 | } | ||
102 | |||
93 | #if defined(Q_OS_WIN32) | 103 | #if defined(Q_OS_WIN32) |
94 | // On Windows we have a type GUID that is used by the platform API, so we | 104 | // On Windows we have a type GUID that is used by the platform API, so we |
95 | // provide convenience operators to cast from and to this type. | 105 | // provide convenience operators to cast from and to this type. |
96 | QUuid( const GUID &guid ) | 106 | QUuid( const GUID &guid ) |
@@ -118,13 +128,24 @@ struct Q_EXPORT QUuid | |||
118 | bool operator!=( const GUID &guid ) const | 128 | bool operator!=( const GUID &guid ) const |
119 | { | 129 | { |
120 | return !( *this == guid ); | 130 | return !( *this == guid ); |
121 | } | 131 | } |
132 | |||
133 | inline bool operator<(const QUuid &orig) const | ||
134 | { | ||
135 | return ( memcmp(this, &orig, sizeof(QUuid) ) < 0); | ||
136 | } | ||
137 | |||
138 | inline bool operator>(const QUuid &orig) const | ||
139 | { | ||
140 | return ( memcmp(this, &orig, sizeof(QUuid) ) > 0); | ||
141 | } | ||
142 | |||
122 | #endif | 143 | #endif |
123 | #if defined (Q_WS_QWS) | 144 | #if defined (Q_WS_QWS) |
124 | QUuid( uuid_t uuid ) | 145 | QUuid( uuid_t uuid ) |
125 | { | 146 | { |
126 | memcpy( this, &uuid, sizeof(uuid_t) ); | 147 | memcpy( this, uuid, sizeof(uuid_t) ); |
127 | } | 148 | } |
128 | 149 | ||
129 | QUuid &operator=(const uuid_t &orig ) | 150 | QUuid &operator=(const uuid_t &orig ) |
130 | { | 151 | { |