diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-12-19 16:24:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 16:19:55 +0100 |
| commit | 0abf615fe2f18dc2ebf66ca7874b40ed6ba126c9 (patch) | |
| tree | 4600450b4070a923daaf69ed0f8accbe1c7eeb98 | |
| parent | 5e9a7dee5a2562c518f670337f6e3cbe1db64f8a (diff) | |
Fix remaining compiler warnings in QtConnectivity module
Change-Id: Iafadb39642c6b2944e8a873bdee49fb87e3ed5e9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp | 1 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp | 4 | ||||
| -rw-r--r-- | src/nfc/qnx/qnxnfcmanager.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp index 4660e84c..9abf359d 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp @@ -129,7 +129,6 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start() void QBluetoothDeviceDiscoveryAgentPrivate::stop() { - Q_Q(QBluetoothDeviceDiscoveryAgent); m_active = false; m_finishedTimer.stop(); if (m_currentOp == Start) { diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp index 4cf73dc1..f88e7b70 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp @@ -75,8 +75,8 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr { Q_Q(QBluetoothServiceDiscoveryAgent); qCDebug(QT_BT_QNX) << "Starting Service discovery for" << address.toString(); - QByteArray filePath = QByteArray("/pps/services/bluetooth/remote_devices/").append(address.toString().toUtf8().constData()); - if ((m_rdfd = qt_safe_open(filePath.constData(), O_RDONLY)) == -1) { + const QString filePath = QStringLiteral("/pps/services/bluetooth/remote_devices/").append(address.toString()); + if ((m_rdfd = qt_safe_open(filePath.toLocal8Bit().constData(), O_RDONLY)) == -1) { if (QFile::exists(filePath + QLatin1String("-00")) || QFile::exists(filePath + QLatin1String("-01"))) { qCDebug(QT_BT_QNX) << "LE device discovered...skipping"; diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp index be23838e..2b644b30 100644 --- a/src/nfc/qnx/qnxnfcmanager.cpp +++ b/src/nfc/qnx/qnxnfcmanager.cpp @@ -363,7 +363,7 @@ void QNXNFCManager::setupInvokeTarget() { //Get the correct target-id QString targetId = QCoreApplication::instance()->arguments().first(); - targetId = targetId.left(targetId.lastIndexOf(".")); + targetId = targetId.left(targetId.lastIndexOf(QLatin1Char('.'))); if (BPS_SUCCESS != navigator_invoke_set_filters("20", targetId.toLatin1().constData(), filters, 1)) { qWarning() << "NFC Error setting share target filter"; |