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/abstractdbuscontextadaptor.h | |
| 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/abstractdbuscontextadaptor.h')
| -rw-r--r-- | src/dbus-lib/abstractdbuscontextadaptor.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/dbus-lib/abstractdbuscontextadaptor.h b/src/dbus-lib/abstractdbuscontextadaptor.h deleted file mode 100644 index f38da0de..00000000 --- a/src/dbus-lib/abstractdbuscontextadaptor.h +++ /dev/null @@ -1,36 +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 - -#pragma once - -#include <QtAppManCommon/global.h> -#include <QtCore/QObject> -#include <QtDBus/QDBusContext> - -QT_FORWARD_DECLARE_CLASS(QDBusAbstractAdaptor) - -QT_BEGIN_NAMESPACE_AM - -class AbstractDBusContextAdaptor : public QObject, public QDBusContext -{ - Q_OBJECT - -public: - QDBusAbstractAdaptor *generatedAdaptor(); - static QDBusContext *dbusContextFor(QDBusAbstractAdaptor *adaptor); - -protected: - explicit AbstractDBusContextAdaptor(QObject *realObject); - QDBusAbstractAdaptor *m_adaptor = nullptr; -}; - -#define AM_AUTHENTICATE_DBUS(RETURN_TYPE) \ - do { \ - if (!DBusPolicy::check(this, __FUNCTION__)) \ - return RETURN_TYPE(); \ - } while (false); - - -QT_END_NAMESPACE_AM |