Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

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,12 +1,12 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -85,16 +85,26 @@ struct Q_EXPORT QUuid
 	return !memcmp( this, &orig, sizeof(QUuid) );
     }
 
     bool operator!=(const QUuid &orig ) const
     {
 	return !( *this == orig );
     }
 
+    inline bool operator<(const QUuid &orig) const
+    {
+	return ( memcmp(this, &orig, sizeof(QUuid)) < 0);
+    }
+    
+    inline bool operator>(const QUuid &orig) const
+    {
+	return ( memcmp(this, &orig, sizeof(QUuid) ) > 0);
+    }
+    
 #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) );
     }
 
@@ -114,21 +124,32 @@ struct Q_EXPORT QUuid
     {
 	return !memcmp( this, &guid, sizeof(QUuid) );
     }
 
     bool operator!=( const GUID &guid ) const
     {
 	return !( *this == guid );
     }
+    
+    inline bool operator<(const QUuid &orig) const
+    {
+	return ( memcmp(this, &orig, sizeof(QUuid) ) < 0);
+    }
+    
+    inline bool operator>(const QUuid &orig) const
+    {
+	return ( memcmp(this, &orig, sizeof(QUuid) ) > 0);
+    }
+    
 #endif
 #if defined (Q_WS_QWS)
     QUuid( uuid_t uuid ) 
     {
-	memcpy( this, &uuid, sizeof(uuid_t) );
+	memcpy( this, uuid, sizeof(uuid_t) );
     }
 
     QUuid &operator=(const uuid_t &orig )
     {
 	memcpy( this, &orig, sizeof(uuid_t) );
 	return *this;
     }
 #endif