diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-19 16:07:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 21:37:26 +0100 |
| commit | 9782c350820cef66463684a0cc0bce70037c26d8 (patch) | |
| tree | 7d4f8a3d2974d2a26f04ee5610cefafdb4132553 /src/bluetooth | |
| parent | 9025aa25fe46fdfda804d33aae7d39c887c51b68 (diff) | |
Remove all compiler warnings.
Change-Id: I8322ce0db87aec86cd1341bb49198d812e969122
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qlowenergycharacteristicinfo_bluez.cpp | 5 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergyserviceinfo_bluez.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/bluetooth/qlowenergycharacteristicinfo_bluez.cpp b/src/bluetooth/qlowenergycharacteristicinfo_bluez.cpp index f66100ed..eb3b61ec 100644 --- a/src/bluetooth/qlowenergycharacteristicinfo_bluez.cpp +++ b/src/bluetooth/qlowenergycharacteristicinfo_bluez.cpp @@ -54,8 +54,9 @@ QT_BEGIN_NAMESPACE -QLowEnergyCharacteristicInfoPrivate::QLowEnergyCharacteristicInfoPrivate(): - value (QByteArray()), permission(0), notification (false), handle(QStringLiteral("0x0000")), properties(QVariantMap()), errorString(""), characteristic(0), m_signalConnected(false) +QLowEnergyCharacteristicInfoPrivate::QLowEnergyCharacteristicInfoPrivate() + : permission(0), notification (false), handle(QStringLiteral("0x0000")), + properties(QVariantMap()), characteristic(0), m_signalConnected(false) { process = process->instance(); t=0; diff --git a/src/bluetooth/qlowenergyserviceinfo_bluez.cpp b/src/bluetooth/qlowenergyserviceinfo_bluez.cpp index bf7c1816..82eabd1d 100644 --- a/src/bluetooth/qlowenergyserviceinfo_bluez.cpp +++ b/src/bluetooth/qlowenergyserviceinfo_bluez.cpp @@ -182,8 +182,9 @@ void QLowEnergyServiceInfoPrivate::replyReceived(const QString &reply) #endif QString charHandle = l.at(8); if ( charHandle.toUShort(0,0) >= startingHandle.toUShort(0,0) && charHandle.toUShort(0,0) <= endingHandle.toUShort(0,0)) { - QString uuidParts = l.at(10) + "-" + l.at(11) + "-" + l.at(12) + "-" + l.at(13) + "-" + l.at(14); - QBluetoothUuid charUuid(uuidParts); + QString u(QStringLiteral("%1-%2-%3-%4-%5")); + u = u.arg(l.at(10)).arg(l.at(11)).arg(l.at(12)).arg(l.at(13)).arg(l.at(14)); + QBluetoothUuid charUuid(u); QVariantMap map = QVariantMap(); QLowEnergyCharacteristicInfo chars(charUuid); |