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), 10 years ago) |
---|
-
src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.
old new 234 234 235 235 resetConnections(); 236 236 QNetworkReply* reply = m_reply; 237 m_reply = 0;238 m_sniffer = 0;237 m_reply = nullptr; 238 m_sniffer = nullptr; 239 239 240 240 reply->setParent(0); 241 241 return reply; … … 300 300 Q_ASSERT(m_sniffer); 301 301 302 302 m_sniffedMIMEType = m_sniffer->mimeType(); 303 m_sniffer = 0;303 m_sniffer = nullptr; 304 304 305 305 emitMetaDataChanged(); 306 306 } … … 392 392 else 393 393 m_method = QNetworkAccessManager::CustomOperation; 394 394 395 QObject* originatingObject = 0;395 QObject* originatingObject = nullptr; 396 396 if (m_resourceHandle->getInternal()->m_context) 397 397 originatingObject = m_resourceHandle->getInternal()->m_context->originatingObject(); 398 398 … … 417 417 return 0; 418 418 419 419 QNetworkReply* reply = m_replyWrapper->release(); 420 m_replyWrapper = 0;420 m_replyWrapper = nullptr; 421 421 return reply; 422 422 } 423 423 … … 440 440 441 441 ResourceHandleClient* client = m_resourceHandle->client(); 442 442 if (!client) { 443 m_replyWrapper = 0;443 m_replyWrapper = nullptr; 444 444 return; 445 445 } 446 446 447 447 if (m_replyWrapper->wasRedirected()) { 448 m_replyWrapper = 0;448 m_replyWrapper = nullptr; 449 449 m_queue.push(&QNetworkReplyHandler::start); 450 450 return; 451 451 } … … 465 465 } 466 466 } 467 467 468 m_replyWrapper = 0;468 m_replyWrapper = nullptr; 469 469 } 470 470 471 471 void QNetworkReplyHandler::sendResponseIfNeeded() … … 539 539 newUrl.toString(), 540 540 QCoreApplication::translate("QWebPage", "Redirection limit reached")); 541 541 client->didFail(m_resourceHandle, error); 542 m_replyWrapper = 0;542 m_replyWrapper = nullptr; 543 543 return; 544 544 } 545 545 … … 562 562 if (wasAborted()) // Network error cancelled the request. 563 563 return; 564 564 565 QObject* originatingObject = 0;565 QObject* originatingObject = nullptr; 566 566 if (m_resourceHandle->getInternal()->m_context) 567 567 originatingObject = m_resourceHandle->getInternal()->m_context->originatingObject(); 568 568