Ticket #40852: patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff

src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.

@@ -234 +234 @@
 
     resetConnections();
     QNetworkReply* reply = m_reply;
-    m_reply = 0;
-    m_sniffer = 0;
+    m_reply = nullptr;
+    m_sniffer = nullptr;
 
     reply->setParent(0);
     return reply;
@@ -300 +300 @@
     Q_ASSERT(m_sniffer);
 
     m_sniffedMIMEType = m_sniffer->mimeType();
-    m_sniffer = 0;
+    m_sniffer = nullptr;
 
     emitMetaDataChanged();
 }
@@ -392 +392 @@
     else
         m_method = QNetworkAccessManager::CustomOperation;
 
-    QObject* originatingObject = 0;
+    QObject* originatingObject = nullptr;
     if (m_resourceHandle->getInternal()->m_context)
         originatingObject = m_resourceHandle->getInternal()->m_context->originatingObject();
 
@@ -417 +417 @@
         return 0;
 
     QNetworkReply* reply = m_replyWrapper->release();
-    m_replyWrapper = 0;
+    m_replyWrapper = nullptr;
     return reply;
 }
 
@@ -440 +440 @@
 
     ResourceHandleClient* client = m_resourceHandle->client();
     if (!client) {
-        m_replyWrapper = 0;
+        m_replyWrapper = nullptr;
         return;
     }
 
     if (m_replyWrapper->wasRedirected()) {
-        m_replyWrapper = 0;
+        m_replyWrapper = nullptr;
         m_queue.push(&QNetworkReplyHandler::start);
         return;
     }
@@ -465 +465 @@
         }
     }
 
-    m_replyWrapper = 0;
+    m_replyWrapper = nullptr;
 }
 
 void QNetworkReplyHandler::sendResponseIfNeeded()
@@ -539 +539 @@
                             newUrl.toString(),
                             QCoreApplication::translate("QWebPage", "Redirection limit reached"));
         client->didFail(m_resourceHandle, error);
-        m_replyWrapper = 0;
+        m_replyWrapper = nullptr;
         return;
     }
 
@@ -562 +562 @@
     if (wasAborted()) // Network error cancelled the request.
         return;
 
-    QObject* originatingObject = 0;
+    QObject* originatingObject = nullptr;
     if (m_resourceHandle->getInternal()->m_context)
         originatingObject = m_resourceHandle->getInternal()->m_context->originatingObject();