diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h index 7694faa74e..7ad16a7943 100644 --- a/src/corelib/tools/qset.h +++ b/src/corelib/tools/qset.h @@ -176,9 +176,8 @@ public: typedef iterator Iterator; typedef const_iterator ConstIterator; inline int count() const { return q_hash.count(); } - inline const_iterator insert(const T &value) // ### Qt 5: should return an 'iterator' - { return static_cast(q_hash.insert(value, - QHashDummyValue())); } + inline iterator insert(const T &value) + { return static_cast(q_hash.insert(value, QHashDummyValue())); } iterator find(const T &value) { return q_hash.find(value); } const_iterator find(const T &value) const { return q_hash.find(value); } inline const_iterator constFind(const T &value) const { return find(value); } @@ -216,17 +215,6 @@ public: { QSet result = *this; result += other; return result; } inline QSet operator-(const QSet &other) const { QSet result = *this; result -= other; return result; } -#if QT_VERSION < 0x050000 - // ### Qt 5: remove - inline QSet operator|(const QSet &other) - { QSet result = *this; result |= other; return result; } - inline QSet operator&(const QSet &other) - { QSet result = *this; result &= other; return result; } - inline QSet operator+(const QSet &other) - { QSet result = *this; result += other; return result; } - inline QSet operator-(const QSet &other) - { QSet result = *this; result -= other; return result; } -#endif QList toList() const; inline QList values() const { return toList(); }