Changeset 846 for trunk/src/corelib/tools/qhash.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qhash.cpp (modified) (6 diffs)

trunk/src/corelib/tools/qhash.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -65 +65 @@
 {
     uint h = 0;
-    uint g;
 
     while (n--) {
         h = (h << 4) + *p++;
-        g = h & 0xf0000000;
-        h ^= g >> 23;
-        h &= ~g;
+        h ^= (h & 0xf0000000) >> 23;
+        h &= 0x0fffffff;
     }
     return h;
@@ -79 +77 @@
 {
     uint h = 0;
-    uint g;
 
     while (n--) {
         h = (h << 4) + (*p++).unicode();
-        g = h & 0xf0000000;
-        h ^= g >> 23;
-        h &= ~g;
+        h ^= (h & 0xf0000000) >> 23;
+        h &= 0x0fffffff;
     }
     return h;
@@ -848 +844 @@
 */
 
+
+
+
+
+
 /*! \fn void QHash::clear()
 
@@ -1666 +1667 @@
     operator<<().
 
-    \sa {Format of the QDataStream operators}
+    \sa {s}
 */
 
@@ -1677 +1678 @@
     operator>>().
 
-    \sa {Format of the QDataStream operators}
+    \sa {s}
 */