Notification API cleanup: direction type, parameter and method names

Change-Id: I0349f3eea0028a4df917af8599c073227e0d0ec1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp b/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp
index c15a80373..da97c4662 100644
--- a/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp
+++ b/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp
@@ -57,11 +57,15 @@ DefaultNotificationPresenter::~DefaultNotificationPresenter()
 
 void DefaultNotificationPresenter::show(const QWebEngineNotification &notification)
 {
-    if (!m_activeNotification.isNull())
+    if (m_activeNotification.isValid()) {
         m_activeNotification.close();
+        m_activeNotification.disconnect(this);
+    }
+
     m_activeNotification = notification;
+
 #ifndef QT_NO_SYSTEMTRAYICON
-    if (m_systemTrayIcon) {
+    if (m_activeNotification.isValid() && m_systemTrayIcon) {
         m_systemTrayIcon->show();
         QIcon icon = notification.icon();
         if (!icon.isNull())
@@ -76,7 +80,7 @@ void DefaultNotificationPresenter::show(const QWebEngineNotification &notificati
 
 void DefaultNotificationPresenter::messageClicked()
 {
-    if (!m_activeNotification.isNull())
+    if (m_activeNotification.isValid())
         m_activeNotification.click();
 }