QHash/QSet: Base iterator tag on warning version rather than deprecation

If you have deprecation warning version set to 5.15 and the
"disable deprecated before" set to something lower then it will complain
about usage of operator-- inside std::distance which is used in our
generic collection iterator.

This also required changing over to the QT_DEPRECATED_VERSION_5_15 macro
so that the deprecation warning would also be disabled.

This is a possible work-around - change the iterator tag if it would
trigger a warning.

Fixes: QTBUG-82397
Change-Id: I3e0ecae5edebba2a3560e7c3785bd9d1a6d0076d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 52 insertions, 52 deletions

diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index 921b781f4a..9144405501 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -327,7 +327,7 @@ public:
         QHashData::Node *i;
 
     public:
-#if QT_DEPRECATED_SINCE(5, 15)
+#if QT_DEPRECATED_WARNINGS_SINCE < QT_VERSION_CHECK(5, 15, 0)
         typedef std::bidirectional_iterator_tag iterator_category;
 #else
         typedef std::forward_iterator_tag iterator_category;
@@ -357,23 +357,23 @@ public:
             return r;
         }
 #if QT_DEPRECATED_SINCE(5, 15)
-        inline QT_DEPRECATED iterator &operator--()
+        inline QT_DEPRECATED_VERSION_5_15 iterator &operator--()
         {
             i = QHashData::previousNode(i);
             return *this;
         }
-        inline QT_DEPRECATED iterator operator--(int)
+        inline QT_DEPRECATED_VERSION_5_15 iterator operator--(int)
         {
             iterator r = *this;
             i = QHashData::previousNode(i);
             return r;
         }
-        inline QT_DEPRECATED iterator operator+(int j) const
+        inline QT_DEPRECATED_VERSION_5_15 iterator operator+(int j) const
         { iterator r = *this; if (j > 0) while (j--) ++r; else while (j++) --r; return r; }
-        inline QT_DEPRECATED iterator operator-(int j) const { return operator+(-j); }
-        inline QT_DEPRECATED iterator &operator+=(int j) { return *this = *this + j; }
-        inline QT_DEPRECATED iterator &operator-=(int j) { return *this = *this - j; }
-        friend inline QT_DEPRECATED iterator operator+(int j, iterator k) { return k + j; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator operator-(int j) const { return operator+(-j); }
+        inline QT_DEPRECATED_VERSION_5_15 iterator &operator+=(int j) { return *this = *this + j; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator &operator-=(int j) { return *this = *this - j; }
+        friend inline QT_DEPRECATED_VERSION_5_15 iterator operator+(int j, iterator k) { return k + j; }
 #endif
 
 #ifndef QT_STRICT_ITERATORS
@@ -395,7 +395,7 @@ public:
         QHashData::Node *i;
 
     public:
-#if QT_DEPRECATED_SINCE(5, 15)
+#if QT_DEPRECATED_WARNINGS_SINCE < QT_VERSION_CHECK(5, 15, 0)
         typedef std::bidirectional_iterator_tag iterator_category;
 #else
         typedef std::forward_iterator_tag iterator_category;
@@ -432,23 +432,23 @@ public:
             return r;
         }
 #if QT_DEPRECATED_SINCE(5, 15)
-        inline QT_DEPRECATED const_iterator &operator--()
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator--()
         {
             i = QHashData::previousNode(i);
             return *this;
         }
-        inline QT_DEPRECATED const_iterator operator--(int)
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator--(int)
         {
             const_iterator r = *this;
             i = QHashData::previousNode(i);
             return r;
         }
-        inline QT_DEPRECATED const_iterator operator+(int j) const
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator+(int j) const
         { const_iterator r = *this; if (j > 0) while (j--) ++r; else while (j++) --r; return r; }
-        inline QT_DEPRECATED const_iterator operator-(int j) const { return operator+(-j); }
-        inline QT_DEPRECATED const_iterator &operator+=(int j) { return *this = *this + j; }
-        inline QT_DEPRECATED const_iterator &operator-=(int j) { return *this = *this - j; }
-        friend inline QT_DEPRECATED const_iterator operator+(int j, const_iterator k)
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator-(int j) const { return operator+(-j); }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator+=(int j) { return *this = *this + j; }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator-=(int j) { return *this = *this - j; }
+        friend inline QT_DEPRECATED_VERSION_5_15 const_iterator operator+(int j, const_iterator k)
         {
             return k + j;
         }
@@ -485,12 +485,12 @@ public:
         inline key_iterator &operator++() { ++i; return *this; }
         inline key_iterator operator++(int) { return key_iterator(i++);}
 #if QT_DEPRECATED_SINCE(5, 15)
-        inline QT_DEPRECATED key_iterator &operator--()
+        inline QT_DEPRECATED_VERSION_5_15 key_iterator &operator--()
         {
             --i;
             return *this;
         }
-        inline QT_DEPRECATED key_iterator operator--(int) { return key_iterator(i--); }
+        inline QT_DEPRECATED_VERSION_5_15 key_iterator operator--(int) { return key_iterator(i--); }
 #endif
         const_iterator base() const { return i; }
     };
@@ -1321,18 +1321,18 @@ public:
         return false;
     }
 #if QT_DEPRECATED_SINCE(5, 15)
-    inline QT_DEPRECATED bool hasPrevious() const { return i != c.constBegin(); }
-    inline QT_DEPRECATED Item previous()
+    inline QT_DEPRECATED_VERSION_5_15 bool hasPrevious() const { return i != c.constBegin(); }
+    inline QT_DEPRECATED_VERSION_5_15 Item previous()
     {
         n = --i;
         return n;
     }
-    inline QT_DEPRECATED Item peekPrevious() const
+    inline QT_DEPRECATED_VERSION_5_15 Item peekPrevious() const
     {
         const_iterator p = i;
         return --p;
     }
-    inline bool QT_DEPRECATED findPrevious(const T &t)
+    inline bool QT_DEPRECATED_VERSION_5_15 findPrevious(const T &t)
     {
         while (i != c.constBegin())
             if (*(n = --i) == t)
@@ -1418,18 +1418,18 @@ public:
         return false;
     }
 #if QT_DEPRECATED_SINCE(5, 15)
-    inline QT_DEPRECATED bool hasPrevious() const { return const_iterator(i) != c->constBegin(); }
-    inline QT_DEPRECATED Item previous()
+    inline QT_DEPRECATED_VERSION_5_15 bool hasPrevious() const { return const_iterator(i) != c->constBegin(); }
+    inline QT_DEPRECATED_VERSION_5_15 Item previous()
     {
         n = --i;
         return n;
     }
-    inline QT_DEPRECATED Item peekPrevious() const
+    inline QT_DEPRECATED_VERSION_5_15 Item peekPrevious() const
     {
         iterator p = i;
         return --p;
     }
-    inline QT_DEPRECATED bool findPrevious(const T &t)
+    inline QT_DEPRECATED_VERSION_5_15 bool findPrevious(const T &t)
     {
         while (const_iterator(i) != c->constBegin())
             if (*(n = --i) == t)
diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h
index 5fdcde3c00..4b2adcd851 100644
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
@@ -108,7 +108,7 @@ public:
         friend class QSet<T>;
 
     public:
-#if QT_DEPRECATED_SINCE(5, 15)
+#if QT_DEPRECATED_WARNINGS_SINCE < QT_VERSION_CHECK(5, 15, 0)
         typedef std::bidirectional_iterator_tag iterator_category;
 #else
         typedef std::forward_iterator_tag iterator_category;
@@ -133,13 +133,13 @@ public:
         inline iterator &operator++() { ++i; return *this; }
         inline iterator operator++(int) { iterator r = *this; ++i; return r; }
 #if QT_DEPRECATED_SINCE(5, 15)
-        inline QT_DEPRECATED iterator &operator--() { --i; return *this; }
-        inline QT_DEPRECATED iterator operator--(int) { iterator r = *this; --i; return r; }
-        inline QT_DEPRECATED iterator operator+(int j) const { return i + j; }
-        inline QT_DEPRECATED iterator operator-(int j) const { return i - j; }
-        friend inline QT_DEPRECATED iterator operator+(int j, iterator k) { return k + j; }
-        inline QT_DEPRECATED iterator &operator+=(int j) { i += j; return *this; }
-        inline QT_DEPRECATED iterator &operator-=(int j) { i -= j; return *this; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator &operator--() { --i; return *this; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator operator--(int) { iterator r = *this; --i; return r; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator operator+(int j) const { return i + j; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator operator-(int j) const { return i - j; }
+        friend inline QT_DEPRECATED_VERSION_5_15 iterator operator+(int j, iterator k) { return k + j; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator &operator+=(int j) { i += j; return *this; }
+        inline QT_DEPRECATED_VERSION_5_15 iterator &operator-=(int j) { i -= j; return *this; }
 #endif
     };
 
@@ -151,7 +151,7 @@ public:
         friend class QSet<T>;
 
     public:
-#if QT_DEPRECATED_SINCE(5, 15)
+#if QT_DEPRECATED_WARNINGS_SINCE < QT_VERSION_CHECK(5, 15, 0)
         typedef std::bidirectional_iterator_tag iterator_category;
 #else
         typedef std::forward_iterator_tag iterator_category;
@@ -174,13 +174,13 @@ public:
         inline const_iterator &operator++() { ++i; return *this; }
         inline const_iterator operator++(int) { const_iterator r = *this; ++i; return r; }
 #if QT_DEPRECATED_SINCE(5, 15)
-        inline QT_DEPRECATED const_iterator &operator--() { --i; return *this; }
-        inline QT_DEPRECATED const_iterator operator--(int) { const_iterator r = *this; --i; return r; }
-        inline QT_DEPRECATED const_iterator operator+(int j) const { return i + j; }
-        inline QT_DEPRECATED const_iterator operator-(int j) const { return i - j; }
-        friend inline QT_DEPRECATED const_iterator operator+(int j, const_iterator k) { return k + j; }
-        inline QT_DEPRECATED const_iterator &operator+=(int j) { i += j; return *this; }
-        inline QT_DEPRECATED const_iterator &operator-=(int j) { i -= j; return *this; }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator--() { --i; return *this; }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator--(int) { const_iterator r = *this; --i; return r; }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator+(int j) const { return i + j; }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator-(int j) const { return i - j; }
+        friend inline QT_DEPRECATED_VERSION_5_15 const_iterator operator+(int j, const_iterator k) { return k + j; }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator+=(int j) { i += j; return *this; }
+        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator-=(int j) { i -= j; return *this; }
 #endif
     };
 
@@ -198,12 +198,12 @@ public:
     typedef std::reverse_iterator<iterator> reverse_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    reverse_iterator QT_DEPRECATED rbegin() { return reverse_iterator(end()); }
-    reverse_iterator QT_DEPRECATED rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator QT_DEPRECATED rbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator QT_DEPRECATED rend() const noexcept { return const_reverse_iterator(begin()); }
-    const_reverse_iterator QT_DEPRECATED crbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator QT_DEPRECATED crend() const noexcept { return const_reverse_iterator(begin()); }
+    reverse_iterator QT_DEPRECATED_VERSION_5_15 rbegin() { return reverse_iterator(end()); }
+    reverse_iterator QT_DEPRECATED_VERSION_5_15 rend() { return reverse_iterator(begin()); }
+    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 rbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 rend() const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 crbegin() const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 crend() const noexcept { return const_reverse_iterator(begin()); }
 #endif
 
     iterator erase(iterator i)
@@ -449,10 +449,10 @@ public:
     inline bool findNext(const T &t)
     { while (c->constEnd() != (n = i)) if (*i++ == t) return true; return false; }
 #if QT_DEPRECATED_SINCE(5, 15)
-    inline QT_DEPRECATED bool hasPrevious() const { return c->constBegin() != i; }
-    inline QT_DEPRECATED const T &previous() { n = --i; return *n; }
-    inline QT_DEPRECATED const T &peekPrevious() const { iterator p = i; return *--p; }
-    inline QT_DEPRECATED bool findPrevious(const T &t)
+    inline QT_DEPRECATED_VERSION_5_15 bool hasPrevious() const { return c->constBegin() != i; }
+    inline QT_DEPRECATED_VERSION_5_15 const T &previous() { n = --i; return *n; }
+    inline QT_DEPRECATED_VERSION_5_15 const T &peekPrevious() const { iterator p = i; return *--p; }
+    inline QT_DEPRECATED_VERSION_5_15 bool findPrevious(const T &t)
     { while (c->constBegin() != i) if (*(n = --i) == t) return true;
       n = c->end(); return false;  }
 #endif