qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QHash: Re-remove Java-style iterator 

When deprecating reverse iteratation for QHash the macro defining
QHashIterator was expanded but QT_NO_JAVA_STYLE_ITERATORS was
unfortunately forgotten. This patch brings it back.

Amends dbb54805f6

Change-Id: I7b1912a13f6f8d2446c1f61a1c4a19afb2f28993
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Mårten Nordheim 2020-01-28 12:55:15 +01:00
parent 4f077b7e5f
commit 22d0e91970
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qhash.h
View File

@ -1264,6 +1264,7 @@ Q_OUTOFLINE_TEMPLATE int QMultiHash<Key, T>::count(const Key &akey) const
return cnt; return cnt;
} }
#if !defined(QT_NO_JAVA_STYLE_ITERATORS)
template <class Key, class T> template <class Key, class T>
class QHashIterator class QHashIterator
{ {
@ -1438,6 +1439,7 @@ public:
} }
#endif #endif
}; };
#endif // !QT_NO_JAVA_STYLE_ITERATORS
template <class Key, class T> template <class Key, class T>
uint qHash(const QHash<Key, T> &key, uint seed = 0) uint qHash(const QHash<Key, T> &key, uint seed = 0)