summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothserver.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.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.h')
-rw-r--r--src/bluetooth/qbluetoothserver.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h
index 77634649..ad651667 100644
--- a/src/bluetooth/qbluetoothserver.h
+++ b/src/bluetooth/qbluetoothserver.h
@@ -62,11 +62,7 @@ class Q_BLUETOOTH_EXPORT QBluetoothServer : public QObject
Q_OBJECT
public:
- enum ServerType {
- L2capServer = 0,
- RfcommServer
- };
- QBluetoothServer(ServerType serverType, QObject *parent = 0);
+ QBluetoothServer(QBluetoothServiceInfo::Protocol serverType, QObject *parent = 0);
~QBluetoothServer();
void close();
@@ -87,7 +83,7 @@ public:
void setSecurityFlags(QBluetooth::SecurityFlags security);
QBluetooth::SecurityFlags securityFlags() const;
- ServerType serverType() const;
+ QBluetoothServiceInfo::Protocol serverType() const;
Q_SIGNALS:
void newConnection();