Ticket #40852: patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff

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

@@ -54 +54 @@
 
 bool NotificationPresenterClientQt::dumpNotification = false;
 
-NotificationPresenterClientQt* s_notificationPresenter = 0;
+NotificationPresenterClientQt* s_notificationPresenter = nullptr;
 
 NotificationPresenterClientQt* NotificationPresenterClientQt::notificationPresenter()
 {
@@ -73 +73 @@
 #if ENABLE(NOTIFICATIONS)
 
 #ifndef QT_NO_SYSTEMTRAYICON
-    m_notificationIcon = 0;
+    m_notificationIcon = nullptr;
 #endif
-    m_presenter = 0;
+    m_presenter = nullptr;
 #endif
 }
 
@@ -164 +164 @@
 {
     m_clientCount--;
     if (!m_clientCount) {
-        s_notificationPresenter = 0;
+        s_notificationPresenter = nullptr;
         delete this;
     }
 }
@@ -276 +276 @@
         return;
     NotificationsQueue::ConstIterator end = m_notifications.end();
     NotificationsQueue::ConstIterator iter = m_notifications.begin();
-    Notification* notification = 0;
+    Notification* notification = nullptr;
     while (iter != end) {
         notification = iter.key();
         QString notificationTitle;
@@ -300 +300 @@
         iter++;
     if (iter != end)
         return iter.key();
-    return 0;
+    return nullptr;
 }
 
 void NotificationPresenterClientQt::notificationObjectDestroyed(Notification* notification)
@@ -388 +388 @@
 
 void NotificationPresenterClientQt::removeReplacedNotificationFromQueue(Notification* notification)
 {
-    Notification* oldNotification = 0;
+    Notification* oldNotification = nullptr;
     NotificationsQueue::Iterator end = m_notifications.end();
     NotificationsQueue::Iterator iter = m_notifications.begin();
 
@@ -437 +437 @@
 QWebPage* NotificationPresenterClientQt::toPage(ScriptExecutionContext* context)
 {
     if (!context || context->isWorkerContext())
-        return 0;
+        return nullptr;
 
     Document* document = static_cast<Document*>(context);
 
     Page* page = document->page();
     if (!page || !page->mainFrame())
-        return 0;
+        return nullptr;
 
     return QWebFramePrivate::kit(page->mainFrame())->page();
 }
@@ -451 +451 @@
 QWebFrame* NotificationPresenterClientQt::toFrame(ScriptExecutionContext* context)
 {
     if (!context || context->isWorkerContext())
-        return 0;
+        return nullptr;
 
     Document* document = static_cast<Document*>(context);
     if (!document || !document->frame())
-        return 0;
+        return nullptr;
 
     return QWebFramePrivate::kit(document->frame());
 }