From 42496770e96334efdce9c29410051695be3310fb Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 22 Mar 2017 11:57:22 +0100 Subject: QBluetoothSocket/bluez: fix QString::arg() usage QString::arg() returns the new value but leaves *this unchanged. Found by GCC 7 (-Wunused-result). Change-Id: I8a0ddb801ded94365f0e9a7ae13a37a96c7f437a Reviewed-by: Lars Knoll --- src/bluetooth/qbluetoothsocket_bluez.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index 803df6df..162a1a0b 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -251,8 +251,7 @@ void QBluetoothSocketPrivate::_q_writeNotify() break; default: // every other case returns error - errorString = QBluetoothSocket::tr("Network Error: %1"); - errorString.arg(qt_error_string(errno)); + errorString = QBluetoothSocket::tr("Network Error: %1").arg(qt_error_string(errno)) ; q->setSocketError(QBluetoothSocket::NetworkError); break; } @@ -507,8 +506,7 @@ qint64 QBluetoothSocketPrivate::writeData(const char *data, qint64 maxSize) sz = 0; break; default: - errorString = QBluetoothSocket::tr("Network Error: %1"); - errorString.arg(qt_error_string(errno)); + errorString = QBluetoothSocket::tr("Network Error: %1").arg(qt_error_string(errno)); q->setSocketError(QBluetoothSocket::NetworkError); } } -- cgit v1.2.3 From 519ac44fbbeed7ab74fc1f733fcf9057075d0946 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 7 Apr 2017 17:14:19 +0300 Subject: LE/Android: fix status code descriptions Change-Id: Iee2f8e02a926129dfdd1c82d0fa84dfbb45303d3 Reviewed-by: Alex Blasche --- .../src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java index 5c336dc0..d2373051 100644 --- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java +++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java @@ -185,8 +185,8 @@ public class QtBluetoothLE { switch (status) { case BluetoothGatt.GATT_SUCCESS: errorCode = 0; break; //QLowEnergyController::NoError - case 8: // link loss - case 22: // BTA_GATT_CONN_LMP_TIMEOUT + case 8: // BLE_HCI_CONNECTION_TIMEOUT + case 22: // BLE_HCI_LOCAL_HOST_TERMINATED_CONNECTION Log.w(TAG, "Connection Error: Try to delay connect() call after previous activity"); errorCode = 5; break; //QLowEnergyController::ConnectionError default: -- cgit v1.2.3