Make use of new QHash::erase(const_iterator) overload

Drive-by changes:
- use auto for iterators
- add Q_UNLIKELY for conditions leading to a qWarning etc

Change-Id: Iff8f36d67c96674d354a501b26640f73c15ce58d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sérgio Martins <iamsergio@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index b5e27cc720..24eee1d1b8 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -1538,15 +1538,15 @@ void QtSharedPointer::internalSafetyCheckRemove(const void *d_ptr)
 
     QMutexLocker lock(&kp->mutex);
 
-    QHash<const void *, Data>::iterator it = kp->dPointers.find(d_ptr);
-    if (Q_UNLIKELY(it == kp->dPointers.end())) {
+    const auto it = kp->dPointers.constFind(d_ptr);
+    if (Q_UNLIKELY(it == kp->dPointers.cend())) {
         qFatal("QSharedPointer: internal self-check inconsistency: pointer %p was not tracked. "
                "To use QT_SHAREDPOINTER_TRACK_POINTERS, you have to enable it throughout "
                "in your code.", d_ptr);
     }
 
-    QHash<const volatile void *, const void *>::iterator it2 = kp->dataPointers.find(it->pointer);
-    Q_ASSERT(it2 != kp->dataPointers.end());
+    const auto it2 = kp->dataPointers.constFind(it->pointer);
+    Q_ASSERT(it2 != kp->dataPointers.cend());
 
     //qDebug("Removing d=%p value=%p", d_ptr, it->pointer);