From b4b446915ac5fe420e8268a33dd19d24b2dc793d Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Thu, 12 May 2016 18:12:36 +0300 Subject: [PATCH] Rename QWaylandClientExtension's active() to isActive() Change-Id: Idaf14be727af20d308c21f2cf33db6d417765744 Reviewed-by: Pier Luigi Fiorini --- .../platforms/wayland/global/qwaylandclientextension.cpp | 2 +- .../platforms/wayland/global/qwaylandclientextension.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp index b71c41d11e9..95616f7e8f1 100644 --- a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp +++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp @@ -105,7 +105,7 @@ void QWaylandClientExtension::setVersion(const int ver) } } -bool QWaylandClientExtension::active() const +bool QWaylandClientExtension::isActive() const { Q_D(const QWaylandClientExtension); return d->active; diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.h b/src/plugins/platforms/wayland/global/qwaylandclientextension.h index aee03eb2911..b9a3017d9e4 100644 --- a/src/plugins/platforms/wayland/global/qwaylandclientextension.h +++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.h @@ -54,13 +54,13 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QWaylandClientExtension) Q_PROPERTY(int protocolVersion READ version NOTIFY versionChanged) - Q_PROPERTY(bool active READ active NOTIFY activeChanged) + Q_PROPERTY(bool active READ isActive NOTIFY activeChanged) public: QWaylandClientExtension(const int version); QWaylandIntegration *integration() const; int version() const; - bool active() const; + bool isActive() const; virtual const struct wl_interface *extensionInterface() const = 0; virtual void bind(struct ::wl_registry *registry, int id, int version) = 0;