Notification API cleanup

Task-number: QTBUG-74543
Change-Id: Ice5a0dbfc3485c8b7e6fa900ef427a9aed871d42
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 5 insertions, 11 deletions

diff --git a/src/core/api/qwebenginenotification.h b/src/core/api/qwebenginenotification.h
index 6c9a8f891..08fd629be 100644
--- a/src/core/api/qwebenginenotification.h
+++ b/src/core/api/qwebenginenotification.h
@@ -46,7 +46,6 @@
 #include <QtCore/QScopedPointer>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
-#include <QtGui/QIcon>
 
 namespace QtWebEngineCore {
 class UserNotificationController;
@@ -59,7 +58,6 @@ class QWebEngineNotificationPrivate;
 class Q_WEBENGINECORE_EXPORT QWebEngineNotification : public QObject {
     Q_OBJECT
     Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
-    Q_PROPERTY(QIcon icon READ icon CONSTANT FINAL)
     Q_PROPERTY(QString title READ title CONSTANT FINAL)
     Q_PROPERTY(QString message READ message CONSTANT FINAL)
     Q_PROPERTY(QString tag READ tag CONSTANT FINAL)
@@ -67,23 +65,18 @@ class Q_WEBENGINECORE_EXPORT QWebEngineNotification : public QObject {
     Q_PROPERTY(Qt::LayoutDirection direction READ direction CONSTANT FINAL)
 
 public:
-    QWebEngineNotification();
-    QWebEngineNotification(const QWebEngineNotification &other);
-    virtual ~QWebEngineNotification();
-    const QWebEngineNotification &operator=(const QWebEngineNotification &other);
+    virtual ~QWebEngineNotification() override;
 
-    bool matches(const QWebEngineNotification &other) const;
+    bool matches(const QWebEngineNotification *other) const;
 
     QUrl origin() const;
-    QIcon icon() const;
+    QImage icon() const;
     QString title() const;
     QString message() const;
     QString tag() const;
     QString language() const;
     Qt::LayoutDirection direction() const;
 
-    bool isValid() const;
-
 public Q_SLOTS:
     void show() const;
     void click() const;
@@ -93,8 +86,9 @@ Q_SIGNALS:
     void closed();
 
 private:
-    QWebEngineNotification(const QSharedPointer<QtWebEngineCore::UserNotificationController> &controller);
+    Q_DISABLE_COPY(QWebEngineNotification)
     Q_DECLARE_PRIVATE(QWebEngineNotification)
+    QWebEngineNotification(const QSharedPointer<QtWebEngineCore::UserNotificationController> &controller);
     QScopedPointer<QWebEngineNotificationPrivate> d_ptr;
     friend class QQuickWebEngineProfilePrivate;
     friend class QWebEngineProfilePrivate;