Ticket #40852: patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff

File patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff, 2.7 KB (added by BSeppke (Benjamin Seppke), 8 years ago)

WebKit and Mac OS X 10.9 patch

  • src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

    old new  
    5454
    5555bool NotificationPresenterClientQt::dumpNotification = false;
    5656
    57 NotificationPresenterClientQt* s_notificationPresenter = 0;
     57NotificationPresenterClientQt* s_notificationPresenter = nullptr;
    5858
    5959NotificationPresenterClientQt* NotificationPresenterClientQt::notificationPresenter()
    6060{
     
    7373#if ENABLE(NOTIFICATIONS)
    7474
    7575#ifndef QT_NO_SYSTEMTRAYICON
    76     m_notificationIcon = 0;
     76    m_notificationIcon = nullptr;
    7777#endif
    78     m_presenter = 0;
     78    m_presenter = nullptr;
    7979#endif
    8080}
    8181
     
    164164{
    165165    m_clientCount--;
    166166    if (!m_clientCount) {
    167         s_notificationPresenter = 0;
     167        s_notificationPresenter = nullptr;
    168168        delete this;
    169169    }
    170170}
     
    276276        return;
    277277    NotificationsQueue::ConstIterator end = m_notifications.end();
    278278    NotificationsQueue::ConstIterator iter = m_notifications.begin();
    279     Notification* notification = 0;
     279    Notification* notification = nullptr;
    280280    while (iter != end) {
    281281        notification = iter.key();
    282282        QString notificationTitle;
     
    300300        iter++;
    301301    if (iter != end)
    302302        return iter.key();
    303     return 0;
     303    return nullptr;
    304304}
    305305
    306306void NotificationPresenterClientQt::notificationObjectDestroyed(Notification* notification)
     
    388388
    389389void NotificationPresenterClientQt::removeReplacedNotificationFromQueue(Notification* notification)
    390390{
    391     Notification* oldNotification = 0;
     391    Notification* oldNotification = nullptr;
    392392    NotificationsQueue::Iterator end = m_notifications.end();
    393393    NotificationsQueue::Iterator iter = m_notifications.begin();
    394394
     
    437437QWebPage* NotificationPresenterClientQt::toPage(ScriptExecutionContext* context)
    438438{
    439439    if (!context || context->isWorkerContext())
    440         return 0;
     440        return nullptr;
    441441
    442442    Document* document = static_cast<Document*>(context);
    443443
    444444    Page* page = document->page();
    445445    if (!page || !page->mainFrame())
    446         return 0;
     446        return nullptr;
    447447
    448448    return QWebFramePrivate::kit(page->mainFrame())->page();
    449449}
     
    451451QWebFrame* NotificationPresenterClientQt::toFrame(ScriptExecutionContext* context)
    452452{
    453453    if (!context || context->isWorkerContext())
    454         return 0;
     454        return nullptr;
    455455
    456456    Document* document = static_cast<Document*>(context);
    457457    if (!document || !document->frame())
    458         return 0;
     458        return nullptr;
    459459
    460460    return QWebFramePrivate::kit(document->frame());
    461461}