summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothserver_p.h
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2013-09-18 17:23:16 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-20 10:09:12 +0200
commitec837633231d0e9c0e70ca3c3d4ad7e1fa548623 (patch)
treea33aa929e47e94fd6d91db9d047285818ee993a5 /src/bluetooth/qbluetoothserver_p.h
parent4a8fe389db0212eb6f85a49612ceddd56dd1aaf4 (diff)
Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enum
Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserver_p.h')
-rw-r--r--src/bluetooth/qbluetoothserver_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothserver_p.h b/src/bluetooth/qbluetoothserver_p.h
index e2ff60a8..b9847aaf 100644
--- a/src/bluetooth/qbluetoothserver_p.h
+++ b/src/bluetooth/qbluetoothserver_p.h
@@ -74,7 +74,7 @@ class QBluetoothServerPrivate
Q_DECLARE_PUBLIC(QBluetoothServer)
public:
- QBluetoothServerPrivate(QBluetoothServer::ServerType serverType);
+ QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol serverType);
~QBluetoothServerPrivate();
#ifdef QT_BLUEZ_BLUETOOTH
@@ -86,7 +86,7 @@ public:
int maxPendingConnections;
QBluetooth::SecurityFlags securityFlags;
- QBluetoothServer::ServerType serverType;
+ QBluetoothServiceInfo::Protocol serverType;
#ifdef QT_QNX_BLUETOOTH
QList<QBluetoothSocket *> activeSockets;