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

Timestamp:

May 5, 2011, 5:36:53 AM (15 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.h (modified) (6 diffs)

trunk/src/corelib/tools/qhash.h

@@ -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])
@@ -300 +300 @@
     inline bool isDetached() const { return d->ref == 1; }
     inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; }
+
 
     void clear();
@@ -589 +590 @@
 {
     if (d != other.d) {
-        other.d->ref.ref();
+        QHashData *o = other.d;
+        o->ref.ref();
         if (!d->ref.deref())
             freeData(d);
-        d = other.d;
+        d = o;
         if (!d->sharable)
             detach_helper();
@@ -625 +627 @@
 {
     QList<Key> res;
+
     const_iterator i = begin();
     if (i != end()) {
@@ -644 +647 @@
 {
     QList<Key> res;
+
     const_iterator i = begin();
     while (i != end()) {
@@ -688 +692 @@
 {
     QList<T> res;
+
     const_iterator i = begin();
     while (i != end()) {