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

QAssociativeIterableImpl::advanceImpl(): remove deprecation protection

Browse Source 
The comment claims it is needed for "the deprecated
QHash::iterator::operator--()", which has been removed already.

Change-Id: I90f5abdcd14e6cac4ed7144e96eb26bf34477391
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Edward Welbourne 2020-07-20 12:02:14 +02:00
parent 8e48184120
commit 42b5c28db5
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qmetatype.h
View File

@ -1186,12 +1186,9 @@ public:
{ IteratorOwner<typename T::const_iterator>::assign(iterator,
static_cast<const T*>(container)->find(*static_cast<const typename T::key_type*>(p))); }
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED // Hits on the deprecated QHash::iterator::operator--()
template<class T>
static void advanceImpl(void **p, int step)
{ std::advance(*static_cast<typename T::const_iterator*>(*p), step); }
QT_WARNING_POP
template<class T>
static void beginImpl(const void *container, void **iterator)