diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-09-14 23:37:17 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2023-09-26 13:29:21 +0200 |
| commit | 39c8befe86fdc2a1fcdea4246679631dddc7d518 (patch) | |
| tree | 5db63228f8b3a039110ee87f07c518855339187f /src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp | |
| parent | 3b47cfced267f82388a9832c9ecb3ec6b1e7eefd (diff) | |
DBus cleanup
Apart from making the code look nicer, this is a necessary precursor to
rewriting the AM <-> launcher DBus communication using auto-generated
adaptors and interfaces.
* Moved all DBus interface XML files to a dedicated directory
* Moved the actual adaptor implementations into main-lib
* Converted dbus-lib to a small helper lib without dependencies
Change-Id: I749eb5c3435dac8183823f9502d935168c05a682
Task-number: QTBUG-103266
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp')
| -rw-r--r-- | src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp deleted file mode 100644 index 52c247f0..00000000 --- a/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// Copyright (C) 2019 Luxoft Sweden AB -// Copyright (C) 2018 Pelagicore AG -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -#include <qplatformdefs.h> -#if defined(Q_OS_UNIX) -# include <unistd.h> -#endif - -#include "notificationmanagerdbuscontextadaptor.h" -#include "notificationmanager.h" -#include "notifications_adaptor.h" - -QT_BEGIN_NAMESPACE_AM - -NotificationManagerDBusContextAdaptor::NotificationManagerDBusContextAdaptor(NotificationManager *nm) - : AbstractDBusContextAdaptor(nm) -{ - m_adaptor = new NotificationsAdaptor(this); -} - -QT_END_NAMESPACE_AM - -///////////////////////////////////////////////////////////////////////////////////// - -QT_USE_NAMESPACE_AM - -NotificationsAdaptor::NotificationsAdaptor(QObject *parent) - : QDBusAbstractAdaptor(parent) -{ - auto nm = NotificationManager::instance(); - - connect(nm, &NotificationManager::ActionInvoked, - this, &NotificationsAdaptor::ActionInvoked); - connect(nm, &NotificationManager::NotificationClosed, - this, &NotificationsAdaptor::NotificationClosed); -} - -NotificationsAdaptor::~NotificationsAdaptor() -{ } - -void NotificationsAdaptor::CloseNotification(uint id) -{ - NotificationManager::instance()->CloseNotification(id); -} - -QStringList NotificationsAdaptor::GetCapabilities() -{ - return NotificationManager::instance()->GetCapabilities(); -} - -QString NotificationsAdaptor::GetServerInformation(QString &vendor, QString &version, QString &spec_version) -{ - return NotificationManager::instance()->GetServerInformation(vendor, version, spec_version); -} - -uint NotificationsAdaptor::Notify(const QString &app_name, uint replaces_id, const QString &app_icon, const QString &summary, const QString &body, const QStringList &actions, const QVariantMap &hints, int timeout) -{ - return NotificationManager::instance()->Notify(app_name, replaces_id, app_icon, summary, body, actions, hints, timeout); -} - |