Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/bluetooth/qbluetoothlocaldevice_qnx.cpp
	src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp

Change-Id: If7dd968047fec5352567e9b67ca5b8e680c7523d

1 files changed, 13 insertions, 14 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
index 1f11174f..22123f72 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
@@ -194,16 +194,15 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
     else
         _q_serviceDiscoveryFinished();
 #else
-    qBBBluetoothDebug() << "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) {
         if (QFile::exists(filePath + QLatin1String("-00")) ||
             QFile::exists(filePath + QLatin1String("-01"))) {
-            qBBBluetoothDebug() << "LE device discovered...skipping";
+            qCDebug(QT_BT_QNX) << "LE device discovered...skipping";
         } else {
-            qWarning() << "Failed to open " << filePath;
+            qCWarning(QT_BT_QNX) << "Failed to open " << filePath;
             error = QBluetoothServiceDiscoveryAgent::InputOutputError;
-            errorString = QStringLiteral("Failed to open remote device file");
+            errorString = QBluetoothServiceDiscoveryAgent::tr("Failed to open remote device file");
             q->error(error);
         }
         _q_serviceDiscoveryFinished();
@@ -215,9 +214,9 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
         if (rdNotifier) {
             connect(rdNotifier, SIGNAL(activated(int)), this, SLOT(remoteDevicesChanged(int)));
         } else {
-            qWarning() << "Service Discovery: Failed to connect to rdNotifier";
+            qCWarning(QT_BT_QNX) << "Service Discovery: Failed to connect to rdNotifier";
             error = QBluetoothServiceDiscoveryAgent::InputOutputError;
-            errorString = QStringLiteral("Failed to connect to rdNotifier");
+            errorString = QBluetoothServiceDiscoveryAgent::tr("Failed to connect to notifier");
             q->error(error);
             _q_serviceDiscoveryFinished();
             return;
@@ -266,7 +265,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
         if (next_service == 0)
             break;
 
-        qBBBluetoothDebug() << Q_FUNC_INFO << "Service" << next_service;
+        qCDebug(QT_BT_QNX) << Q_FUNC_INFO << "Service" << next_service;
 
         QBluetoothServiceInfo serviceInfo;
         serviceInfo.setDevice(discoveredDevices.at(0));
@@ -313,13 +312,13 @@ void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
                     && sInfo.serviceUuid() == serviceInfo.serviceUuid()
                     && sInfo.serviceClassUuids() == serviceInfo.serviceClassUuids()) {
                 entryExists = true;
-                //qBBBluetoothDebug() << "Entry exists" << serviceInfo.serviceClassUuids().first() << sInfo.serviceClassUuids().first();
+                //qCDebug(QT_BT_QNX) << "Entry exists" << serviceInfo.serviceClassUuids().first() << sInfo.serviceClassUuids().first();
                 break;
             }
         }
 
         if (!entryExists) {
-            qBBBluetoothDebug() << "Adding service" << next_service << " " << serviceInfo.socketProtocol();
+            qCDebug(QT_BT_QNX) << "Adding service" << next_service << " " << serviceInfo.socketProtocol();
             discoveredServices << serviceInfo;
             q_ptr->serviceDiscovered(serviceInfo);
         }
@@ -330,13 +329,13 @@ void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
 
 void QBluetoothServiceDiscoveryAgentPrivate::controlReply(ppsResult result)
 {
-    qBBBluetoothDebug() << "Control reply" << result.msg << result.dat;
+    qCDebug(QT_BT_QNX) << "Control reply" << result.msg << result.dat;
     if (!m_queryTimer.isActive())
         return;
     m_queryTimer.stop();
     Q_Q(QBluetoothServiceDiscoveryAgent);
     if (!result.errorMsg.isEmpty()) {
-        qWarning() << Q_FUNC_INFO << result.errorMsg;
+        qCWarning(QT_BT_QNX) << Q_FUNC_INFO << result.errorMsg;
         errorString = result.errorMsg;
         error = QBluetoothServiceDiscoveryAgent::InputOutputError;
         q->error(error);
@@ -347,13 +346,13 @@ void QBluetoothServiceDiscoveryAgentPrivate::controlReply(ppsResult result)
 
 void QBluetoothServiceDiscoveryAgentPrivate::controlEvent(ppsResult result)
 {
-    qBBBluetoothDebug() << "Control event" << result.msg << result.dat;
+    qCDebug(QT_BT_QNX) << "Control event" << result.msg << result.dat;
     if (!m_queryTimer.isActive())
         return;
     m_queryTimer.stop();
     Q_Q(QBluetoothServiceDiscoveryAgent);
     if (!result.errorMsg.isEmpty()) {
-        qWarning() << Q_FUNC_INFO << result.errorMsg;
+        qCWarning(QT_BT_QNX) << Q_FUNC_INFO << result.errorMsg;
         errorString = result.errorMsg;
         error = QBluetoothServiceDiscoveryAgent::InputOutputError;
         q->error(error);
@@ -366,7 +365,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::queryTimeout()
 {
     Q_Q(QBluetoothServiceDiscoveryAgent);
     error = QBluetoothServiceDiscoveryAgent::UnknownError;
-    errorString = QStringLiteral("Service query timed out");
+    errorString = QBluetoothServiceDiscoveryAgent::tr("Service query timed out");
     q->error(error);
     _q_serviceDiscoveryFinished();
 }