Ticket #40852: patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff

File patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff, 2.3 KB (added by BSeppke (Benjamin Seppke), 7 years ago)

WebKit and Mac OS X 10.9 patch

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

    old new  
    234234
    235235    resetConnections();
    236236    QNetworkReply* reply = m_reply;
    237     m_reply = 0;
    238     m_sniffer = 0;
     237    m_reply = nullptr;
     238    m_sniffer = nullptr;
    239239
    240240    reply->setParent(0);
    241241    return reply;
     
    300300    Q_ASSERT(m_sniffer);
    301301
    302302    m_sniffedMIMEType = m_sniffer->mimeType();
    303     m_sniffer = 0;
     303    m_sniffer = nullptr;
    304304
    305305    emitMetaDataChanged();
    306306}
     
    392392    else
    393393        m_method = QNetworkAccessManager::CustomOperation;
    394394
    395     QObject* originatingObject = 0;
     395    QObject* originatingObject = nullptr;
    396396    if (m_resourceHandle->getInternal()->m_context)
    397397        originatingObject = m_resourceHandle->getInternal()->m_context->originatingObject();
    398398
     
    417417        return 0;
    418418
    419419    QNetworkReply* reply = m_replyWrapper->release();
    420     m_replyWrapper = 0;
     420    m_replyWrapper = nullptr;
    421421    return reply;
    422422}
    423423
     
    440440
    441441    ResourceHandleClient* client = m_resourceHandle->client();
    442442    if (!client) {
    443         m_replyWrapper = 0;
     443        m_replyWrapper = nullptr;
    444444        return;
    445445    }
    446446
    447447    if (m_replyWrapper->wasRedirected()) {
    448         m_replyWrapper = 0;
     448        m_replyWrapper = nullptr;
    449449        m_queue.push(&QNetworkReplyHandler::start);
    450450        return;
    451451    }
     
    465465        }
    466466    }
    467467
    468     m_replyWrapper = 0;
     468    m_replyWrapper = nullptr;
    469469}
    470470
    471471void QNetworkReplyHandler::sendResponseIfNeeded()
     
    539539                            newUrl.toString(),
    540540                            QCoreApplication::translate("QWebPage", "Redirection limit reached"));
    541541        client->didFail(m_resourceHandle, error);
    542         m_replyWrapper = 0;
     542        m_replyWrapper = nullptr;
    543543        return;
    544544    }
    545545
     
    562562    if (wasAborted()) // Network error cancelled the request.
    563563        return;
    564564
    565     QObject* originatingObject = 0;
     565    QObject* originatingObject = nullptr;
    566566    if (m_resourceHandle->getInternal()->m_context)
    567567        originatingObject = m_resourceHandle->getInternal()->m_context->originatingObject();
    568568