QNX: Change name of platform define to QT_QNX_BLUETOOTH

To be aligned with the bluez implementation

Change-Id: I8d3fbd0c23298f984e2c99cbf4131cf8fc0a0a64
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

8 files changed, 21 insertions, 21 deletions

diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index c090d7e1..ebf9bcec 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -78,7 +78,7 @@ config_bluez:qtHaveModule(dbus) {
         ql2capserver_bluez.cpp
 
 } else:qnx{
-    DEFINES += QTM_QNX_BLUETOOTH #BT_BBPPSDEBUG
+    DEFINES += QT_QNX_BLUETOOTH #BT_BBPPSDEBUG
 
     include(qnx/qnx.pri)
 
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 73673c59..f98ca1fc 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -53,7 +53,7 @@ class OrgBluezAdapterInterface;
 QT_BEGIN_NAMESPACE
 class QDBusVariant;
 QT_END_NAMESPACE
-#elif defined(QTM_QNX_BLUETOOTH)
+#elif defined(QT_QNX_BLUETOOTH)
 #include "qnx/ppshelpers_p.h"
 #include <QTimer>
 #endif
@@ -61,7 +61,7 @@ QT_END_NAMESPACE
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
 class QBluetoothDeviceDiscoveryAgentPrivate
-#if defined(QTM_QNX_BLUETOOTH)
+#if defined(QT_QNX_BLUETOOTH)
 : public QObject {
     Q_OBJECT
 #else
@@ -93,7 +93,7 @@ private:
     bool pendingStart;
     OrgBluezManagerInterface *manager;
     OrgBluezAdapterInterface *adapter;
-#elif defined(QTM_QNX_BLUETOOTH)
+#elif defined(QT_QNX_BLUETOOTH)
     private Q_SLOTS:
     void finished();
     void remoteDevicesChanged(int);
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index 6a7e4ac8..9ca2c598 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 class QDBusPendingCallWatcher;
 QT_END_NAMESPACE
 
-#elif defined(QTM_QNX_BLUETOOTH)
+#elif defined(QT_QNX_BLUETOOTH)
 #include <QSocketNotifier>
 #include "qnx/ppshelpers_p.h"
 #endif
@@ -112,7 +112,7 @@ private:
     void initializeAdapter();
 };
 
-#elif defined(QTM_QNX_BLUETOOTH)
+#elif defined(QT_QNX_BLUETOOTH)
 
 class QBluetoothLocalDevicePrivate : public QObject
 {
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index 23255537..e9b32491 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -59,7 +59,7 @@ class QXmlStreamReader;
 QT_END_NAMESPACE
 #endif
 
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
 #include "qnx/ppshelpers_p.h"
 #include <fcntl.h>
 #include <unistd.h>
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE_BLUETOOTH
 class QBluetoothDeviceDiscoveryAgent;
 
 class QBluetoothServiceDiscoveryAgentPrivate
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
 : public QObject
 {
     Q_OBJECT
@@ -117,7 +117,7 @@ private:
     QVariant readAttributeValue(QXmlStreamReader &xml);
 #endif
 
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
 private Q_SLOTS:
     void remoteDevicesChanged(int fd);
     void controlReply(ppsResult result);
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index fbf6aa2d..3fa96851 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -299,7 +299,7 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op
     Q_D(QBluetoothSocket);
     setOpenMode(openMode);
 
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     d->connectToService(service.device().address(), service.serviceUuid(), openMode);
 #else
     if (service.protocolServiceMultiplexer() > 0) {
@@ -345,7 +345,7 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op
 */
 void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid, OpenMode openMode)
 {
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     Q_D(QBluetoothSocket);
     d->connectToService(address, uuid, openMode);
 #else
@@ -373,7 +373,7 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const
 */
 void QBluetoothSocket::connectToService(const QBluetoothAddress &address, quint16 port, OpenMode openMode)
 {
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     Q_UNUSED(port);
     Q_UNUSED(openMode);
     Q_UNUSED(address);
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h
index 9bda893e..3fed921f 100644
--- a/src/bluetooth/qbluetoothsocket_p.h
+++ b/src/bluetooth/qbluetoothsocket_p.h
@@ -44,7 +44,7 @@
 
 #include "qbluetoothsocket.h"
 
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
 #include "qnx/ppshelpers_p.h"
 #endif
 
@@ -74,7 +74,7 @@ class QBluetoothSocket;
 class QBluetoothServiceDiscoveryAgent;
 
 class QBluetoothSocketPrivate
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
 : public QObject
 {
     Q_OBJECT
@@ -88,7 +88,7 @@ public:
     ~QBluetoothSocketPrivate();
 
 //On qnx we connect using the uuid not the port
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     void connectToService(const QBluetoothAddress &address, QBluetoothUuid uuid, QIODevice::OpenMode openMode);
 #else
     void connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode);
@@ -152,7 +152,7 @@ protected:
 private:
     mutable QString m_localName;
     mutable QString m_peerName;
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     QBluetoothAddress m_peerAddress;
     QBluetoothUuid m_uuid;
     bool isServerSocket;
diff --git a/src/bluetooth/qrfcommserver.cpp b/src/bluetooth/qrfcommserver.cpp
index b6bbfe77..53ab2791 100644
--- a/src/bluetooth/qrfcommserver.cpp
+++ b/src/bluetooth/qrfcommserver.cpp
@@ -200,7 +200,7 @@ bool QRfcommServer::isListening() const
 {
     Q_D(const QRfcommServer);
 
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     if (!d->socket)
         return false;
 #endif
diff --git a/src/bluetooth/qrfcommserver_p.h b/src/bluetooth/qrfcommserver_p.h
index e99fc866..44c7b22a 100644
--- a/src/bluetooth/qrfcommserver_p.h
+++ b/src/bluetooth/qrfcommserver_p.h
@@ -47,7 +47,7 @@
 #include <QtBluetooth/QBluetoothSocket>
 #include "qbluetooth.h"
 
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
 #include "qnx/ppshelpers_p.h"
 #endif
 
@@ -63,7 +63,7 @@ class QBluetoothSocket;
 class QRfcommServer;
 
 class QRfcommServerPrivate
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
 : public QObject
 {
     Q_OBJECT
@@ -86,7 +86,7 @@ public:
     int maxPendingConnections;
     QBluetooth::SecurityFlags securityFlags;
 
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     QList<QBluetoothSocket *> activeSockets;
     QString m_serviceName;
 #endif
@@ -95,7 +95,7 @@ protected:
     QRfcommServer *q_ptr;
 
 private:
-#ifdef QTM_QNX_BLUETOOTH
+#ifdef QT_QNX_BLUETOOTH
     QBluetoothUuid m_uuid;
     bool serverRegistered;
     QString nextClientAddress;