diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-06-15 16:58:54 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-06-17 08:13:47 +0000 |
| commit | affa5a5ebfdba54a926c62c6ff4af9a76022d5bb (patch) | |
| tree | b2b6c7f705041ea96177ededfc2325539a530b31 /src/bluetooth/qbluetoothserver_p.h | |
| parent | 93c13b214bbd5f72d88e537b4833d5d0654830c7 (diff) | |
Remove QNX/BlackBerry implementation for QtBluetooth
[ChangeLog][QtBluetooth][Platform Specific Changes] Removed
support for Blackberry 10.
Change-Id: I431c4f34bb10aa3668542df7a8b3403b61bf4705
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserver_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothserver_p.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/bluetooth/qbluetoothserver_p.h b/src/bluetooth/qbluetoothserver_p.h index 090d8860..ae9b2740 100644 --- a/src/bluetooth/qbluetoothserver_p.h +++ b/src/bluetooth/qbluetoothserver_p.h @@ -51,10 +51,6 @@ #include "qbluetoothserver.h" #include "qbluetooth.h" -#ifdef QT_QNX_BLUETOOTH -#include "qnx/ppshelpers_p.h" -#endif - #ifdef QT_BLUEZ_BLUETOOTH QT_FORWARD_DECLARE_CLASS(QSocketNotifier) #endif @@ -77,13 +73,7 @@ class QBluetoothServer; #ifndef QT_OSX_BLUETOOTH class QBluetoothServerPrivate -#ifdef QT_QNX_BLUETOOTH -: public QObject -{ - Q_OBJECT -#else { -#endif Q_DECLARE_PUBLIC(QBluetoothServer) public: @@ -101,31 +91,12 @@ public: QBluetooth::SecurityFlags securityFlags; QBluetoothServiceInfo::Protocol serverType; -#ifdef QT_QNX_BLUETOOTH -#ifdef QT_QNX_BT_BLUETOOTH - static void btCallback(long param, int socket); - Q_INVOKABLE void setBtCallbackParameters(int receivedSocket); -#endif - QList<QBluetoothSocket *> activeSockets; - QString m_serviceName; -#endif - protected: QBluetoothServer *q_ptr; private: QBluetoothServer::Error m_lastError; -#ifdef QT_QNX_BLUETOOTH - QBluetoothUuid m_uuid; - bool serverRegistered; - QString nextClientAddress; - -private slots: -#ifndef QT_QNX_BT_BLUETOOTH - void controlReply(ppsResult result); - void controlEvent(ppsResult result); -#endif -#elif defined(QT_BLUEZ_BLUETOOTH) +#if defined(QT_BLUEZ_BLUETOOTH) QSocketNotifier *socketNotifier; #elif defined(QT_ANDROID_BLUETOOTH) ServerAcceptanceThread *thread; |