From 42b5c28db510bd5facef34267f7fd66a57793030 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 20 Jul 2020 12:02:14 +0200 Subject: QAssociativeIterableImpl::advanceImpl(): remove deprecation protection The comment claims it is needed for "the deprecated QHash::iterator::operator--()", which has been removed already. Change-Id: I90f5abdcd14e6cac4ed7144e96eb26bf34477391 Reviewed-by: Friedemann Kleint --- src/corelib/kernel/qmetatype.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/corelib/kernel/qmetatype.h') diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 44cdcb3008..e5a71dd5a8 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1186,12 +1186,9 @@ public: { IteratorOwner::assign(iterator, static_cast(container)->find(*static_cast(p))); } - QT_WARNING_PUSH - QT_WARNING_DISABLE_DEPRECATED // Hits on the deprecated QHash::iterator::operator--() template static void advanceImpl(void **p, int step) { std::advance(*static_cast(*p), step); } - QT_WARNING_POP template static void beginImpl(const void *container, void **iterator) -- cgit v1.2.3