diff options
3 files changed, 10 insertions, 10 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index f40da4ddde..a630432f62 100644 --- a/src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -235,7 +235,7 @@ QNetworkReply* QNetworkReplyWrapper::release() resetConnections(); QNetworkReply* reply = m_reply; m_reply = 0; - m_sniffer = 0; + m_sniffer = nullptr; reply->setParent(0); return reply; @@ -300,7 +300,7 @@ void QNetworkReplyWrapper::receiveSniffedMIMEType() Q_ASSERT(m_sniffer); m_sniffedMIMEType = m_sniffer->mimeType(); - m_sniffer = 0; + m_sniffer = nullptr; emitMetaDataChanged(); } @@ -417,7 +417,7 @@ QNetworkReply* QNetworkReplyHandler::release() return 0; QNetworkReply* reply = m_replyWrapper->release(); - m_replyWrapper = 0; + m_replyWrapper = nullptr; return reply; } @@ -440,12 +440,12 @@ void QNetworkReplyHandler::finish() 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,7 +465,7 @@ void QNetworkReplyHandler::finish() } } - m_replyWrapper = 0; + m_replyWrapper = nullptr; } void QNetworkReplyHandler::sendResponseIfNeeded() @@ -539,7 +539,7 @@ void QNetworkReplyHandler::redirect(ResourceResponse& response, const QUrl& redi newUrl.toString(), QCoreApplication::translate("QWebPage", "Redirection limit reached")); client->didFail(m_resourceHandle, error); - m_replyWrapper = 0; + m_replyWrapper = nullptr; return; } diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp index b7b28bc47c..c4dd6d0ed3 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp @@ -471,7 +471,7 @@ void QGraphicsWebViewPrivate::detachCurrentPage() return; page->d->view.clear(); - page->d->client = 0; + page->d->client = nullptr; // if the page was created by us, we own it and need to // destroy it as well. diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp index b2b81323cf..7ff927801e 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp @@ -73,9 +73,9 @@ NotificationWrapper::NotificationWrapper() #if ENABLE(NOTIFICATIONS) #ifndef QT_NO_SYSTEMTRAYICON - m_notificationIcon = 0; + m_notificationIcon = nullptr; #endif - m_presenter = 0; + m_presenter = nullptr; #endif } |