diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2019-02-27 19:02:50 +0100 |
---|---|---|
committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-03-19 20:40:40 +0000 |
commit | 0f30fe4b6ae26b4797272926318c31b1f07acc20 (patch) | |
tree | 70aa42b8f45dd9613bdb12cfda6220509f32361c /src/core/api | |
parent | 10e65c418625f586430d3033e71bd3b4d69b7420 (diff) |
Notification API cleanup: direction type, parameter and method names
Change-Id: I0349f3eea0028a4df917af8599c073227e0d0ec1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/api')
-rw-r--r-- | src/core/api/qwebenginenotification.cpp | 10 | ||||
-rw-r--r-- | src/core/api/qwebenginenotification.h | 21 |
2 files changed, 12 insertions, 19 deletions
diff --git a/src/core/api/qwebenginenotification.cpp b/src/core/api/qwebenginenotification.cpp index edbb8934f..89fd1eff9 100644 --- a/src/core/api/qwebenginenotification.cpp +++ b/src/core/api/qwebenginenotification.cpp @@ -217,18 +217,18 @@ QString QWebEngineNotification::language() const \brief The text direction for the notification's title and body. \sa title(), message() */ -QWebEngineNotification::Direction QWebEngineNotification::direction() const +Qt::LayoutDirection QWebEngineNotification::direction() const { Q_D(const QWebEngineNotification); - return d ? static_cast<Direction>(d->controller->direction()) : DirectionAuto; + return d ? d->controller->direction() : Qt::LayoutDirectionAuto; } /*! - Returns \c true if the notification is a default constructed null notification. + Returns \c true if the notification is not a default constructed null notification. */ -bool QWebEngineNotification::isNull() const +bool QWebEngineNotification::isValid() const { - return d_ptr.isNull(); + return !d_ptr.isNull(); } /*! diff --git a/src/core/api/qwebenginenotification.h b/src/core/api/qwebenginenotification.h index b6b7414f9..0012e5d78 100644 --- a/src/core/api/qwebenginenotification.h +++ b/src/core/api/qwebenginenotification.h @@ -64,22 +64,15 @@ class QWEBENGINECORE_EXPORT QWebEngineNotification : public QObject { Q_PROPERTY(QString message READ message CONSTANT FINAL) Q_PROPERTY(QString tag READ tag CONSTANT FINAL) Q_PROPERTY(QString language READ language CONSTANT FINAL) - Q_PROPERTY(Direction direction READ direction CONSTANT FINAL) + Q_PROPERTY(Qt::LayoutDirection direction READ direction CONSTANT FINAL) public: QWebEngineNotification(); - QWebEngineNotification(const QWebEngineNotification &); + QWebEngineNotification(const QWebEngineNotification &other); virtual ~QWebEngineNotification(); - const QWebEngineNotification &operator=(const QWebEngineNotification &); + const QWebEngineNotification &operator=(const QWebEngineNotification &other); - enum Direction { - LeftToRight = Qt::LeftToRight, - RightToLeft = Qt::RightToLeft, - DirectionAuto = Qt::LayoutDirectionAuto - }; - Q_ENUM(Direction) - - bool matches(const QWebEngineNotification &) const; + bool matches(const QWebEngineNotification &other) const; QUrl origin() const; QIcon icon() const; @@ -87,9 +80,9 @@ public: QString message() const; QString tag() const; QString language() const; - Direction direction() const; + Qt::LayoutDirection direction() const; - bool isNull() const; + bool isValid() const; public Q_SLOTS: void show() const; @@ -100,7 +93,7 @@ Q_SIGNALS: void closed(); private: - QWebEngineNotification(const QSharedPointer<QtWebEngineCore::UserNotificationController> &); + QWebEngineNotification(const QSharedPointer<QtWebEngineCore::UserNotificationController> &controller); Q_DECLARE_PRIVATE(QWebEngineNotification) QScopedPointer<QWebEngineNotificationPrivate> d_ptr; friend class QQuickWebEngineProfilePrivate; |