diff options
author | 2015-06-18 22:02:31 +0000 | |
---|---|---|
committer | 2015-06-18 22:02:31 +0000 | |
commit | bad34837c755e33e950817bbc63c2d10735c8406 (patch) | |
tree | f1c45fc619038816dfe4884bdd3fa423c7195e86 /kde-plasma | |
parent | Remove kde-plasma/bluez-qt, superseded by kde-frameworks/bluez-qt. (diff) | |
download | historical-bad34837c755e33e950817bbc63c2d10735c8406.tar.gz historical-bad34837c755e33e950817bbc63c2d10735c8406.tar.bz2 historical-bad34837c755e33e950817bbc63c2d10735c8406.zip |
Revision bump to replace kde-plasma/bluez-qt with kde-frameworks/bluez-qt.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'kde-plasma')
-rw-r--r-- | kde-plasma/bluedevil/ChangeLog | 8 | ||||
-rw-r--r-- | kde-plasma/bluedevil/Manifest | 31 | ||||
-rw-r--r-- | kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild (renamed from kde-plasma/bluedevil/bluedevil-5.3.1.ebuild) | 6 | ||||
-rw-r--r-- | kde-plasma/bluedevil/files/bluedevil-5.3.1-frameworks-fix.patch | 383 |
4 files changed, 410 insertions, 18 deletions
diff --git a/kde-plasma/bluedevil/ChangeLog b/kde-plasma/bluedevil/ChangeLog index 352051183585..4732836257f0 100644 --- a/kde-plasma/bluedevil/ChangeLog +++ b/kde-plasma/bluedevil/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-plasma/bluedevil # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-plasma/bluedevil/ChangeLog,v 1.1 2015/05/31 22:06:16 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-plasma/bluedevil/ChangeLog,v 1.2 2015/06/18 22:02:27 johu Exp $ + +*bluedevil-5.3.1-r1 (18 Jun 2015) + + 18 Jun 2015; Johannes Huber <johu@gentoo.org> +bluedevil-5.3.1-r1.ebuild, + +files/bluedevil-5.3.1-frameworks-fix.patch, -bluedevil-5.3.1.ebuild: + Revision bump to replace kde-plasma/bluez-qt with kde-frameworks/bluez-qt. *bluedevil-5.3.1 (31 May 2015) diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index 8f3d7dec5b21..dd9deaa91976 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,24 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX bluedevil-5.3.1-frameworks-fix.patch 16499 SHA256 907867363273fd51dbd08e4d79c0ae0ac0fea791febd6f3ce9030049e8757bfe SHA512 201205237c44fa0ab99625325ebd8d5f8d4ec44bb262f2fa0f4e3f669e643ae83d456fd873de7f851d580931022811437f5f35f8fbbd12d2de356589e23e5739 WHIRLPOOL 35f73a369da5073bcb1962f7c7c5201f6b59d997a0000d8dc66c39a78d81acd8c7a225bed9e32f1e657f37cbf333e881ad90c03e4fcf3826e7769ab7af36141a DIST bluedevil-5.3.1.tar.xz 123440 SHA256 f4e2a536ebd4a9f1978a8984f2676404b8c6acb3ea88b2d4dfa2c2ec62bc1014 SHA512 1302cd8bd0ebc300974d7e68f5c599c766ad8f141d419c723815e8de3328eb3a5ed03d9c801274fa8d0b77dad8942987e8740c273e49fa51a23384a007110055 WHIRLPOOL 4f36c23b03bcfe05036d6e660f440051400098f0cf36872c6113ef10e71c47db212b55e093db31f657eab80e159739b4ac51c654032a7a6c17bfde9325419ced -EBUILD bluedevil-5.3.1.ebuild 1274 SHA256 048c1e58833a2167baec2432ab20f038f19683e76b81fff15f741e889c6f0c98 SHA512 145f5246e87228fd1911f58bd3b333ab5c053c9ec0593e43c854a938a848c1770452e7af804cb223dca67b58d06e2d12049e49283325f183c9dddf2e8a1033a6 WHIRLPOOL b2652bcee455fe30264d84e008cc4de5cdc2b987c88b5ee4fd463d8d9583ee337f1583818852fefa6142b84b587fbe0609a8d09e31f2b569de47d886153ff0f6 -MISC ChangeLog 479 SHA256 bcd840c313bb69d6a7713a984788a015e49d6aa2b2b976fd3179d52c54866875 SHA512 0f78e75d8edc84499dc74b17c6d6700f1b6e58f8e1611146c528dcb5b835d07770262c7df497d5a2cb1a1e6bdcc76c59ba9b3601b219cb29b86749fc1f8e0c3a WHIRLPOOL 71a40caf548937adab6930b46ed89ce13a4fb74796f49f6bbcf82ce134e5dc5b265d93c67049f87b06ced0f18d79145b4aa486136152054c1543b753d22f4c53 +EBUILD bluedevil-5.3.1-r1.ebuild 1334 SHA256 e2aa4ae5f499190b663623d697a80ef0aae41b7914b29e18ae2331e6439e3242 SHA512 1ab9d4270b383ce09d8d394f5a14574d546be3b8e33ac7410ed1c97b4a95024475905568c40689b69699660e43692469498d400883842cb7fafcd02f663a7c83 WHIRLPOOL f8125394bbbe87576d618082b8cd249d0c3ed1af79459f8e7e470bced5e88b989775389095c13980b9d2f368965b8aef3750a93276c364a356d8c53dbfeaa1ac +MISC ChangeLog 740 SHA256 20e630182b5da53ac17d2226a7d0c2a02dbdc0c8a0d91807ec48b3bfc8b95f98 SHA512 56a3d918eceb542f404f1a12fd1591ec2712f4f93597941c9b38ca3867cda84a4c824214ab3534d1fed996c64474966f829fb3daf790339204bd2571450956df WHIRLPOOL be02a5660c4382a3bdff6c477b517f504562502b994d8e305db3678dd053448f3222bc3d795aa57c5d96ca5a4b74a981769fcb5d188bcec63892451adc92cc70 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVa4XpAAoJEGVpnaTzz9K9e74QAKEx0GZGdmTuNFNm2506oe/3 -61p8GMCaGTFE13vFRdfILPY//vJ1N6xOuF6JUVKy42Zd4q2krE1iHhukDWIM6hQi -Clq0Zuz98hha/XWn0KSQSZ9Hqn6cLLulXjeJWw0aG0dWG/b060P2b2jXTTEVjNY8 -airGWPgfhalHM7fkaMkvDfErA6iLIbStwzmcU/PcN73NUUDiT8OcVbpvd37tziU7 -1xN4hLKEwvqZPyiKfp7cxkqyEIIBc+tOUwu4QKWa3RNUtFasnTHZ3vweZBjtJDs4 -0atfobU38HkkmNHjLOXW4QVi7LXOI4dNh8TNKhC3JRytyrNraNkyA0DfPyeT794d -lFDkBAkb/ZaX4T11I7COxTehXrcyXmQxQhDNhHP4npYA0V5myE1oKJgbJU9FhDct -dp6W4ajSWRxpL/VLPO+xkByDUGTqPvJfxeYW78fVKmK+KbZdZMtW2OMtm26rjMWf -uPLUX6Qrj7iQhU5hLOuednupLISWBkFvKYmoLuBmiX7L3vUZpnJmz3dlXxBgm2DD -xzphge6X9vYEY753qEnZX3Sp6K+5ukn9uQFC+ZEIE1cLxahYyxka8lbabuBXVJ+1 -GCyFIk4LFXd1oiy5fhPw0gDyLm+8SJRLQwbohLzUlaSSlHmWW8U96PSpsF6lnu7E -ZaGqFuLsAnpQTpAbWjhI -=1KJ8 +iQIcBAEBCAAGBQJVg0AcAAoJEGVpnaTzz9K9x00P/0m7VR/fa50dk4pWt3mD9uIV +gXckgHzXo4HRF/ySANkTSfYekzTfgey+D4VAv3PBcNm546AtSWBPR0/5QVk1UeS8 +Z/To70yndH6KWos03/mQfaLdzzToxFL8QCRxNy5BO8Wed6PoIM03NrkoixlrZPmR +hilBtiWWEcLxpsiJ1IciqZ5cOvTbaEzhhOcKs1l6ozAaxbyzZ8eq+Dloco3eE/cq +klCC+BvLXr1Fk1p6O4PsbfCcevgqT3armbIYuOTJOB4pYBHFTjL277H2KYmkMyIE +zw2lKR3F9hKBBtUohtNrYhaiyURV6R98+JYpAXOwPDGZxcUjr3bPzVdfUH+pWCp9 +KiOxabyFF7gVYI5E8zgVCfflJ5zH2oupJvbX8Z5v2odcHAsZhw42m3qiaZd1jkcW +Gg8eLgjO8NRtrOS1h5fp798yQsgX7iVa2p8xaBOobONo1wOvJRYm3Knsl36x8J/J +uue5YvvE5loRNWNKHuqDDXHFzdi0h9KQ8ujkYJyt+6hum/9ZexkZXbIrnpIoKtTi +ZzAcv89VxqEuXrsHSThVnVtIMkdlz6DeHkjZoDMPXqdxHWWDRwprofn9RIPVXGvj +jFZhe/e15padJiviWicMFO/NN9+6Adk8jo/6t+aNUdOCdt8ICvuaQte3JlB/sxyB +AZxgx9oNiPZv89r22+A8 +=miIL -----END PGP SIGNATURE----- diff --git a/kde-plasma/bluedevil/bluedevil-5.3.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild index 660ec6bb6ff2..85560cde968a 100644 --- a/kde-plasma/bluedevil/bluedevil-5.3.1.ebuild +++ b/kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-plasma/bluedevil/bluedevil-5.3.1.ebuild,v 1.1 2015/05/31 22:06:16 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-plasma/bluedevil/bluedevil-5.3.1-r1.ebuild,v 1.1 2015/06/18 22:02:27 johu Exp $ EAPI=5 @@ -12,6 +12,7 @@ KEYWORDS="~amd64" IUSE="" COMMON_DEPEND=" + $(add_frameworks_dep bluez-qt) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -24,7 +25,6 @@ COMMON_DEPEND=" $(add_frameworks_dep knotifications) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep plasma) - $(add_plasma_dep bluez-qt) dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 @@ -41,6 +41,8 @@ RDEPEND="${COMMON_DEPEND} !net-wireless/kbluetooth " +PATCHES=( "${FILESDIR}"/${P}-frameworks-fix.patch ) + pkg_postinst() { kde5_pkg_postinst fdo-mime_mime_database_update diff --git a/kde-plasma/bluedevil/files/bluedevil-5.3.1-frameworks-fix.patch b/kde-plasma/bluedevil/files/bluedevil-5.3.1-frameworks-fix.patch new file mode 100644 index 000000000000..326ff6e01ae1 --- /dev/null +++ b/kde-plasma/bluedevil/files/bluedevil-5.3.1-frameworks-fix.patch @@ -0,0 +1,383 @@ +diff --git a/src/applet/package/contents/ui/BluetoothApplet.qml b/src/applet/package/contents/ui/BluetoothApplet.qml
+index 834d034..d685cb2 100644
+--- a/src/applet/package/contents/ui/BluetoothApplet.qml
++++ b/src/applet/package/contents/ui/BluetoothApplet.qml
+@@ -31,6 +31,7 @@ Item {
+
+ property bool deviceConnected : false
+ property int runningActions : 0
++ property QtObject btManager : BluezQt.Manager
+
+ Plasmoid.toolTipMainText: i18n("Bluetooth")
+ Plasmoid.icon: Logic.icon()
+@@ -44,11 +45,7 @@ Item {
+ focus: true
+ }
+
+- BluezQt.Manager {
+- id: btManager
+-
+- onInitFinished: {
+- Logic.init();
+- }
++ Component.onCompleted: {
++ Logic.init();
+ }
+ }
+diff --git a/src/applet/package/contents/ui/DeviceItem.qml b/src/applet/package/contents/ui/DeviceItem.qml
+index 19b55cf..b0fc9ce 100644
+--- a/src/applet/package/contents/ui/DeviceItem.qml
++++ b/src/applet/package/contents/ui/DeviceItem.qml
+@@ -378,10 +378,10 @@ PlasmaComponents.ListItem {
+ return i18n("Connecting");
+ }
+
+- switch (DeviceType) {
++ switch (Type) {
+ case BluezQt.Device.Headset:
+ case BluezQt.Device.Headphones:
+- case BluezQt.Device.OtherAudio:
++ case BluezQt.Device.AudioVideo:
+ return i18n("Audio device");
+
+ case BluezQt.Device.Keyboard:
+@@ -422,7 +422,7 @@ PlasmaComponents.ListItem {
+ function connectToDevice()
+ {
+ if (Connected) {
+- Device.disconnectDevice();
++ Device.disconnectFromDevice();
+ return;
+ }
+
+@@ -433,7 +433,7 @@ PlasmaComponents.ListItem {
+ connecting = true;
+ runningActions++;
+
+- var call = Device.connectDevice();
++ var call = Device.connectToDevice();
+ call.userData = Device;
+
+ call.finished.connect(function(call) {
+diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml
+index 849ae4e..94df8b4 100644
+--- a/src/applet/package/contents/ui/FullRepresentation.qml
++++ b/src/applet/package/contents/ui/FullRepresentation.qml
+@@ -28,9 +28,7 @@ import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt
+ FocusScope {
+ PlasmaBt.DevicesProxyModel {
+ id: devicesModel
+- sourceModel: BluezQt.DevicesModel {
+- manager: btManager
+- }
++ sourceModel: BluezQt.DevicesModel { }
+ }
+
+ PlasmaExtras.Heading {
+diff --git a/src/daemon/kded/devicemonitor.cpp b/src/daemon/kded/devicemonitor.cpp
+index 29ac2f3..22c8020 100644
+--- a/src/daemon/kded/devicemonitor.cpp
++++ b/src/daemon/kded/devicemonitor.cpp
+@@ -147,7 +147,7 @@ void DeviceMonitor::restoreState()
+ Q_FOREACH (const QString &addr, connectedDevices) {
+ BluezQt::DevicePtr device = m_manager->deviceForAddress(addr);
+ if (device) {
+- device->connectDevice();
++ device->connectToDevice();
+ }
+ }
+ }
+diff --git a/src/daemon/kded/filereceiver/obexagent.cpp b/src/daemon/kded/filereceiver/obexagent.cpp
+index 9cd98ff..6ffd620 100644
+--- a/src/daemon/kded/filereceiver/obexagent.cpp
++++ b/src/daemon/kded/filereceiver/obexagent.cpp
+@@ -49,11 +49,11 @@ QDBusObjectPath ObexAgent::objectPath() const
+ return QDBusObjectPath(QStringLiteral("/BlueDevilObexAgent"));
+ }
+
+-void ObexAgent::authorizePush(BluezQt::ObexTransferPtr transfer, const BluezQt::Request<QString> &request)
++void ObexAgent::authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request<QString> &request)
+ {
+ qCDebug(BLUEDAEMON) << "Agent-AuthorizePush";
+
+- ReceiveFileJob *job = new ReceiveFileJob(request, transfer, this);
++ ReceiveFileJob *job = new ReceiveFileJob(request, transfer, session, this);
+ connect(job, &ReceiveFileJob::finished, this, &ObexAgent::receiveFileJobFinished);
+ job->start();
+ }
+diff --git a/src/daemon/kded/filereceiver/obexagent.h b/src/daemon/kded/filereceiver/obexagent.h
+index 0f5adc5..e32f1fe 100644
+--- a/src/daemon/kded/filereceiver/obexagent.h
++++ b/src/daemon/kded/filereceiver/obexagent.h
+@@ -40,7 +40,7 @@ public:
+ bool shouldAutoAcceptTransfer(const QString &address) const;
+
+ QDBusObjectPath objectPath() const Q_DECL_OVERRIDE;
+- void authorizePush(BluezQt::ObexTransferPtr transfer, const BluezQt::Request<QString> &request) Q_DECL_OVERRIDE;
++ void authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request<QString> &request) Q_DECL_OVERRIDE;
+
+ private Q_SLOTS:
+ void receiveFileJobFinished(KJob *job);
+diff --git a/src/daemon/kded/filereceiver/receivefilejob.cpp b/src/daemon/kded/filereceiver/receivefilejob.cpp
+index 1569163..fbb04b5 100644
+--- a/src/daemon/kded/filereceiver/receivefilejob.cpp
++++ b/src/daemon/kded/filereceiver/receivefilejob.cpp
+@@ -36,11 +36,12 @@
+ #include <BluezQt/Device>
+ #include <BluezQt/ObexSession>
+
+-ReceiveFileJob::ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, ObexAgent *parent)
++ReceiveFileJob::ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, ObexAgent *parent)
+ : KJob(parent)
+ , m_speedBytes(0)
+ , m_agent(parent)
+ , m_transfer(transfer)
++ , m_session(session)
+ , m_request(req)
+ {
+ setCapabilities(Killable);
+@@ -74,24 +75,24 @@ void ReceiveFileJob::init()
+ qCDebug(BLUEDAEMON) << "\tTransferred:" << m_transfer->transferred();
+
+ qCDebug(BLUEDAEMON) << "ObexSession:";
+- qCDebug(BLUEDAEMON) << "\tSource:" << m_transfer->session()->source();
+- qCDebug(BLUEDAEMON) << "\tDestination:" << m_transfer->session()->destination();
++ qCDebug(BLUEDAEMON) << "\tSource:" << m_session->source();
++ qCDebug(BLUEDAEMON) << "\tDestination:" << m_session->destination();
+
+ connect(m_transfer.data(), &BluezQt::ObexTransfer::statusChanged, this, &ReceiveFileJob::statusChanged);
+ connect(m_transfer.data(), &BluezQt::ObexTransfer::transferredChanged, this, &ReceiveFileJob::transferredChanged);
+
+- m_deviceName = m_transfer->session()->destination();
++ m_deviceName = m_session->destination();
+
+- BluezQt::AdapterPtr adapter = m_agent->manager()->adapterForAddress(m_transfer->session()->source());
++ BluezQt::AdapterPtr adapter = m_agent->manager()->adapterForAddress(m_session->source());
+ if (!adapter) {
+- qCDebug(BLUEDAEMON) << "No adapter for" << m_transfer->session()->source();
++ qCDebug(BLUEDAEMON) << "No adapter for" << m_session->source();
+ showNotification();
+ return;
+ }
+
+- BluezQt::DevicePtr device = adapter->deviceForAddress(m_transfer->session()->destination());
++ BluezQt::DevicePtr device = adapter->deviceForAddress(m_session->destination());
+ if (!device) {
+- qCDebug(BLUEDAEMON) << "No device for" << m_transfer->session()->destination();
++ qCDebug(BLUEDAEMON) << "No device for" << m_session->destination();
+ showNotification();
+ return;
+ }
+diff --git a/src/daemon/kded/filereceiver/receivefilejob.h b/src/daemon/kded/filereceiver/receivefilejob.h
+index 461d453..801bb45 100644
+--- a/src/daemon/kded/filereceiver/receivefilejob.h
++++ b/src/daemon/kded/filereceiver/receivefilejob.h
+@@ -34,7 +34,7 @@ class ReceiveFileJob : public KJob
+ Q_OBJECT
+
+ public:
+- explicit ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, ObexAgent *parent);
++ explicit ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, ObexAgent *parent);
+
+ QString deviceAddress() const;
+
+@@ -63,6 +63,7 @@ private:
+
+ ObexAgent *m_agent;
+ BluezQt::ObexTransferPtr m_transfer;
++ BluezQt::ObexSessionPtr m_session;
+ BluezQt::Request<QString> m_request;
+ };
+
+diff --git a/src/kcmodule/bluedevildevices.cpp b/src/kcmodule/bluedevildevices.cpp
+index b1b6b0e..deafecc 100644
+--- a/src/kcmodule/bluedevildevices.cpp
++++ b/src/kcmodule/bluedevildevices.cpp
+@@ -113,7 +113,7 @@ void BluetoothDevicesDelegate::paint(QPainter *painter, const QStyleOptionViewIt
+ painter->setFont(f);
+ painter->drawText(r, Qt::AlignLeft | Qt::AlignTop, index.data(BluezQt::DevicesModel::FriendlyNameRole).toString());
+ painter->restore();
+- painter->drawText(r, Qt::AlignLeft | Qt::AlignBottom, deviceTypeString(index.data(BluezQt::DevicesModel::DeviceTypeRole).toInt()));
++ painter->drawText(r, Qt::AlignLeft | Qt::AlignBottom, deviceTypeString(index.data(BluezQt::DevicesModel::TypeRole).toInt()));
+
+ // Draw state
+ r = option.rect;
+@@ -166,7 +166,7 @@ QString BluetoothDevicesDelegate::deviceTypeString(int type) const
+ return i18nc("This device is a Headset", "Headset");
+ case BluezQt::Device::Headphones:
+ return i18nc("This device are Headphones", "Headphones");
+- case BluezQt::Device::OtherAudio:
++ case BluezQt::Device::AudioVideo:
+ return i18nc("This device is of type Audio", "Audio");
+ case BluezQt::Device::Keyboard:
+ return i18nc("This device is a Keyboard", "Keyboard");
+@@ -349,14 +349,14 @@ void KCMBlueDevilDevices::removeDevice()
+ void KCMBlueDevilDevices::connectDevice()
+ {
+ BluezQt::DevicePtr device = m_devicesModel->device(m_devices->currentIndex());
+- device->connectDevice();
++ device->connectToDevice();
+ }
+
+ void KCMBlueDevilDevices::disconnectDevice()
+ {
+ m_disconnectDevice->setEnabled(false);
+ BluezQt::DevicePtr device = m_devicesModel->device(m_devices->currentIndex());
+- device->disconnectDevice();
++ device->disconnectFromDevice();
+ }
+
+ void KCMBlueDevilDevices::launchWizard()
+diff --git a/src/kio/obexftp/daemon/obexftpdaemon.cpp b/src/kio/obexftp/daemon/obexftpdaemon.cpp
+index a2cdac4..45a1f75 100644
+--- a/src/kio/obexftp/daemon/obexftpdaemon.cpp
++++ b/src/kio/obexftp/daemon/obexftpdaemon.cpp
+@@ -34,6 +34,7 @@
+ #include <BluezQt/InitObexManagerJob>
+ #include <BluezQt/ObexFileTransfer>
+ #include <BluezQt/PendingCall>
++#include <BluezQt/ObexSession>
+
+ K_PLUGIN_FACTORY_WITH_JSON(ObexFtpFactory,
+ "obexftpdaemon.json",
+@@ -208,9 +209,9 @@ void ObexFtpDaemon::operationalChanged(bool operational)
+ }
+ }
+
+-void ObexFtpDaemon::sessionRemoved(const QDBusObjectPath &session)
++void ObexFtpDaemon::sessionRemoved(BluezQt::ObexSessionPtr session)
+ {
+- const QString &path = session.path();
++ const QString &path = session->objectPath().path();
+ const QString &key = d->m_sessionMap.key(path);
+
+ if (!d->m_sessionMap.contains(key)) {
+diff --git a/src/kio/obexftp/daemon/obexftpdaemon.h b/src/kio/obexftp/daemon/obexftpdaemon.h
+index c42d720..a902333 100644
+--- a/src/kio/obexftp/daemon/obexftpdaemon.h
++++ b/src/kio/obexftp/daemon/obexftpdaemon.h
+@@ -23,6 +23,8 @@
+
+ #include <KDEDModule>
+
++#include <BluezQt/Types>
++
+ namespace BluezQt
+ {
+ class InitObexManagerJob;
+@@ -52,7 +54,7 @@ private Q_SLOTS:
+ void cancelTransferFinished(QDBusPendingCallWatcher *watcher);
+
+ void operationalChanged(bool operational);
+- void sessionRemoved(const QDBusObjectPath &session);
++ void sessionRemoved(BluezQt::ObexSessionPtr session);
+
+ private:
+ struct Private;
+diff --git a/src/kio/obexftp/kioobexftp.cpp b/src/kio/obexftp/kioobexftp.cpp
+index cb8d3b1..47910b4 100644
+--- a/src/kio/obexftp/kioobexftp.cpp
++++ b/src/kio/obexftp/kioobexftp.cpp
+@@ -442,24 +442,24 @@ QList<KIO::UDSEntry> KioFtp::listFolder(const QUrl &url, bool *ok)
+ return list;
+ }
+
+- const QList<BluezQt::ObexFileTransfer::Item> &items = call->value().value<QList<BluezQt::ObexFileTransfer::Item> >();
++ const QList<BluezQt::ObexFileTransferEntry> &items = call->value().value<QList<BluezQt::ObexFileTransferEntry> >();
+
+- Q_FOREACH (const BluezQt::ObexFileTransfer::Item &item, items) {
++ Q_FOREACH (const BluezQt::ObexFileTransferEntry &item, items) {
+ KIO::UDSEntry entry;
+- entry.insert(KIO::UDSEntry::UDS_NAME, item.name);
+- entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, item.label);
++ entry.insert(KIO::UDSEntry::UDS_NAME, item.name());
++ entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, item.label());
+ entry.insert(KIO::UDSEntry::UDS_ACCESS, 0700);
+- entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, item.modified.toTime_t());
+- entry.insert(KIO::UDSEntry::UDS_SIZE, item.size);
++ entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, item.modificationTime().toTime_t());
++ entry.insert(KIO::UDSEntry::UDS_SIZE, item.size());
+
+- if (item.type == BluezQt::ObexFileTransfer::Item::Folder) {
++ if (item.type() == BluezQt::ObexFileTransferEntry::Folder) {
+ entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
+ } else {
+ entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFREG);
+ }
+
+ if (urlIsRoot(url)) {
+- updateRootEntryIcon(entry, item.memoryType);
++ updateRootEntryIcon(entry, item.memoryType());
+ }
+
+ list.append(entry);
+@@ -467,7 +467,7 @@ QList<KIO::UDSEntry> KioFtp::listFolder(const QUrl &url, bool *ok)
+ // Most probably the client of the kio will stat each file
+ // so since we are on it, let's cache all of them.
+ QUrl statUrl = url;
+- statUrl.setPath(statUrl.path() + QLatin1Char('/') + item.name);
++ statUrl.setPath(statUrl.path() + QLatin1Char('/') + item.name());
+
+ if (!m_statMap.contains(statUrl.toDisplayString())) {
+ qCDebug(OBEXFTP) << "Stat:"
+diff --git a/src/wizard/pages/connect.cpp b/src/wizard/pages/connect.cpp
+index 1880c08..082cb10 100644
+--- a/src/wizard/pages/connect.cpp
++++ b/src/wizard/pages/connect.cpp
+@@ -54,7 +54,7 @@ void ConnectPage::initializePage()
+
+ m_wizard->device()->setTrusted(true);
+
+- BluezQt::PendingCall *call = m_wizard->device()->connectDevice();
++ BluezQt::PendingCall *call = m_wizard->device()->connectToDevice();
+ connect(call, &BluezQt::PendingCall::finished, this, &ConnectPage::connectFinished);
+ }
+
+diff --git a/src/wizard/pages/discover.cpp b/src/wizard/pages/discover.cpp
+index 9810f7c..862cf8a 100644
+--- a/src/wizard/pages/discover.cpp
++++ b/src/wizard/pages/discover.cpp
+@@ -215,13 +215,13 @@ int DiscoverPage::nextId() const
+ pin = m_wizard->agent()->getPin(device);
+ }
+
+- qCDebug(WIZARD) << "Class: " << device->deviceType();
++ qCDebug(WIZARD) << "Class: " << device->type();
+ qCDebug(WIZARD) << "Legacy: " << device->hasLegacyPairing();
+ qCDebug(WIZARD) << "From DB: " << m_wizard->agent()->isFromDatabase();
+ qCDebug(WIZARD) << "PIN: " << m_wizard->agent()->pin();
+
+ // If keyboard no matter what, we go to the keyboard page
+- if (device->deviceType() == BluezQt::Device::Keyboard) {
++ if (device->type() == BluezQt::Device::Keyboard) {
+ qCDebug(WIZARD) << "Keyboard Pairing";
+ return BlueWizard::KeyboardPairing;
+ }
+diff --git a/src/wizard/wizardagent.cpp b/src/wizard/wizardagent.cpp
+index a0b4b04..a263e28 100644
+--- a/src/wizard/wizardagent.cpp
++++ b/src/wizard/wizardagent.cpp
+@@ -72,8 +72,10 @@ QString WizardAgent::getPin(BluezQt::DevicePtr device)
+
+ QXmlStreamReader xml(&file);
+
+- int deviceType = device->deviceType();
+- int xmlType = 0;
++ QString deviceType = BluezQt::Device::typeToString(device->type());
++ if (deviceType == QLatin1String("audiovideo")) {
++ deviceType = QStringLiteral("audio");
++ }
+
+ while (!xml.atEnd()) {
+ xml.readNext();
+@@ -87,9 +89,7 @@ QString WizardAgent::getPin(BluezQt::DevicePtr device)
+ }
+
+ if (attr.hasAttribute(QLatin1String("type")) && attr.value(QLatin1String("type")) != QLatin1String("any")) {
+- xmlType = BluezQt::Device::stringToType(attr.value(QLatin1String("type")).toString());
+- if (deviceType != xmlType) {
+- xmlType = 0;
++ if (deviceType != attr.value(QLatin1String("type")).toString()) {
+ continue;
+ }
+ }
\ No newline at end of file |