Changeset 769 for trunk/src/corelib/tools/qvarlengtharray.h

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qvarlengtharray.h (modified) (5 diffs)

trunk/src/corelib/tools/qvarlengtharray.h

@@ -129 +129 @@
     void realloc(int size, int alloc);
 
-    int a;
-    int s;
-    T *ptr;
+    int a;
+    int s;
+    T *ptr;
     union {
         // ### Qt 5: Use 'Prealloc * sizeof(T)' as array size
@@ -194 +194 @@
     T *oldPtr = ptr;
     int osize = s;
-    // s = asize;
-
+
+    const int copySize = qMin(asize, osize);
     if (aalloc != a) {
         ptr = reinterpret_cast<T *>(qMalloc(aalloc * sizeof(T)));
@@ -206 +206 @@
                 QT_TRY {
                     // copy all the old elements
-                    const int copySize = qMin(asize, osize);
                     while (s < copySize) {
                         new (ptr+s) T(*(oldPtr+s));
@@ -222 +221 @@
                 }
             } else {
-                qMemCopy(ptr, oldPtr, qMin(asize, osize) * sizeof(T));
-                s = asize;
+                qMemCopy(ptr, oldPtr, copySize * sizeof(T));
             }
         } else {
@@ -230 +228 @@
         }
     }
-
-    if (QTypeInfo<T>::isComplex) {
+    s = copySize;
+
+    if (QTypeInfo<T>::isComplex) {
+        // destroy remaining old objects
         while (osize > asize)
             (oldPtr+(--osize))->~T();
-        if( oldPtr == ptr )
-            s = osize;
     }