AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ### comments in QSet

Browse Source 
Change-Id: I302be7dc4cd7a9c2b9e35e8142ca100d6f86da7c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
This commit is contained in:
Lars Knoll 2012-01-15 21:09:14 +01:00 committed by Qt by Nokia
parent e469323407
commit bb5ae21c41
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/tools/qset.h
View File

@ -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<typename Hash::const_iterator>(q_hash.insert(value,
QHashDummyValue())); }
inline iterator insert(const T &value)
{ return static_cast<typename Hash::iterator>(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<T> result = *this; result += other; return result; }
inline QSet<T> operator-(const QSet<T> &other) const
{ QSet<T> result = *this; result -= other; return result; }
#if QT_VERSION < 0x050000
// ### Qt 5: remove
inline QSet<T> operator|(const QSet<T> &other)
{ QSet<T> result = *this; result |= other; return result; }
inline QSet<T> operator&(const QSet<T> &other)
{ QSet<T> result = *this; result &= other; return result; }
inline QSet<T> operator+(const QSet<T> &other)
{ QSet<T> result = *this; result += other; return result; }
inline QSet<T> operator-(const QSet<T> &other)
{ QSet<T> result = *this; result -= other; return result; }
#endif
QList<T> toList() const;
inline QList<T> values() const { return toList(); }