From aa54ad2d6e8fa5d0357bcadaf9b5a679c358728f Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Tue, 27 Aug 2019 20:45:09 +0200 Subject: Fix issues raised during API review Some mistakes were spotted during the API comparison between version 5.13 and 5.14. Change-Id: I4135e28deb0b21c6a0cc4715e42bf00664a111d0 Reviewed-by: Johan Helsing --- src/compositor/compositor_api/qwaylandsurface.h | 2 +- src/compositor/extensions/qwaylandidleinhibitv1.cpp | 5 +++++ src/compositor/extensions/qwaylandidleinhibitv1.h | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/compositor') diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h index ecb53704..f8cdc443 100644 --- a/src/compositor/compositor_api/qwaylandsurface.h +++ b/src/compositor/compositor_api/qwaylandsurface.h @@ -92,7 +92,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSurface : public QWaylandObject Q_PROPERTY(QWaylandSurface::Origin origin READ origin NOTIFY originChanged) Q_PROPERTY(bool hasContent READ hasContent NOTIFY hasContentChanged) Q_PROPERTY(bool cursorSurface READ isCursorSurface WRITE markAsCursorSurface NOTIFY cursorSurfaceChanged) - Q_PROPERTY(bool inhibitsIdle READ inhibitsIdle NOTIFY inhibitsIdleChanged) + Q_PROPERTY(bool inhibitsIdle READ inhibitsIdle NOTIFY inhibitsIdleChanged REVISION 14) public: enum Origin { diff --git a/src/compositor/extensions/qwaylandidleinhibitv1.cpp b/src/compositor/extensions/qwaylandidleinhibitv1.cpp index 9e586a77..b97f5813 100644 --- a/src/compositor/extensions/qwaylandidleinhibitv1.cpp +++ b/src/compositor/extensions/qwaylandidleinhibitv1.cpp @@ -100,6 +100,11 @@ QWaylandIdleInhibitManagerV1::QWaylandIdleInhibitManagerV1(QWaylandCompositor *c { } +/*! + Destructs a QWaylandIdleInhibitManagerV1 object. +*/ +QWaylandIdleInhibitManagerV1::~QWaylandIdleInhibitManagerV1() = default; + /*! Initializes the extension. */ diff --git a/src/compositor/extensions/qwaylandidleinhibitv1.h b/src/compositor/extensions/qwaylandidleinhibitv1.h index 49e38fcf..53c09d08 100644 --- a/src/compositor/extensions/qwaylandidleinhibitv1.h +++ b/src/compositor/extensions/qwaylandidleinhibitv1.h @@ -48,8 +48,9 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandIdleInhibitManagerV1 : public QWayland Q_OBJECT Q_DECLARE_PRIVATE(QWaylandIdleInhibitManagerV1) public: - explicit QWaylandIdleInhibitManagerV1(); - QWaylandIdleInhibitManagerV1(QWaylandCompositor *compositor); + QWaylandIdleInhibitManagerV1(); + explicit QWaylandIdleInhibitManagerV1(QWaylandCompositor *compositor); + ~QWaylandIdleInhibitManagerV1(); void initialize() override; -- cgit v1.2.1