From bf3e80023a70b86c2bff793cb8dd86055236ddeb Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 3 Apr 2014 15:44:59 -0700
Subject: Stop using setSharable in the Java-style mutable iterators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

First and foremost, the STL-style iterators don't do this. Those don't
provide a guarantee that the container won't get shared again while the
iterator is active.

Second, there's no protection against a second mutable iterator being
created and resetting the sharable flag back to true.

[ChangeLog][Important behavior changes] The mutable Java-style iterators
like QListMutableIterator and QHashMutableIterator no longer set the
parent container to unsharable mode. If you create a copy of the
container being iterated on after the iterator, any changes done with
the iterator might affect the copy too.

Discussed-on: http://lists.qt-project.org/pipermail/development/2014-February/015724.html
Change-Id: Iccfe411d5558c85ae459cff944215614c392388e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
 .../corelib/tools/collections/tst_collections.cpp  | 92 +---------------------
 1 file changed, 1 insertion(+), 91 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
index 94b739aa54..33aa1c4888 100644
--- a/tests/auto/corelib/tools/collections/tst_collections.cpp
+++ b/tests/auto/corelib/tools/collections/tst_collections.cpp
@@ -2437,8 +2437,7 @@ void testContainer()
     }
 
     /*
-        Verify that the 'sharable' flag is true while no mutable
-        iterator is active.
+        Verify that the 'sharable' flag is true in populated containers.
     */
     {
         Container c1;
@@ -2453,95 +2452,6 @@ void testContainer()
         QVERIFY(!c2.isDetached());
     }
 
-    /*
-        Verify that the 'sharable' flag is set to false by the
-        mutable iterator.
-    */
-    {
-        Container c1;
-        populate(c1);
-        QVERIFY(c1.size() == 4);
-        QVERIFY(c1.isDetached());
-
-        ContainerMutableIterator i(c1);
-        i.next();
-
-        Container c2 = c1;
-        QVERIFY(c1.size() == 4);
-        QVERIFY(c2.size() == 4);
-        QVERIFY(c1.isDetached());
-        QVERIFY(c2.isDetached());
-
-        i.remove();
-        QVERIFY(c1.size() == 3);
-        QVERIFY(c2.size() == 4);
-    }
-
-    /*
-        Verify that the 'sharable' flag is reset to true by the
-        mutable iterator's destructor.
-    */
-    {
-        Container c1;
-        populate(c1);
-        QVERIFY(c1.size() == 4);
-        QVERIFY(c1.isDetached());
-
-        {
-            ContainerMutableIterator i(c1);
-            i.next();
-        }
-
-        Container c2 = c1;
-        QVERIFY(c1.size() == 4);
-        QVERIFY(c2.size() == 4);
-        QVERIFY(!c1.isDetached());
-        QVERIFY(!c2.isDetached());
-    }
-
-    /*
-        Verify that the 'sharable' flag only affects the original
-        object, not the copies.
-    */
-    {
-        Container c1;
-        populate(c1);
-        QVERIFY(c1.size() == 4);
-        QVERIFY(c1.isDetached());
-
-        Container c2 = c1;
-        QVERIFY(isSharable(c2));
-
-        ContainerMutableIterator i(c1);
-        QVERIFY(!isSharable(c1));
-        QVERIFY(isSharable(c2));
-
-        Container c3 = c1;
-        QVERIFY(!isSharable(c1));
-        QVERIFY(isSharable(c2));
-        QVERIFY(isSharable(c3));
-        QVERIFY(c1.isDetached());
-        QVERIFY(c2.isDetached());
-        QVERIFY(c3.isDetached());
-
-        Container c4;
-        c4 = c1;
-        QVERIFY(!isSharable(c1));
-        QVERIFY(isSharable(c2));
-        QVERIFY(isSharable(c4));
-        QVERIFY(c1.isDetached());
-        QVERIFY(c2.isDetached());
-        QVERIFY(c4.isDetached());
-
-        c3 = c2;
-        QVERIFY(!isSharable(c1));
-        QVERIFY(isSharable(c2));
-        QVERIFY(isSharable(c3));
-        QVERIFY(c1.isDetached());
-        QVERIFY(!c2.isDetached());
-        QVERIFY(!c3.isDetached());
-    }
-
     /* test that the move operators work properly */
     {
         Container c1 = Container(newInstance<Container>());
-- 
cgit v1.2.3