1 |
commit: 96fd3d238c81aa59ce61b9e2022cfba3e2f671a6 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 20:54:17 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 20:54:17 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=96fd3d23 |
7 |
|
8 |
[kde-plasma/bluedevil] Remove unused patch |
9 |
|
10 |
Package-Manager: portage-2.2.20 |
11 |
|
12 |
.../files/bluedevil-5.3.1-frameworks-fix.patch | 383 --------------------- |
13 |
1 file changed, 383 deletions(-) |
14 |
|
15 |
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 |
16 |
deleted file mode 100644 |
17 |
index 326ff6e..0000000 |
18 |
--- a/kde-plasma/bluedevil/files/bluedevil-5.3.1-frameworks-fix.patch |
19 |
+++ /dev/null |
20 |
@@ -1,383 +0,0 @@ |
21 |
-diff --git a/src/applet/package/contents/ui/BluetoothApplet.qml b/src/applet/package/contents/ui/BluetoothApplet.qml |
22 |
-index 834d034..d685cb2 100644 |
23 |
---- a/src/applet/package/contents/ui/BluetoothApplet.qml |
24 |
-+++ b/src/applet/package/contents/ui/BluetoothApplet.qml |
25 |
-@@ -31,6 +31,7 @@ Item { |
26 |
- |
27 |
- property bool deviceConnected : false |
28 |
- property int runningActions : 0 |
29 |
-+ property QtObject btManager : BluezQt.Manager |
30 |
- |
31 |
- Plasmoid.toolTipMainText: i18n("Bluetooth") |
32 |
- Plasmoid.icon: Logic.icon() |
33 |
-@@ -44,11 +45,7 @@ Item { |
34 |
- focus: true |
35 |
- } |
36 |
- |
37 |
-- BluezQt.Manager { |
38 |
-- id: btManager |
39 |
-- |
40 |
-- onInitFinished: { |
41 |
-- Logic.init(); |
42 |
-- } |
43 |
-+ Component.onCompleted: { |
44 |
-+ Logic.init(); |
45 |
- } |
46 |
- } |
47 |
-diff --git a/src/applet/package/contents/ui/DeviceItem.qml b/src/applet/package/contents/ui/DeviceItem.qml |
48 |
-index 19b55cf..b0fc9ce 100644 |
49 |
---- a/src/applet/package/contents/ui/DeviceItem.qml |
50 |
-+++ b/src/applet/package/contents/ui/DeviceItem.qml |
51 |
-@@ -378,10 +378,10 @@ PlasmaComponents.ListItem { |
52 |
- return i18n("Connecting"); |
53 |
- } |
54 |
- |
55 |
-- switch (DeviceType) { |
56 |
-+ switch (Type) { |
57 |
- case BluezQt.Device.Headset: |
58 |
- case BluezQt.Device.Headphones: |
59 |
-- case BluezQt.Device.OtherAudio: |
60 |
-+ case BluezQt.Device.AudioVideo: |
61 |
- return i18n("Audio device"); |
62 |
- |
63 |
- case BluezQt.Device.Keyboard: |
64 |
-@@ -422,7 +422,7 @@ PlasmaComponents.ListItem { |
65 |
- function connectToDevice() |
66 |
- { |
67 |
- if (Connected) { |
68 |
-- Device.disconnectDevice(); |
69 |
-+ Device.disconnectFromDevice(); |
70 |
- return; |
71 |
- } |
72 |
- |
73 |
-@@ -433,7 +433,7 @@ PlasmaComponents.ListItem { |
74 |
- connecting = true; |
75 |
- runningActions++; |
76 |
- |
77 |
-- var call = Device.connectDevice(); |
78 |
-+ var call = Device.connectToDevice(); |
79 |
- call.userData = Device; |
80 |
- |
81 |
- call.finished.connect(function(call) { |
82 |
-diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml |
83 |
-index 849ae4e..94df8b4 100644 |
84 |
---- a/src/applet/package/contents/ui/FullRepresentation.qml |
85 |
-+++ b/src/applet/package/contents/ui/FullRepresentation.qml |
86 |
-@@ -28,9 +28,7 @@ import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt |
87 |
- FocusScope { |
88 |
- PlasmaBt.DevicesProxyModel { |
89 |
- id: devicesModel |
90 |
-- sourceModel: BluezQt.DevicesModel { |
91 |
-- manager: btManager |
92 |
-- } |
93 |
-+ sourceModel: BluezQt.DevicesModel { } |
94 |
- } |
95 |
- |
96 |
- PlasmaExtras.Heading { |
97 |
-diff --git a/src/daemon/kded/devicemonitor.cpp b/src/daemon/kded/devicemonitor.cpp |
98 |
-index 29ac2f3..22c8020 100644 |
99 |
---- a/src/daemon/kded/devicemonitor.cpp |
100 |
-+++ b/src/daemon/kded/devicemonitor.cpp |
101 |
-@@ -147,7 +147,7 @@ void DeviceMonitor::restoreState() |
102 |
- Q_FOREACH (const QString &addr, connectedDevices) { |
103 |
- BluezQt::DevicePtr device = m_manager->deviceForAddress(addr); |
104 |
- if (device) { |
105 |
-- device->connectDevice(); |
106 |
-+ device->connectToDevice(); |
107 |
- } |
108 |
- } |
109 |
- } |
110 |
-diff --git a/src/daemon/kded/filereceiver/obexagent.cpp b/src/daemon/kded/filereceiver/obexagent.cpp |
111 |
-index 9cd98ff..6ffd620 100644 |
112 |
---- a/src/daemon/kded/filereceiver/obexagent.cpp |
113 |
-+++ b/src/daemon/kded/filereceiver/obexagent.cpp |
114 |
-@@ -49,11 +49,11 @@ QDBusObjectPath ObexAgent::objectPath() const |
115 |
- return QDBusObjectPath(QStringLiteral("/BlueDevilObexAgent")); |
116 |
- } |
117 |
- |
118 |
--void ObexAgent::authorizePush(BluezQt::ObexTransferPtr transfer, const BluezQt::Request<QString> &request) |
119 |
-+void ObexAgent::authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request<QString> &request) |
120 |
- { |
121 |
- qCDebug(BLUEDAEMON) << "Agent-AuthorizePush"; |
122 |
- |
123 |
-- ReceiveFileJob *job = new ReceiveFileJob(request, transfer, this); |
124 |
-+ ReceiveFileJob *job = new ReceiveFileJob(request, transfer, session, this); |
125 |
- connect(job, &ReceiveFileJob::finished, this, &ObexAgent::receiveFileJobFinished); |
126 |
- job->start(); |
127 |
- } |
128 |
-diff --git a/src/daemon/kded/filereceiver/obexagent.h b/src/daemon/kded/filereceiver/obexagent.h |
129 |
-index 0f5adc5..e32f1fe 100644 |
130 |
---- a/src/daemon/kded/filereceiver/obexagent.h |
131 |
-+++ b/src/daemon/kded/filereceiver/obexagent.h |
132 |
-@@ -40,7 +40,7 @@ public: |
133 |
- bool shouldAutoAcceptTransfer(const QString &address) const; |
134 |
- |
135 |
- QDBusObjectPath objectPath() const Q_DECL_OVERRIDE; |
136 |
-- void authorizePush(BluezQt::ObexTransferPtr transfer, const BluezQt::Request<QString> &request) Q_DECL_OVERRIDE; |
137 |
-+ void authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request<QString> &request) Q_DECL_OVERRIDE; |
138 |
- |
139 |
- private Q_SLOTS: |
140 |
- void receiveFileJobFinished(KJob *job); |
141 |
-diff --git a/src/daemon/kded/filereceiver/receivefilejob.cpp b/src/daemon/kded/filereceiver/receivefilejob.cpp |
142 |
-index 1569163..fbb04b5 100644 |
143 |
---- a/src/daemon/kded/filereceiver/receivefilejob.cpp |
144 |
-+++ b/src/daemon/kded/filereceiver/receivefilejob.cpp |
145 |
-@@ -36,11 +36,12 @@ |
146 |
- #include <BluezQt/Device> |
147 |
- #include <BluezQt/ObexSession> |
148 |
- |
149 |
--ReceiveFileJob::ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, ObexAgent *parent) |
150 |
-+ReceiveFileJob::ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, ObexAgent *parent) |
151 |
- : KJob(parent) |
152 |
- , m_speedBytes(0) |
153 |
- , m_agent(parent) |
154 |
- , m_transfer(transfer) |
155 |
-+ , m_session(session) |
156 |
- , m_request(req) |
157 |
- { |
158 |
- setCapabilities(Killable); |
159 |
-@@ -74,24 +75,24 @@ void ReceiveFileJob::init() |
160 |
- qCDebug(BLUEDAEMON) << "\tTransferred:" << m_transfer->transferred(); |
161 |
- |
162 |
- qCDebug(BLUEDAEMON) << "ObexSession:"; |
163 |
-- qCDebug(BLUEDAEMON) << "\tSource:" << m_transfer->session()->source(); |
164 |
-- qCDebug(BLUEDAEMON) << "\tDestination:" << m_transfer->session()->destination(); |
165 |
-+ qCDebug(BLUEDAEMON) << "\tSource:" << m_session->source(); |
166 |
-+ qCDebug(BLUEDAEMON) << "\tDestination:" << m_session->destination(); |
167 |
- |
168 |
- connect(m_transfer.data(), &BluezQt::ObexTransfer::statusChanged, this, &ReceiveFileJob::statusChanged); |
169 |
- connect(m_transfer.data(), &BluezQt::ObexTransfer::transferredChanged, this, &ReceiveFileJob::transferredChanged); |
170 |
- |
171 |
-- m_deviceName = m_transfer->session()->destination(); |
172 |
-+ m_deviceName = m_session->destination(); |
173 |
- |
174 |
-- BluezQt::AdapterPtr adapter = m_agent->manager()->adapterForAddress(m_transfer->session()->source()); |
175 |
-+ BluezQt::AdapterPtr adapter = m_agent->manager()->adapterForAddress(m_session->source()); |
176 |
- if (!adapter) { |
177 |
-- qCDebug(BLUEDAEMON) << "No adapter for" << m_transfer->session()->source(); |
178 |
-+ qCDebug(BLUEDAEMON) << "No adapter for" << m_session->source(); |
179 |
- showNotification(); |
180 |
- return; |
181 |
- } |
182 |
- |
183 |
-- BluezQt::DevicePtr device = adapter->deviceForAddress(m_transfer->session()->destination()); |
184 |
-+ BluezQt::DevicePtr device = adapter->deviceForAddress(m_session->destination()); |
185 |
- if (!device) { |
186 |
-- qCDebug(BLUEDAEMON) << "No device for" << m_transfer->session()->destination(); |
187 |
-+ qCDebug(BLUEDAEMON) << "No device for" << m_session->destination(); |
188 |
- showNotification(); |
189 |
- return; |
190 |
- } |
191 |
-diff --git a/src/daemon/kded/filereceiver/receivefilejob.h b/src/daemon/kded/filereceiver/receivefilejob.h |
192 |
-index 461d453..801bb45 100644 |
193 |
---- a/src/daemon/kded/filereceiver/receivefilejob.h |
194 |
-+++ b/src/daemon/kded/filereceiver/receivefilejob.h |
195 |
-@@ -34,7 +34,7 @@ class ReceiveFileJob : public KJob |
196 |
- Q_OBJECT |
197 |
- |
198 |
- public: |
199 |
-- explicit ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, ObexAgent *parent); |
200 |
-+ explicit ReceiveFileJob(const BluezQt::Request<QString> &req, BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, ObexAgent *parent); |
201 |
- |
202 |
- QString deviceAddress() const; |
203 |
- |
204 |
-@@ -63,6 +63,7 @@ private: |
205 |
- |
206 |
- ObexAgent *m_agent; |
207 |
- BluezQt::ObexTransferPtr m_transfer; |
208 |
-+ BluezQt::ObexSessionPtr m_session; |
209 |
- BluezQt::Request<QString> m_request; |
210 |
- }; |
211 |
- |
212 |
-diff --git a/src/kcmodule/bluedevildevices.cpp b/src/kcmodule/bluedevildevices.cpp |
213 |
-index b1b6b0e..deafecc 100644 |
214 |
---- a/src/kcmodule/bluedevildevices.cpp |
215 |
-+++ b/src/kcmodule/bluedevildevices.cpp |
216 |
-@@ -113,7 +113,7 @@ void BluetoothDevicesDelegate::paint(QPainter *painter, const QStyleOptionViewIt |
217 |
- painter->setFont(f); |
218 |
- painter->drawText(r, Qt::AlignLeft | Qt::AlignTop, index.data(BluezQt::DevicesModel::FriendlyNameRole).toString()); |
219 |
- painter->restore(); |
220 |
-- painter->drawText(r, Qt::AlignLeft | Qt::AlignBottom, deviceTypeString(index.data(BluezQt::DevicesModel::DeviceTypeRole).toInt())); |
221 |
-+ painter->drawText(r, Qt::AlignLeft | Qt::AlignBottom, deviceTypeString(index.data(BluezQt::DevicesModel::TypeRole).toInt())); |
222 |
- |
223 |
- // Draw state |
224 |
- r = option.rect; |
225 |
-@@ -166,7 +166,7 @@ QString BluetoothDevicesDelegate::deviceTypeString(int type) const |
226 |
- return i18nc("This device is a Headset", "Headset"); |
227 |
- case BluezQt::Device::Headphones: |
228 |
- return i18nc("This device are Headphones", "Headphones"); |
229 |
-- case BluezQt::Device::OtherAudio: |
230 |
-+ case BluezQt::Device::AudioVideo: |
231 |
- return i18nc("This device is of type Audio", "Audio"); |
232 |
- case BluezQt::Device::Keyboard: |
233 |
- return i18nc("This device is a Keyboard", "Keyboard"); |
234 |
-@@ -349,14 +349,14 @@ void KCMBlueDevilDevices::removeDevice() |
235 |
- void KCMBlueDevilDevices::connectDevice() |
236 |
- { |
237 |
- BluezQt::DevicePtr device = m_devicesModel->device(m_devices->currentIndex()); |
238 |
-- device->connectDevice(); |
239 |
-+ device->connectToDevice(); |
240 |
- } |
241 |
- |
242 |
- void KCMBlueDevilDevices::disconnectDevice() |
243 |
- { |
244 |
- m_disconnectDevice->setEnabled(false); |
245 |
- BluezQt::DevicePtr device = m_devicesModel->device(m_devices->currentIndex()); |
246 |
-- device->disconnectDevice(); |
247 |
-+ device->disconnectFromDevice(); |
248 |
- } |
249 |
- |
250 |
- void KCMBlueDevilDevices::launchWizard() |
251 |
-diff --git a/src/kio/obexftp/daemon/obexftpdaemon.cpp b/src/kio/obexftp/daemon/obexftpdaemon.cpp |
252 |
-index a2cdac4..45a1f75 100644 |
253 |
---- a/src/kio/obexftp/daemon/obexftpdaemon.cpp |
254 |
-+++ b/src/kio/obexftp/daemon/obexftpdaemon.cpp |
255 |
-@@ -34,6 +34,7 @@ |
256 |
- #include <BluezQt/InitObexManagerJob> |
257 |
- #include <BluezQt/ObexFileTransfer> |
258 |
- #include <BluezQt/PendingCall> |
259 |
-+#include <BluezQt/ObexSession> |
260 |
- |
261 |
- K_PLUGIN_FACTORY_WITH_JSON(ObexFtpFactory, |
262 |
- "obexftpdaemon.json", |
263 |
-@@ -208,9 +209,9 @@ void ObexFtpDaemon::operationalChanged(bool operational) |
264 |
- } |
265 |
- } |
266 |
- |
267 |
--void ObexFtpDaemon::sessionRemoved(const QDBusObjectPath &session) |
268 |
-+void ObexFtpDaemon::sessionRemoved(BluezQt::ObexSessionPtr session) |
269 |
- { |
270 |
-- const QString &path = session.path(); |
271 |
-+ const QString &path = session->objectPath().path(); |
272 |
- const QString &key = d->m_sessionMap.key(path); |
273 |
- |
274 |
- if (!d->m_sessionMap.contains(key)) { |
275 |
-diff --git a/src/kio/obexftp/daemon/obexftpdaemon.h b/src/kio/obexftp/daemon/obexftpdaemon.h |
276 |
-index c42d720..a902333 100644 |
277 |
---- a/src/kio/obexftp/daemon/obexftpdaemon.h |
278 |
-+++ b/src/kio/obexftp/daemon/obexftpdaemon.h |
279 |
-@@ -23,6 +23,8 @@ |
280 |
- |
281 |
- #include <KDEDModule> |
282 |
- |
283 |
-+#include <BluezQt/Types> |
284 |
-+ |
285 |
- namespace BluezQt |
286 |
- { |
287 |
- class InitObexManagerJob; |
288 |
-@@ -52,7 +54,7 @@ private Q_SLOTS: |
289 |
- void cancelTransferFinished(QDBusPendingCallWatcher *watcher); |
290 |
- |
291 |
- void operationalChanged(bool operational); |
292 |
-- void sessionRemoved(const QDBusObjectPath &session); |
293 |
-+ void sessionRemoved(BluezQt::ObexSessionPtr session); |
294 |
- |
295 |
- private: |
296 |
- struct Private; |
297 |
-diff --git a/src/kio/obexftp/kioobexftp.cpp b/src/kio/obexftp/kioobexftp.cpp |
298 |
-index cb8d3b1..47910b4 100644 |
299 |
---- a/src/kio/obexftp/kioobexftp.cpp |
300 |
-+++ b/src/kio/obexftp/kioobexftp.cpp |
301 |
-@@ -442,24 +442,24 @@ QList<KIO::UDSEntry> KioFtp::listFolder(const QUrl &url, bool *ok) |
302 |
- return list; |
303 |
- } |
304 |
- |
305 |
-- const QList<BluezQt::ObexFileTransfer::Item> &items = call->value().value<QList<BluezQt::ObexFileTransfer::Item> >(); |
306 |
-+ const QList<BluezQt::ObexFileTransferEntry> &items = call->value().value<QList<BluezQt::ObexFileTransferEntry> >(); |
307 |
- |
308 |
-- Q_FOREACH (const BluezQt::ObexFileTransfer::Item &item, items) { |
309 |
-+ Q_FOREACH (const BluezQt::ObexFileTransferEntry &item, items) { |
310 |
- KIO::UDSEntry entry; |
311 |
-- entry.insert(KIO::UDSEntry::UDS_NAME, item.name); |
312 |
-- entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, item.label); |
313 |
-+ entry.insert(KIO::UDSEntry::UDS_NAME, item.name()); |
314 |
-+ entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, item.label()); |
315 |
- entry.insert(KIO::UDSEntry::UDS_ACCESS, 0700); |
316 |
-- entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, item.modified.toTime_t()); |
317 |
-- entry.insert(KIO::UDSEntry::UDS_SIZE, item.size); |
318 |
-+ entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, item.modificationTime().toTime_t()); |
319 |
-+ entry.insert(KIO::UDSEntry::UDS_SIZE, item.size()); |
320 |
- |
321 |
-- if (item.type == BluezQt::ObexFileTransfer::Item::Folder) { |
322 |
-+ if (item.type() == BluezQt::ObexFileTransferEntry::Folder) { |
323 |
- entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); |
324 |
- } else { |
325 |
- entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFREG); |
326 |
- } |
327 |
- |
328 |
- if (urlIsRoot(url)) { |
329 |
-- updateRootEntryIcon(entry, item.memoryType); |
330 |
-+ updateRootEntryIcon(entry, item.memoryType()); |
331 |
- } |
332 |
- |
333 |
- list.append(entry); |
334 |
-@@ -467,7 +467,7 @@ QList<KIO::UDSEntry> KioFtp::listFolder(const QUrl &url, bool *ok) |
335 |
- // Most probably the client of the kio will stat each file |
336 |
- // so since we are on it, let's cache all of them. |
337 |
- QUrl statUrl = url; |
338 |
-- statUrl.setPath(statUrl.path() + QLatin1Char('/') + item.name); |
339 |
-+ statUrl.setPath(statUrl.path() + QLatin1Char('/') + item.name()); |
340 |
- |
341 |
- if (!m_statMap.contains(statUrl.toDisplayString())) { |
342 |
- qCDebug(OBEXFTP) << "Stat:" |
343 |
-diff --git a/src/wizard/pages/connect.cpp b/src/wizard/pages/connect.cpp |
344 |
-index 1880c08..082cb10 100644 |
345 |
---- a/src/wizard/pages/connect.cpp |
346 |
-+++ b/src/wizard/pages/connect.cpp |
347 |
-@@ -54,7 +54,7 @@ void ConnectPage::initializePage() |
348 |
- |
349 |
- m_wizard->device()->setTrusted(true); |
350 |
- |
351 |
-- BluezQt::PendingCall *call = m_wizard->device()->connectDevice(); |
352 |
-+ BluezQt::PendingCall *call = m_wizard->device()->connectToDevice(); |
353 |
- connect(call, &BluezQt::PendingCall::finished, this, &ConnectPage::connectFinished); |
354 |
- } |
355 |
- |
356 |
-diff --git a/src/wizard/pages/discover.cpp b/src/wizard/pages/discover.cpp |
357 |
-index 9810f7c..862cf8a 100644 |
358 |
---- a/src/wizard/pages/discover.cpp |
359 |
-+++ b/src/wizard/pages/discover.cpp |
360 |
-@@ -215,13 +215,13 @@ int DiscoverPage::nextId() const |
361 |
- pin = m_wizard->agent()->getPin(device); |
362 |
- } |
363 |
- |
364 |
-- qCDebug(WIZARD) << "Class: " << device->deviceType(); |
365 |
-+ qCDebug(WIZARD) << "Class: " << device->type(); |
366 |
- qCDebug(WIZARD) << "Legacy: " << device->hasLegacyPairing(); |
367 |
- qCDebug(WIZARD) << "From DB: " << m_wizard->agent()->isFromDatabase(); |
368 |
- qCDebug(WIZARD) << "PIN: " << m_wizard->agent()->pin(); |
369 |
- |
370 |
- // If keyboard no matter what, we go to the keyboard page |
371 |
-- if (device->deviceType() == BluezQt::Device::Keyboard) { |
372 |
-+ if (device->type() == BluezQt::Device::Keyboard) { |
373 |
- qCDebug(WIZARD) << "Keyboard Pairing"; |
374 |
- return BlueWizard::KeyboardPairing; |
375 |
- } |
376 |
-diff --git a/src/wizard/wizardagent.cpp b/src/wizard/wizardagent.cpp |
377 |
-index a0b4b04..a263e28 100644 |
378 |
---- a/src/wizard/wizardagent.cpp |
379 |
-+++ b/src/wizard/wizardagent.cpp |
380 |
-@@ -72,8 +72,10 @@ QString WizardAgent::getPin(BluezQt::DevicePtr device) |
381 |
- |
382 |
- QXmlStreamReader xml(&file); |
383 |
- |
384 |
-- int deviceType = device->deviceType(); |
385 |
-- int xmlType = 0; |
386 |
-+ QString deviceType = BluezQt::Device::typeToString(device->type()); |
387 |
-+ if (deviceType == QLatin1String("audiovideo")) { |
388 |
-+ deviceType = QStringLiteral("audio"); |
389 |
-+ } |
390 |
- |
391 |
- while (!xml.atEnd()) { |
392 |
- xml.readNext(); |
393 |
-@@ -87,9 +89,7 @@ QString WizardAgent::getPin(BluezQt::DevicePtr device) |
394 |
- } |
395 |
- |
396 |
- if (attr.hasAttribute(QLatin1String("type")) && attr.value(QLatin1String("type")) != QLatin1String("any")) { |
397 |
-- xmlType = BluezQt::Device::stringToType(attr.value(QLatin1String("type")).toString()); |
398 |
-- if (deviceType != xmlType) { |
399 |
-- xmlType = 0; |
400 |
-+ if (deviceType != attr.value(QLatin1String("type")).toString()) { |
401 |
- continue; |
402 |
- } |
403 |
- } |
404 |
\ No newline at end of file |