tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Bluetooth) Remove compatibility with Qt < 5.4.0

Browse source
This commit is contained in:
Àlex Fiestas 2017-05-24 23:28:49 +02:00
parent 11a01d2f4e
commit 54ef8862eb
No known key found for this signature in database
GPG key ID: 60AC676CEC24059E
2 changed files with 2 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
core/backends/bluetooth/bluetoothlinkprovider.cpp
View file

@ -39,14 +39,11 @@ BluetoothLinkProvider::BluetoothLinkProvider()
connectTimer = new QTimer(this); connectTimer = new QTimer(this);
connectTimer->setInterval(30000); connectTimer->setInterval(30000);
connectTimer->setSingleShot(false); connectTimer->setSingleShot(false);
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
connect(connectTimer, SIGNAL(timeout()), this, SLOT(connectToPairedDevices()));
#else
mServiceDiscoveryAgent = new QBluetoothServiceDiscoveryAgent(this); mServiceDiscoveryAgent = new QBluetoothServiceDiscoveryAgent(this);
mServiceDiscoveryAgent->setUuidFilter(mServiceUuid); mServiceDiscoveryAgent->setUuidFilter(mServiceUuid);
connect(mServiceDiscoveryAgent, SIGNAL(finished()), this, SLOT(serviceDiscoveryFinished())); connect(mServiceDiscoveryAgent, SIGNAL(finished()), this, SLOT(serviceDiscoveryFinished()));
connect(connectTimer, SIGNAL(timeout()), mServiceDiscoveryAgent, SLOT(start())); connect(connectTimer, SIGNAL(timeout()), mServiceDiscoveryAgent, SLOT(start()));
#endif
} }
void BluetoothLinkProvider::onStart() void BluetoothLinkProvider::onStart()
@ -61,11 +58,7 @@ void BluetoothLinkProvider::onStart()
mBluetoothServer->setSecurityFlags(QBluetooth::Encryption | QBluetooth::Secure); mBluetoothServer->setSecurityFlags(QBluetooth::Encryption | QBluetooth::Secure);
connect(mBluetoothServer, SIGNAL(newConnection()), this, SLOT(serverNewConnection())); connect(mBluetoothServer, SIGNAL(newConnection()), this, SLOT(serverNewConnection()));
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
connectToPairedDevices();
#else
mServiceDiscoveryAgent->start(); mServiceDiscoveryAgent->start();
#endif
connectTimer->start(); connectTimer->start();
mKdeconnectService = mBluetoothServer->listen(mServiceUuid, "KDE Connect"); mKdeconnectService = mBluetoothServer->listen(mServiceUuid, "KDE Connect");
@ -89,57 +82,6 @@ void BluetoothLinkProvider::onNetworkChange()
{ {
} }
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
QList<QBluetoothAddress> BluetoothLinkProvider::getPairedDevices() {
QDBusConnection bus = QDBusConnection::systemBus();
QDBusInterface manager_iface("org.bluez", "/","org.bluez.Manager", bus);
QDBusReply<QDBusObjectPath> devices = manager_iface.call("DefaultAdapter");
if (!devices.isValid()) {
qCWarning(KDECONNECT_CORE) << "Couldn't get default adapter:" << devices.error();
return QList<QBluetoothAddress>();
}
QDBusObjectPath defaultAdapter = devices.value();
QString defaultAdapterPath = defaultAdapter.path();
QDBusInterface devices_iface("org.bluez", defaultAdapterPath, "org.bluez.Adapter", bus);
QDBusMessage pairedDevices = devices_iface.call("ListDevices");
QDBusArgument pairedDevicesArg = pairedDevices.arguments().at(0).value<QDBusArgument>();
pairedDevicesArg.beginArray();
QList<QBluetoothAddress> pairedDevicesList;
while (!pairedDevicesArg.atEnd()) {
QVariant variant = pairedDevicesArg.asVariant();
QDBusObjectPath pairedDevice = qvariant_cast<QDBusObjectPath>(variant);
QString pairedDevicePath = pairedDevice.path();
QString pairedDeviceMac = pairedDevicePath.split(QChar('/')).last().remove("dev_").replace("_", ":");
pairedDevicesList.append(QBluetoothAddress(pairedDeviceMac));
}
return pairedDevicesList;
}
void BluetoothLinkProvider::connectToPairedDevices() {
QList<QBluetoothAddress> pairedDevices = getPairedDevices();
for (int i = 0; i < pairedDevices.size(); i++) {
QBluetoothAddress pairedDevice = pairedDevices.at(i);
if (mSockets.contains(pairedDevice)) {
continue;
}
QBluetoothSocket* socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol, this);
connect(socket, SIGNAL(connected()), this, SLOT(clientConnected()));
connect(socket, SIGNAL(error(QBluetoothSocket::SocketError)), this, SLOT(connectError()));
qCDebug(KDECONNECT_CORE()) << "BluetoothLinkProvider/onStart: Connecting to " << pairedDevice.toString();
socket->connectToService(pairedDevice, mServiceUuid);
}
}
#endif
void BluetoothLinkProvider::connectError() void BluetoothLinkProvider::connectError()
{ {
QBluetoothSocket* socket = qobject_cast<QBluetoothSocket*>(sender()); QBluetoothSocket* socket = qobject_cast<QBluetoothSocket*>(sender());

4
core/backends/bluetooth/bluetoothlinkprovider.h
View file

@ -58,9 +58,7 @@ public Q_SLOTS:
private Q_SLOTS: private Q_SLOTS:
void deviceLinkDestroyed(QObject* destroyedDeviceLink); void deviceLinkDestroyed(QObject* destroyedDeviceLink);
void socketDisconnected(); void socketDisconnected();
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
void connectToPairedDevices();
#endif
void serverNewConnection(); void serverNewConnection();
void serverDataReceived(); void serverDataReceived();
void clientConnected(); void clientConnected();