diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-08-01 18:15:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 13:10:31 +0200 |
| commit | d7ab00bac1d94bfdca412fab47a0d125f70bcb3a (patch) | |
| tree | 6dd4accde959f920c9a5de5296f176070f1dfaa5 /src/bluetooth/qnx | |
| parent | eacbe014db7a502b1045e848dc7ca40a2bb9e635 (diff) | |
QNX: Emit pairing finished signal
Pairing finished signal is emitted after pairing was requested.
Also fixes a typo and a bug where the q Pointer was not saved.
Task-number: QTBUG-32247
Change-Id: Ia2d32fdafd9510908f278edda927071199326f5d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qnx')
| -rw-r--r-- | src/bluetooth/qnx/ppshelpers.cpp | 3 | ||||
| -rw-r--r-- | src/bluetooth/qnx/ppshelpers_p.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/bluetooth/qnx/ppshelpers.cpp b/src/bluetooth/qnx/ppshelpers.cpp index 6225ef0d..eb7f4f31 100644 --- a/src/bluetooth/qnx/ppshelpers.cpp +++ b/src/bluetooth/qnx/ppshelpers.cpp @@ -261,6 +261,7 @@ void ppsDecodeControlResponse() if (wMessage.second != 0) wMessage.second->metaObject()->invokeMethod(wMessage.second, "controlReply", Q_ARG(ppsResult, result)); } else if (resType == EVENT) { + qBBBluetoothDebug() << "Distributing event" << result.msg; for (int i=0; i < evtRegistration.size(); i++) { if (result.msg == evtRegistration.at(i).first) evtRegistration.at(i).second->metaObject()->invokeMethod(evtRegistration.at(i).second, "controlEvent", Q_ARG(ppsResult, result)); @@ -421,7 +422,7 @@ void ppsRegisterForEvent(const QString &evt, QObject *obj) evtRegistration.append(QPair<QString, QObject*>(evt,obj)); } -void ppsUnreguisterForEvent(const QString &str, QObject *obj) +void ppsUnregisterForEvent(const QString &str, QObject *obj) { for (int i=evtRegistration.size()-1; i >= 0; --i) { if (evtRegistration.at(i).first == str && evtRegistration.at(i).second == obj) diff --git a/src/bluetooth/qnx/ppshelpers_p.h b/src/bluetooth/qnx/ppshelpers_p.h index 2809cb28..d09768a3 100644 --- a/src/bluetooth/qnx/ppshelpers_p.h +++ b/src/bluetooth/qnx/ppshelpers_p.h @@ -128,7 +128,7 @@ bool ppsReadRemoteDevice(int fd, pps_decoder_t *decoder, QBluetoothAddress *btAd void ppsRegisterForEvent(const QString &evt, QObject *obj); -void ppsUnreguisterForEvent(const QString &evt, QObject *obj); +void ppsUnregisterForEvent(const QString &evt, QObject *obj); QT_END_NAMESPACE_BLUETOOTH |