diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qhash.h | 7 | ||||
| -rw-r--r-- | src/corelib/tools/qmap.h | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 93af8f63d5..c0e2e6eff5 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -378,16 +378,13 @@ public: inline iterator &operator+=(int j) { return *this = *this + j; } inline iterator &operator-=(int j) { return *this = *this - j; } - // ### Qt 5: not sure this is necessary anymore -#ifdef QT_STRICT_ITERATORS - private: -#else +#ifndef QT_STRICT_ITERATORS public: -#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; } +#endif }; friend class iterator; diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 3494bd0c4c..9cab1035d1 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -435,15 +435,13 @@ public: inline iterator &operator+=(int j) { return *this = *this + j; } inline iterator &operator-=(int j) { return *this = *this - j; } -#ifdef QT_STRICT_ITERATORS - private: -#else +#ifndef QT_STRICT_ITERATORS public: -#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; } +#endif friend class QMap<Key, T>; }; friend class iterator; |