diff --git a/src/qwaylandxdgactivationv1.cpp b/src/qwaylandxdgactivationv1.cpp index 7b0800e..d89ffcb 100644 --- a/src/qwaylandxdgactivationv1.cpp +++ b/src/qwaylandxdgactivationv1.cpp @@ -1,6 +1,6 @@ /** Copyright (C) 2020 Aleix Pol Gonzalez * SPDX-License-Identifier: LGPL-3.0-or-later -*/ + */ #include "qwaylandxdgactivationv1_p.h" #include @@ -19,11 +19,10 @@ QWaylandXdgActivationV1::~QWaylandXdgActivationV1() } } -QWaylandXdgActivationTokenV1 * -QWaylandXdgActivationV1::requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display, - struct ::wl_surface *surface, - std::optional serial, - const QString &app_id) +QWaylandXdgActivationTokenV1 *QWaylandXdgActivationV1::requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display, + struct ::wl_surface *surface, + std::optional serial, + const QString &app_id) { auto wl = get_activation_token(); auto provider = new QWaylandXdgActivationTokenV1; diff --git a/src/qwaylandxdgactivationv1_p.h b/src/qwaylandxdgactivationv1_p.h index ed863b3..5012fb1 100644 --- a/src/qwaylandxdgactivationv1_p.h +++ b/src/qwaylandxdgactivationv1_p.h @@ -5,28 +5,29 @@ #ifndef QWAYLANDXDGACTIVATIONV1_P_H #define QWAYLANDXDGACTIVATIONV1_P_H -#include #include "qwayland-xdg-activation-v1.h" +#include #include -namespace QtWaylandClient { +namespace QtWaylandClient +{ class QWaylandDisplay; class QWaylandSurface; } -class QWaylandXdgActivationTokenV1 - : public QObject - , public QtWayland::xdg_activation_token_v1 +class QWaylandXdgActivationTokenV1 : public QObject, public QtWayland::xdg_activation_token_v1 { Q_OBJECT public: - ~QWaylandXdgActivationTokenV1() override { + ~QWaylandXdgActivationTokenV1() override + { destroy(); } protected: - void xdg_activation_token_v1_done(const QString &token) override { + void xdg_activation_token_v1_done(const QString &token) override + { Q_EMIT done(token); } @@ -34,17 +35,14 @@ Q_SIGNALS: void done(const QString &token); }; -class QWaylandXdgActivationV1 : public QWaylandClientExtensionTemplate, public QtWayland::xdg_activation_v1 +class QWaylandXdgActivationV1 : public QWaylandClientExtensionTemplate, public QtWayland::xdg_activation_v1 { public: QWaylandXdgActivationV1(); ~QWaylandXdgActivationV1() override; - QWaylandXdgActivationTokenV1 *requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display, - struct ::wl_surface *surface, - std::optional serial, - const QString &app_id); + QWaylandXdgActivationTokenV1 * + requestXdgActivationToken(QtWaylandClient::QWaylandDisplay *display, struct ::wl_surface *surface, std::optional serial, const QString &app_id); }; - #endif // QWAYLANDXDGACTIVATIONV1_P_H