From bf3e80023a70b86c2bff793cb8dd86055236ddeb Mon Sep 17 00:00:00 2001 From: Thiago Macieira 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 --- src/corelib/tools/qiterator.qdoc | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/corelib/tools/qiterator.qdoc') diff --git a/src/corelib/tools/qiterator.qdoc b/src/corelib/tools/qiterator.qdoc index 1ae9c58daa..f140af152d 100644 --- a/src/corelib/tools/qiterator.qdoc +++ b/src/corelib/tools/qiterator.qdoc @@ -501,17 +501,6 @@ \sa operator=() */ -/*! - \fn QMutableListIterator::~QMutableListIterator() - \fn QMutableLinkedListIterator::~QMutableLinkedListIterator() - \fn QMutableVectorIterator::~QMutableVectorIterator() - \fn QMutableSetIterator::~QMutableSetIterator() - - Destroys the iterator. - - \sa operator=() -*/ - /*! \fn QMutableListIterator &QMutableListIterator::operator=(QList &list) \fn QMutableLinkedListIterator &QMutableLinkedListIterator::operator=(QLinkedList &list) \fn QListIterator &QListIterator::operator=(const QList &list) @@ -1121,15 +1110,6 @@ \sa operator=() */ -/*! - \fn QMutableMapIterator::~QMutableMapIterator() - \fn QMutableHashIterator::~QMutableHashIterator() - - Destroys the iterator. - - \sa operator=() -*/ - /*! \fn QMapIterator &QMapIterator::operator=(const QMap &map) \fn QMutableMapIterator &QMutableMapIterator::operator=(QMap &map) -- cgit v1.2.3