From ddf69010d89af71c8296b3987a63977e9d3f8100 Mon Sep 17 00:00:00 2001 From: nullobsi Date: Tue, 2 Feb 2021 00:18:38 -0800 Subject: [PATCH] code formatting --- src/utils/desktopinfo.cpp | 5 +++-- src/utils/request.cpp | 19 ++++++++++------- src/utils/request.h | 26 +++++++++++++---------- src/utils/screengrabber.cpp | 41 +++++++++++++++++-------------------- 4 files changed, 49 insertions(+), 42 deletions(-) diff --git a/src/utils/desktopinfo.cpp b/src/utils/desktopinfo.cpp index b9688c9d..c2200797 100644 --- a/src/utils/desktopinfo.cpp +++ b/src/utils/desktopinfo.cpp @@ -44,9 +44,10 @@ DesktopInfo::WM DesktopInfo::windowManager() Qt::CaseInsensitive) || !GNOME_DESKTOP_SESSION_ID.isEmpty()) { res = DesktopInfo::GNOME; - } else if (XDG_CURRENT_DESKTOP.contains(QLatin1String("sway"), Qt::CaseInsensitive)) { + } else if (XDG_CURRENT_DESKTOP.contains(QLatin1String("sway"), + Qt::CaseInsensitive)) { res = DesktopInfo::SWAY; - }else if (!KDE_FULL_SESSION.isEmpty() || + } else if (!KDE_FULL_SESSION.isEmpty() || DESKTOP_SESSION == QLatin1String("kde-plasma")) { res = DesktopInfo::KDE; } diff --git a/src/utils/request.cpp b/src/utils/request.cpp index 30307a31..a6c321bf 100644 --- a/src/utils/request.cpp +++ b/src/utils/request.cpp @@ -6,11 +6,16 @@ */ #include "request.h" -OrgFreedesktopPortalRequestInterface::OrgFreedesktopPortalRequestInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) - : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) -{ -} +OrgFreedesktopPortalRequestInterface::OrgFreedesktopPortalRequestInterface( + const QString& service, + const QString& path, + const QDBusConnection& connection, + QObject* parent) + : QDBusAbstractInterface(service, + path, + staticInterfaceName(), + connection, + parent) +{} -OrgFreedesktopPortalRequestInterface::~OrgFreedesktopPortalRequestInterface() -{ -} \ No newline at end of file +OrgFreedesktopPortalRequestInterface::~OrgFreedesktopPortalRequestInterface() {} \ No newline at end of file diff --git a/src/utils/request.h b/src/utils/request.h index 83a33e4a..64f6ac60 100644 --- a/src/utils/request.h +++ b/src/utils/request.h @@ -10,10 +10,10 @@ #ifndef RESPONSE_CPP #define RESPONSE_CPP -#include #include #include #include +#include #include #include #include @@ -22,15 +22,20 @@ /* * Proxy class for interface org.freedesktop.portal.Request */ -class OrgFreedesktopPortalRequestInterface: public QDBusAbstractInterface +class OrgFreedesktopPortalRequestInterface : public QDBusAbstractInterface { Q_OBJECT public: - static inline const char *staticInterfaceName() - { return "org.freedesktop.portal.Request"; } + static inline const char* staticInterfaceName() + { + return "org.freedesktop.portal.Request"; + } public: - OrgFreedesktopPortalRequestInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); + OrgFreedesktopPortalRequestInterface(const QString& service, + const QString& path, + const QDBusConnection& connection, + QObject* parent = nullptr); ~OrgFreedesktopPortalRequestInterface(); @@ -46,11 +51,10 @@ Q_SIGNALS: // SIGNALS }; namespace org { - namespace freedesktop { - namespace portal { - typedef ::OrgFreedesktopPortalRequestInterface Request; - } - } +namespace freedesktop { +namespace portal { +typedef ::OrgFreedesktopPortalRequestInterface Request; +} +} } #endif - diff --git a/src/utils/screengrabber.cpp b/src/utils/screengrabber.cpp index de3eb4d8..306a41d6 100644 --- a/src/utils/screengrabber.cpp +++ b/src/utils/screengrabber.cpp @@ -25,10 +25,10 @@ #include #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) +#include "request.h" #include #include #include -#include "request.h" #endif ScreenGrabber::ScreenGrabber(QObject* parent) @@ -90,37 +90,34 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool& ok) break; } case DesktopInfo::SWAY: { - qDebug("Sway"); QDBusInterface screenshotInterface( QStringLiteral("org.freedesktop.portal.Desktop"), QStringLiteral("/org/freedesktop/portal/desktop"), QStringLiteral("org.freedesktop.portal.Screenshot")); - QDBusReply reply = - screenshotInterface.call(QStringLiteral("Screenshot"), - "", - QMap()); - auto *request = new OrgFreedesktopPortalRequestInterface( + QDBusReply reply = screenshotInterface.call( + QStringLiteral("Screenshot"), "", QMap()); + auto* request = new OrgFreedesktopPortalRequestInterface( QStringLiteral("org.freedesktop.portal.Desktop"), reply.value().path(), QDBusConnection::sessionBus(), this); QEventLoop loop; - const auto gotSignal = - [&res, &loop](uint status, - const QVariantMap &map) { - if (status == 0) { - QString uri = map.value("uri").toString().remove(0, 7); - res = QPixmap(uri); - res.setDevicePixelRatio(qApp->devicePixelRatio()); - QFile imgFile(uri); - imgFile.remove(); - } - loop.quit(); - }; - QMetaObject::Connection conn = QObject::connect(request, - &org::freedesktop::portal::Request::Response, - gotSignal); + const auto gotSignal = [&res, &loop](uint status, + const QVariantMap& map) { + if (status == 0) { + QString uri = map.value("uri").toString().remove(0, 7); + res = QPixmap(uri); + res.setDevicePixelRatio(qApp->devicePixelRatio()); + QFile imgFile(uri); + imgFile.remove(); + } + loop.quit(); + }; + QMetaObject::Connection conn = + QObject::connect(request, + &org::freedesktop::portal::Request::Response, + gotSignal); loop.exec(); QObject::disconnect(conn); request->Close().waitForFinished();