summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
diff options
context:
space:
mode:
authoralex <alex.blasche@nokia.com>2012-02-07 16:59:47 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-08 14:01:13 +0100
commit09defae552883e1d673021772e51fdce81838560 (patch)
tree775409288b3b3178d60556be6d9d9d2b9f49616d /src/bluetooth/qbluetoothdevicediscoveryagent_p.h
parent79095c3fbc97abd0138b91bb1833628f1d09fdad (diff)
No more Bluetooth on Symbian
This change cleans the code base significantly. Change-Id: I668d05d72cf5aa896818139e2daba51909c0b9dd Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_p.h26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 68da0478..e9925d77 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -55,12 +55,6 @@ class QDBusVariant;
QT_END_NAMESPACE
#endif
-#ifdef QT_SYMBIAN_BLUETOOTH
-#include "symbian/bluetoothlinkmanagerdevicediscoverer.h"
-#include <es_sock.h>
-#include <bt_sock.h>
-#endif
-
QT_BEGIN_HEADER
QTBLUETOOTH_BEGIN_NAMESPACE
@@ -76,24 +70,12 @@ public:
void stop();
bool isActive() const;
-#ifdef QT_SYMBIAN_BLUETOOTH
-// private slots
- void _q_newDeviceFound(const QBluetoothDeviceInfo &device);
- void _q_setError(QBluetoothDeviceDiscoveryAgent::Error errorCode,
- QString errorDescription);
-#endif
-
#ifdef QT_BLUEZ_BLUETOOTH
void _q_deviceFound(const QString &address, const QVariantMap &dict);
void _q_propertyChanged(const QString &name, const QDBusVariant &value);
#endif
private:
-#ifdef QT_SYMBIAN_BLUETOOTH
- void allocate();
- uint inquiryTypeToIAC() const;
-#endif
-
QList<QBluetoothDeviceInfo> discoveredDevices;
QBluetoothDeviceDiscoveryAgent::InquiryType inquiryType;
@@ -108,14 +90,6 @@ private:
OrgBluezAdapterInterface *adapter;
#endif
-#ifdef QT_SYMBIAN_BLUETOOTH
- // shared socket servet among RHostResolvers
- RSocketServ m_socketServer;
- // active object for device discovery
- BluetoothLinkManagerDeviceDiscoverer *m_deviceDiscovery;
-
-#endif
-
QBluetoothDeviceDiscoveryAgent *q_ptr;
};