1 files changed, 8 insertions, 13 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 1a02938de9..6eab500e8c 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -158,7 +158,7 @@ void QNetworkReplyImplPrivate::_q_startOperation()
     } else {
         if (state != Finished) {
             if (operation == QNetworkAccessManager::GetOperation)
-                pendingNotifications.append(NotifyDownstreamReadyWrite);
+                pendingNotifications.push_back(NotifyDownstreamReadyWrite);
 
             handleNotifications();
         }
@@ -433,8 +433,9 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
 void QNetworkReplyImplPrivate::backendNotify(InternalNotifications notification)
 {
     Q_Q(QNetworkReplyImpl);
-    if (!pendingNotifications.contains(notification))
-        pendingNotifications.enqueue(notification);
+    const auto it = std::find(pendingNotifications.cbegin(), pendingNotifications.cend(), notification);
+    if (it == pendingNotifications.cend())
+        pendingNotifications.push_back(notification);
 
     if (pendingNotifications.size() == 1)
         QCoreApplication::postEvent(q, new QEvent(QEvent::NetworkReplyUpdated));
@@ -445,14 +446,9 @@ void QNetworkReplyImplPrivate::handleNotifications()
     if (notificationHandlingPaused)
         return;
 
-    NotificationQueue current = pendingNotifications;
-    pendingNotifications.clear();
-
-    if (state != Working)
-        return;
-
-    while (state == Working && !current.isEmpty()) {
-        InternalNotifications notification = current.dequeue();
+     for (InternalNotifications notification : qExchange(pendingNotifications, {})) {
+        if (state != Working)
+            return;
         switch (notification) {
         case NotifyDownstreamReadyWrite:
             if (copyDevice)
@@ -466,8 +462,7 @@ void QNetworkReplyImplPrivate::handleNotifications()
             break;
 
         case NotifyCopyFinished: {
-            QIODevice *dev = copyDevice;
-            copyDevice = 0;
+            QIODevice *dev = qExchange(copyDevice, nullptr);
             backend->copyFinished(dev);
             break;
         }