Get rid of QT_STRICT_ITERATORS

The concept was a nice idea to avoid accidental detach() calls
in implicitly shared containers, but it conflicts with a C++11
compatible API for them, with signatures for modifying methods
taking a const_iterator as argument and returning an iterator
(e.g. iterator erase(const_iterator)).

Change-Id: Ia33124bedbd260774a0a66f49aedd84e19c9971b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 18 deletions

diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index a85b8e3819..f169ed5e49 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -433,13 +433,8 @@ public:
         inline iterator &operator-=(int j) { return *this = *this - j; }
         friend inline iterator operator+(int j, iterator k) { return k + j; }
 
-#ifndef QT_STRICT_ITERATORS
-    public:
-        inline bool operator==(const const_iterator &o) const
-            { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const
-            { return i != o.i; }
-#endif
+        inline bool operator==(const const_iterator &o) const { return i == o.i; }
+        inline bool operator!=(const const_iterator &o) const { return i != o.i; }
         friend class QMap<Key, T>;
     };
     friend class iterator;
@@ -458,12 +453,7 @@ public:
 
         Q_DECL_CONSTEXPR inline const_iterator() : i(nullptr) { }
         inline const_iterator(const Node *node) : i(node) { }
-#ifdef QT_STRICT_ITERATORS
-        explicit inline const_iterator(const iterator &o)
-#else
-        inline const_iterator(const iterator &o)
-#endif
-        { i = o.i; }
+        inline const_iterator(const iterator &o) { i = o.i; }
 
         inline const Key &key() const { return i->key; }
         inline const T &value() const { return i->value; }
@@ -497,11 +487,6 @@ public:
         inline const_iterator &operator-=(int j) { return *this = *this - j; }
         friend inline const_iterator operator+(int j, const_iterator k) { return k + j; }
 
-#ifdef QT_STRICT_ITERATORS
-    private:
-        inline bool operator==(const iterator &o) const { return operator==(const_iterator(o)); }
-        inline bool operator!=(const iterator &o) const { return operator!=(const_iterator(o)); }
-#endif
         friend class QMap<Key, T>;
     };
     friend class const_iterator;