diff -Nru bluez-qt-5.80.0/CMakeLists.txt bluez-qt-5.81.0/CMakeLists.txt --- bluez-qt-5.80.0/CMakeLists.txt 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/CMakeLists.txt 2021-04-03 09:27:40.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.80.0") # handled by release scripts +set(KF_VERSION "5.81.0") # handled by release scripts project(BluezQt VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.80.0 NO_MODULE) +find_package(ECM 5.81.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru bluez-qt-5.80.0/debian/changelog bluez-qt-5.81.0/debian/changelog --- bluez-qt-5.80.0/debian/changelog 2021-03-18 11:05:48.000000000 +0000 +++ bluez-qt-5.81.0/debian/changelog 2021-04-28 09:26:57.000000000 +0000 @@ -1,3 +1,9 @@ +bluez-qt (5.81.0-0ubuntu1) impish; urgency=medium + + * New upstream release (5.81.0) + + -- Rik Mills Wed, 28 Apr 2021 10:26:57 +0100 + bluez-qt (5.80.0-0ubuntu1) hirsute; urgency=medium * New upstream release (5.80.0) diff -Nru bluez-qt-5.80.0/debian/control bluez-qt-5.81.0/debian/control --- bluez-qt-5.80.0/debian/control 2021-03-18 11:05:48.000000000 +0000 +++ bluez-qt-5.81.0/debian/control 2021-04-28 09:26:57.000000000 +0000 @@ -8,7 +8,7 @@ dbus-x11, debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.80.0~), + extra-cmake-modules (>= 5.81.0~), graphviz, libqt5sql5-sqlite, pkg-kde-tools (>> 0.15.15), diff -Nru bluez-qt-5.80.0/src/CMakeLists.txt bluez-qt-5.81.0/src/CMakeLists.txt --- bluez-qt-5.80.0/src/CMakeLists.txt 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/CMakeLists.txt 2021-04-03 09:27:40.000000000 +0000 @@ -85,6 +85,7 @@ qt5_add_dbus_interface(bluezqt_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/org.bluez.Media1.xml bluezmedia1) qt5_add_dbus_interface(bluezqt_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/org.bluez.MediaEndpoint1.xml bluezmediaendpoint1) qt5_add_dbus_interface(bluezqt_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/org.bluez.MediaPlayer1.xml bluezmediaplayer1) +qt5_add_dbus_interface(bluezqt_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/org.bluez.MediaTransport1.xml bluezmediatransport1) qt5_add_dbus_interface(bluezqt_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/org.bluez.obex.AgentManager1.xml obexagentmanager1) qt5_add_dbus_interface(bluezqt_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/org.bluez.obex.Client1.xml obexclient1) qt5_add_dbus_interface(bluezqt_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/org.bluez.obex.Transfer1.xml obextransfer1) diff -Nru bluez-qt-5.80.0/src/gattmanager.cpp bluez-qt-5.81.0/src/gattmanager.cpp --- bluez-qt-5.80.0/src/gattmanager.cpp 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/gattmanager.cpp 2021-04-03 09:27:40.000000000 +0000 @@ -19,7 +19,6 @@ #include "pendingcall.h" #include "utils.h" -#include #include namespace BluezQt @@ -62,9 +61,7 @@ qCDebug(BLUEZQT) << "Cannot register object" << application->objectPath().path(); } - QList argumentList; - argumentList << QVariant::fromValue(application->objectPath()) << QVariantMap(); - return new PendingCall(d->m_dbusInterface->asyncCallWithArgumentList(QStringLiteral("RegisterApplication"), argumentList), PendingCall::ReturnVoid, this); + return new PendingCall(d->m_dbusInterface.RegisterApplication(application->objectPath(), QVariantMap()), PendingCall::ReturnVoid, this); } PendingCall *GattManager::unregisterApplication(GattApplication *application) @@ -73,9 +70,7 @@ DBusConnection::orgBluez().unregisterObject(application->objectPath().path()); - QList argumentList; - argumentList << QVariant::fromValue(application->objectPath()); - return new PendingCall(d->m_dbusInterface->asyncCallWithArgumentList(QStringLiteral("UnregisterApplication"), argumentList), PendingCall::ReturnVoid, this); + return new PendingCall(d->m_dbusInterface.UnregisterApplication(application->objectPath()), PendingCall::ReturnVoid, this); } } // namespace BluezQt diff -Nru bluez-qt-5.80.0/src/gattmanager_p.cpp bluez-qt-5.81.0/src/gattmanager_p.cpp --- bluez-qt-5.80.0/src/gattmanager_p.cpp 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/gattmanager_p.cpp 2021-04-03 09:27:40.000000000 +0000 @@ -9,18 +9,15 @@ #include "gattmanager_p.h" #include "utils.h" -#include - namespace BluezQt { GattManagerPrivate::GattManagerPrivate(const QString &path) + : m_dbusInterface(Strings::orgBluez(), path, DBusConnection::orgBluez()) { - m_dbusInterface = new QDBusInterface(Strings::orgBluez(), path, QStringLiteral("org.bluez.GattManager1"), DBusConnection::orgBluez()); } GattManagerPrivate::~GattManagerPrivate() { - delete m_dbusInterface; } } // namespace BluezQt diff -Nru bluez-qt-5.80.0/src/gattmanager_p.h bluez-qt-5.81.0/src/gattmanager_p.h --- bluez-qt-5.80.0/src/gattmanager_p.h 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/gattmanager_p.h 2021-04-03 09:27:40.000000000 +0000 @@ -8,7 +8,8 @@ #pragma once -class QDBusInterface; +#include "bluezgattmanager1.h" + class QString; namespace BluezQt @@ -19,7 +20,7 @@ GattManagerPrivate(const QString &path); ~GattManagerPrivate(); - QDBusInterface *m_dbusInterface = nullptr; + OrgBluezGattManager1Interface m_dbusInterface; }; } // namespace BluezQt diff -Nru bluez-qt-5.80.0/src/imports/declarativeadapter.cpp bluez-qt-5.81.0/src/imports/declarativeadapter.cpp --- bluez-qt-5.80.0/src/imports/declarativeadapter.cpp 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/imports/declarativeadapter.cpp 2021-04-03 09:27:40.000000000 +0000 @@ -9,7 +9,7 @@ #include "declarativeadapter.h" #include "declarativedevice.h" -static int devicesCountFunction(QQmlListProperty *property) +static int devicesCountDeclarativeAdapterFunction(QQmlListProperty *property) { Q_ASSERT(qobject_cast(property->object)); DeclarativeAdapter *adapter = static_cast(property->object); @@ -17,7 +17,7 @@ return adapter->m_devices.count(); } -static DeclarativeDevice *devicesAtFunction(QQmlListProperty *property, int index) +static DeclarativeDevice *devicesAtDeclarativeAdapterFunction(QQmlListProperty *property, int index) { Q_ASSERT(qobject_cast(property->object)); DeclarativeAdapter *adapter = static_cast(property->object); @@ -154,7 +154,7 @@ QQmlListProperty DeclarativeAdapter::devices() { - return QQmlListProperty(this, nullptr, devicesCountFunction, devicesAtFunction); + return QQmlListProperty(this, nullptr, devicesCountDeclarativeAdapterFunction, devicesAtDeclarativeAdapterFunction); } DeclarativeDevice *DeclarativeAdapter::deviceForAddress(const QString &address) const diff -Nru bluez-qt-5.80.0/src/interfaces/org.bluez.MediaTransport1.xml bluez-qt-5.81.0/src/interfaces/org.bluez.MediaTransport1.xml --- bluez-qt-5.80.0/src/interfaces/org.bluez.MediaTransport1.xml 1970-01-01 00:00:00.000000000 +0000 +++ bluez-qt-5.81.0/src/interfaces/org.bluez.MediaTransport1.xml 2021-04-03 09:27:40.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru bluez-qt-5.80.0/src/mediatransport.cpp bluez-qt-5.81.0/src/mediatransport.cpp --- bluez-qt-5.80.0/src/mediatransport.cpp 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/mediatransport.cpp 2021-04-03 09:27:40.000000000 +0000 @@ -39,17 +39,17 @@ TPendingCall *MediaTransport::acquire() { - return new TPendingCall(d->m_dbusInterface->asyncCall(QStringLiteral("Acquire")), this); + return new TPendingCall(d->m_dbusInterface.Acquire(), this); } TPendingCall *MediaTransport::tryAcquire() { - return new TPendingCall(d->m_dbusInterface->asyncCall(QStringLiteral("TryAcquire")), this); + return new TPendingCall(d->m_dbusInterface.TryAcquire(), this); } TPendingCall *MediaTransport::release() { - return new TPendingCall(d->m_dbusInterface->asyncCall(QStringLiteral("Release")), this); + return new TPendingCall(d->m_dbusInterface.Release(), this); } } // namespace BluezQt diff -Nru bluez-qt-5.80.0/src/mediatransport_p.cpp bluez-qt-5.81.0/src/mediatransport_p.cpp --- bluez-qt-5.80.0/src/mediatransport_p.cpp 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/mediatransport_p.cpp 2021-04-03 09:27:40.000000000 +0000 @@ -81,11 +81,10 @@ MediaTransportPrivate::MediaTransportPrivate(const QString &path, const QVariantMap &properties) : QObject() + , m_dbusInterface(Strings::orgBluez(), path, DBusConnection::orgBluez()) , m_dbusProperties(nullptr) , m_path(path) { - m_dbusInterface = new QDBusInterface(Strings::orgBluez(), path, QStringLiteral("org.bluez.MediaTransport1"), DBusConnection::orgBluez(), this); - DBusConnection::orgBluez().connect(Strings::orgBluez(), path, Strings::orgFreedesktopDBusProperties(), diff -Nru bluez-qt-5.80.0/src/mediatransport_p.h bluez-qt-5.81.0/src/mediatransport_p.h --- bluez-qt-5.80.0/src/mediatransport_p.h 2021-03-01 12:14:04.000000000 +0000 +++ bluez-qt-5.81.0/src/mediatransport_p.h 2021-04-03 09:27:40.000000000 +0000 @@ -8,6 +8,7 @@ #pragma once +#include "bluezmediatransport1.h" #include "dbusproperties.h" #include "mediatransport.h" @@ -29,7 +30,7 @@ public: QWeakPointer q; - QDBusInterface *m_dbusInterface; + OrgBluezMediaTransport1Interface m_dbusInterface; DBusProperties *m_dbusProperties; QString m_path;