qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BlueZ: rename generated DBus propperites interface class 

To avoid symbol clashing with the same interface added to QtGui in
qtbase/38251c36edf11316a2467169b1d491bf13520fd3.
Conveniently, qdbusxml2cpp already provides a command line option to
set a custom name for the generated class.

It's easier to fix it on QtBluetooth side, because the files are
generated by the script and later committed to the repo, while on
QtGui side they are handled directly by CMake, which for now provides
less granularity.

As a drive-by: fix an error in the DBus interface description.

Fixes: QTBUG-133553
Pick-to: 6.9 6.8
Change-Id: I2ab413bf617f53e26c37e430198e58071c84d49c
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ivan Solovev 2025-02-10 11:07:55 +01:00
parent 42cb59dcde
commit e3a72c6017
11 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bluetooth/bluez/bluez5_helper.cpp
View File

@ -254,7 +254,7 @@ public:
int reference;
bool wasListeningAlready;
OrgFreedesktopDBusPropertiesInterface *propteryListener = nullptr;
OrgFreedesktopDBusPropertiesInterfaceBluetooth *propteryListener = nullptr;
};
class QtBluezDiscoveryManagerPrivate
@ -335,9 +335,9 @@ bool QtBluezDiscoveryManager::registerDiscoveryInterest(const QString &adapterPa
AdapterData *data = new AdapterData();
OrgFreedesktopDBusPropertiesInterface *propIface = new OrgFreedesktopDBusPropertiesInterface(
OrgFreedesktopDBusPropertiesInterfaceBluetooth *propIface = new OrgFreedesktopDBusPropertiesInterfaceBluetooth(
QStringLiteral("org.bluez"), adapterPath, QDBusConnection::systemBus());
connect(propIface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
connect(propIface, &OrgFreedesktopDBusPropertiesInterfaceBluetooth::PropertiesChanged,
this, &QtBluezDiscoveryManager::PropertiesChanged);
data->propteryListener = propIface;
@ -406,8 +406,8 @@ void QtBluezDiscoveryManager::PropertiesChanged(const QString &interface,
{
Q_UNUSED(invalidated_properties);
OrgFreedesktopDBusPropertiesInterface *propIface =
qobject_cast<OrgFreedesktopDBusPropertiesInterface *>(sender());
OrgFreedesktopDBusPropertiesInterfaceBluetooth *propIface =
qobject_cast<OrgFreedesktopDBusPropertiesInterfaceBluetooth *>(sender());
if (!propIface)
return;

2
src/bluetooth/bluez/generate
View File

@ -22,7 +22,7 @@ process profilemanager1 org.bluez.ProfileManager1.xml
process profile1 org.bluez.Profile1.xml
process objectmanager org.freedesktop.dbus.objectmanager.xml -i bluez5_helper_p.h
process properties org.freedesktop.dbus.properties.xml
process properties org.freedesktop.dbus.properties.xml -c OrgFreedesktopDBusPropertiesInterfaceBluetooth
process gattchar1 org.bluez.GattCharacteristic1.xml
process gattdesc1 org.bluez.GattDescriptor1.xml

2
src/bluetooth/bluez/org.freedesktop.dbus.properties.xml
View File

@ -20,7 +20,7 @@
<signal name="PropertiesChanged">
<arg name="interface" type="s"/>
<arg name="changed_properties" type="a{sv}"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
<arg name="invalidated_properties" type="as"/>
</signal>
</interface>

10
src/bluetooth/bluez/properties.cpp
View File

@ -1,8 +1,8 @@
/*
* This file was generated by qdbusxml2cpp version 0.8
* Command line was: qdbusxml2cpp -I QtCore/private/qglobal_p.h -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
* Source file was org.freedesktop.dbus.properties.xml
*
* qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
* qdbusxml2cpp is Copyright (C) The Qt Company Ltd. and other contributors.
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
@ -12,15 +12,15 @@
#include "properties_p.h"
/*
* Implementation of interface class OrgFreedesktopDBusPropertiesInterface
* Implementation of interface class OrgFreedesktopDBusPropertiesInterfaceBluetooth
*/
OrgFreedesktopDBusPropertiesInterface::OrgFreedesktopDBusPropertiesInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
OrgFreedesktopDBusPropertiesInterfaceBluetooth::OrgFreedesktopDBusPropertiesInterfaceBluetooth(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
: QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
{
}
OrgFreedesktopDBusPropertiesInterface::~OrgFreedesktopDBusPropertiesInterface()
OrgFreedesktopDBusPropertiesInterfaceBluetooth::~OrgFreedesktopDBusPropertiesInterfaceBluetooth()
{
}

12
src/bluetooth/bluez/properties_p.h
View File

@ -1,8 +1,8 @@
/*
* This file was generated by qdbusxml2cpp version 0.8
* Command line was: qdbusxml2cpp -I QtCore/private/qglobal_p.h -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
* Source file was org.freedesktop.dbus.properties.xml
*
* qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
* qdbusxml2cpp is Copyright (C) The Qt Company Ltd. and other contributors.
*
* This is an auto-generated file.
* Do not edit! All changes made to it will be lost.
@ -35,7 +35,7 @@
/*
* Proxy class for interface org.freedesktop.DBus.Properties
*/
class OrgFreedesktopDBusPropertiesInterface: public QDBusAbstractInterface
class OrgFreedesktopDBusPropertiesInterfaceBluetooth: public QDBusAbstractInterface
{
Q_OBJECT
public:
@ -43,9 +43,9 @@ public:
{ return "org.freedesktop.DBus.Properties"; }
public:
OrgFreedesktopDBusPropertiesInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
OrgFreedesktopDBusPropertiesInterfaceBluetooth(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
~OrgFreedesktopDBusPropertiesInterface();
~OrgFreedesktopDBusPropertiesInterfaceBluetooth();
public Q_SLOTS: // METHODS
inline QDBusPendingReply<QDBusVariant> Get(const QString &interface, const QString &name)
@ -77,7 +77,7 @@ Q_SIGNALS: // SIGNALS
namespace org {
namespace freedesktop {
namespace DBus {
using Properties = ::OrgFreedesktopDBusPropertiesInterface;
using Properties = ::OrgFreedesktopDBusPropertiesInterfaceBluetooth;
}
}
}

4
src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
View File

@ -139,9 +139,9 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start(QBluetoothDeviceDiscoveryAgent
q, [this](const QString &path){
this->_q_discoveryInterrupted(path);
});
OrgFreedesktopDBusPropertiesInterface *prop = new OrgFreedesktopDBusPropertiesInterface(
OrgFreedesktopDBusPropertiesInterfaceBluetooth *prop = new OrgFreedesktopDBusPropertiesInterfaceBluetooth(
QStringLiteral("org.bluez"), QStringLiteral(""), QDBusConnection::systemBus());
QObject::connect(prop, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
QObject::connect(prop, &OrgFreedesktopDBusPropertiesInterfaceBluetooth::PropertiesChanged,
q, [this](const QString &interface, const QVariantMap &changedProperties,
const QStringList &invalidatedProperties,
const QDBusMessage &signal) {

4
src/bluetooth/qbluetoothdevicediscoveryagent_p.h
View File

@ -39,7 +39,7 @@
class OrgBluezManagerInterface;
class OrgBluezAdapterInterface;
class OrgFreedesktopDBusObjectManagerInterface;
class OrgFreedesktopDBusPropertiesInterface;
class OrgFreedesktopDBusPropertiesInterfaceBluetooth;
class OrgBluezAdapter1Interface;
class OrgBluezDevice1Interface;
@ -133,7 +133,7 @@ private:
OrgFreedesktopDBusObjectManagerInterface *manager = nullptr;
OrgBluezAdapter1Interface *adapter = nullptr;
QTimer *discoveryTimer = nullptr;
QList<OrgFreedesktopDBusPropertiesInterface *> propertyMonitors;
QList<OrgFreedesktopDBusPropertiesInterfaceBluetooth *> propertyMonitors;
void deviceFound(const QString &devicePath, const QVariantMap &properties);

18
src/bluetooth/qbluetoothlocaldevice_bluez.cpp
View File

@ -407,7 +407,7 @@ void QBluetoothLocalDevicePrivate::connectDeviceChanges()
if (reply.isError())
return;
OrgFreedesktopDBusPropertiesInterface *monitor = nullptr;
OrgFreedesktopDBusPropertiesInterfaceBluetooth *monitor = nullptr;
ManagedObjectList managedObjectList = reply.value();
for (ManagedObjectList::const_iterator it = managedObjectList.constBegin(); it != managedObjectList.constEnd(); ++it) {
@ -423,10 +423,10 @@ void QBluetoothLocalDevicePrivate::connectDeviceChanges()
const QVariantMap &ifaceValues = jt.value();
if (iface == QStringLiteral("org.bluez.Device1")) {
monitor = new OrgFreedesktopDBusPropertiesInterface(QStringLiteral("org.bluez"),
monitor = new OrgFreedesktopDBusPropertiesInterfaceBluetooth(QStringLiteral("org.bluez"),
path.path(),
QDBusConnection::systemBus(), this);
connect(monitor, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
connect(monitor, &OrgFreedesktopDBusPropertiesInterfaceBluetooth::PropertiesChanged,
this, &QBluetoothLocalDevicePrivate::PropertiesChanged);
deviceChangeMonitors.insert(path.path(), monitor);
@ -478,10 +478,10 @@ void QBluetoothLocalDevicePrivate::initializeAdapter()
if (adapter) {
//hook up propertiesChanged for current adapter
adapterProperties = new OrgFreedesktopDBusPropertiesInterface(
adapterProperties = new OrgFreedesktopDBusPropertiesInterfaceBluetooth(
QStringLiteral("org.bluez"), adapter->path(),
QDBusConnection::systemBus(), this);
connect(adapterProperties, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
connect(adapterProperties, &OrgFreedesktopDBusPropertiesInterfaceBluetooth::PropertiesChanged,
this, &QBluetoothLocalDevicePrivate::PropertiesChanged);
}
}
@ -528,8 +528,8 @@ void QBluetoothLocalDevicePrivate::PropertiesChanged(const QString &interface,
} else if (interface == QStringLiteral("org.bluez.Device1")
&& changed_properties.contains(QStringLiteral("Connected"))) {
// update list of connected devices
OrgFreedesktopDBusPropertiesInterface *senderIface =
qobject_cast<OrgFreedesktopDBusPropertiesInterface*>(sender());
OrgFreedesktopDBusPropertiesInterfaceBluetooth *senderIface =
qobject_cast<OrgFreedesktopDBusPropertiesInterfaceBluetooth*>(sender());
if (!senderIface)
return;
@ -556,11 +556,11 @@ void QBluetoothLocalDevicePrivate::InterfacesAdded(const QDBusObjectPath &object
// a new device was added which we need to add to list of known devices
if (objectPathIsForThisDevice(deviceAdapterPath, object_path.path())) {
OrgFreedesktopDBusPropertiesInterface *monitor = new OrgFreedesktopDBusPropertiesInterface(
OrgFreedesktopDBusPropertiesInterfaceBluetooth *monitor = new OrgFreedesktopDBusPropertiesInterfaceBluetooth(
QStringLiteral("org.bluez"),
object_path.path(),
QDBusConnection::systemBus());
connect(monitor, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
connect(monitor, &OrgFreedesktopDBusPropertiesInterfaceBluetooth::PropertiesChanged,
this, &QBluetoothLocalDevicePrivate::PropertiesChanged);
deviceChangeMonitors.insert(object_path.path(), monitor);

6
src/bluetooth/qbluetoothlocaldevice_p.h
View File

@ -28,7 +28,7 @@
#include "bluez/bluez5_helper_p.h"
class OrgBluezAdapter1Interface;
class OrgFreedesktopDBusPropertiesInterface;
class OrgFreedesktopDBusPropertiesInterfaceBluetooth;
class OrgFreedesktopDBusObjectManagerInterface;
class OrgBluezDevice1Interface;
@ -107,9 +107,9 @@ public:
QSet<QBluetoothAddress> connectedDevicesSet;
OrgBluezAdapter1Interface *adapter = nullptr;
OrgFreedesktopDBusPropertiesInterface *adapterProperties = nullptr;
OrgFreedesktopDBusPropertiesInterfaceBluetooth *adapterProperties = nullptr;
OrgFreedesktopDBusObjectManagerInterface *manager = nullptr;
QMap<QString, OrgFreedesktopDBusPropertiesInterface *> deviceChangeMonitors;
QMap<QString, OrgFreedesktopDBusPropertiesInterfaceBluetooth *> deviceChangeMonitors;
QList<QBluetoothAddress> connectedDevices() const;

8
src/bluetooth/qlowenergycontroller_bluezdbus.cpp
View File

@ -340,10 +340,10 @@ void QLowEnergyControllerPrivateBluezDBus::connectToDeviceHelper()
device = new OrgBluezDevice1Interface(
QStringLiteral("org.bluez"), devicePath,
QDBusConnection::systemBus(), this);
deviceMonitor = new OrgFreedesktopDBusPropertiesInterface(
deviceMonitor = new OrgFreedesktopDBusPropertiesInterfaceBluetooth(
QStringLiteral("org.bluez"), devicePath,
QDBusConnection::systemBus(), this);
connect(deviceMonitor, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
connect(deviceMonitor, &OrgFreedesktopDBusPropertiesInterfaceBluetooth::PropertiesChanged,
this, &QLowEnergyControllerPrivateBluezDBus::devicePropertiesChanged);
}
@ -736,11 +736,11 @@ void QLowEnergyControllerPrivateBluezDBus::discoverServiceDetails(
// every ClientCharacteristicConfiguration needs to track property changes
if (descData.uuid
== QBluetoothUuid(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration)) {
dbusChar.charMonitor = QSharedPointer<OrgFreedesktopDBusPropertiesInterface>::create(
dbusChar.charMonitor = QSharedPointer<OrgFreedesktopDBusPropertiesInterfaceBluetooth>::create(
QStringLiteral("org.bluez"),
dbusChar.characteristic->path(),
QDBusConnection::systemBus(), this);
connect(dbusChar.charMonitor.data(), &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
connect(dbusChar.charMonitor.data(), &OrgFreedesktopDBusPropertiesInterfaceBluetooth::PropertiesChanged,
this, [this, indexHandle](const QString &interface, const QVariantMap &changedProperties,
const QStringList &removedProperties) {

6
src/bluetooth/qlowenergycontroller_bluezdbus_p.h
View File

@ -29,7 +29,7 @@ class OrgBluezGattCharacteristic1Interface;
class OrgBluezGattDescriptor1Interface;
class OrgBluezGattService1Interface;
class OrgFreedesktopDBusObjectManagerInterface;
class OrgFreedesktopDBusPropertiesInterface;
class OrgFreedesktopDBusPropertiesInterfaceBluetooth;
QT_BEGIN_NAMESPACE
@ -108,7 +108,7 @@ private:
OrgBluezAdapter1Interface* adapter{};
OrgBluezDevice1Interface* device{};
OrgFreedesktopDBusObjectManagerInterface* managerBluez{};
OrgFreedesktopDBusPropertiesInterface* deviceMonitor{};
OrgFreedesktopDBusPropertiesInterfaceBluetooth* deviceMonitor{};
QString adapterPathWithPeripheralSupport;
int remoteMtu{-1};
@ -133,7 +133,7 @@ private:
struct GattCharacteristic
{
QSharedPointer<OrgBluezGattCharacteristic1Interface> characteristic;
QSharedPointer<OrgFreedesktopDBusPropertiesInterface> charMonitor;
QSharedPointer<OrgFreedesktopDBusPropertiesInterfaceBluetooth> charMonitor;
QList<QSharedPointer<OrgBluezGattDescriptor1Interface>> descriptors;
};