diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-18 17:23:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 10:09:12 +0200 |
| commit | ec837633231d0e9c0e70ca3c3d4ad7e1fa548623 (patch) | |
| tree | a33aa929e47e94fd6d91db9d047285818ee993a5 /examples | |
| parent | 4a8fe389db0212eb6f85a49612ceddd56dd1aaf4 (diff) | |
Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enum
Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bluetooth/btchat/chatclient.cpp | 2 | ||||
| -rw-r--r-- | examples/bluetooth/btchat/chatserver.cpp | 2 | ||||
| -rw-r--r-- | examples/bluetooth/bttennis/tennisclient.cpp | 2 | ||||
| -rw-r--r-- | examples/bluetooth/bttennis/tennisserver.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/bluetooth/btchat/chatclient.cpp b/examples/bluetooth/btchat/chatclient.cpp index 30e36b06..b6ba7c52 100644 --- a/examples/bluetooth/btchat/chatclient.cpp +++ b/examples/bluetooth/btchat/chatclient.cpp @@ -59,7 +59,7 @@ void ChatClient::startClient(const QBluetoothServiceInfo &remoteService) return; // Connect to service - socket = new QBluetoothSocket(QBluetoothSocket::RfcommSocket); + socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol); qDebug() << "Create socket"; socket->connectToService(remoteService); qDebug() << "ConnecttoService done"; diff --git a/examples/bluetooth/btchat/chatserver.cpp b/examples/bluetooth/btchat/chatserver.cpp index ca7023f1..863078fc 100644 --- a/examples/bluetooth/btchat/chatserver.cpp +++ b/examples/bluetooth/btchat/chatserver.cpp @@ -63,7 +63,7 @@ void ChatServer::startServer() return; //! [Create the server] - rfcommServer = new QBluetoothServer(QBluetoothServer::RfcommServer, this); + rfcommServer = new QBluetoothServer(QBluetoothServiceInfo::RfcommProtocol, this); connect(rfcommServer, SIGNAL(newConnection()), this, SLOT(clientConnected())); rfcommServer->listen(); //! [Create the server] diff --git a/examples/bluetooth/bttennis/tennisclient.cpp b/examples/bluetooth/bttennis/tennisclient.cpp index 01b30820..080c3a07 100644 --- a/examples/bluetooth/bttennis/tennisclient.cpp +++ b/examples/bluetooth/bttennis/tennisclient.cpp @@ -69,7 +69,7 @@ void TennisClient::startClient(const QBluetoothServiceInfo &remoteService) serviceInfo = remoteService; // Connect to service - socket = new QBluetoothSocket(QBluetoothSocket::L2capSocket); + socket = new QBluetoothSocket(QBluetoothServiceInfo::L2capProtocol); qDebug() << "Create socket"; socket->connectToService(remoteService); qDebug() << "ConnecttoService done"; diff --git a/examples/bluetooth/bttennis/tennisserver.cpp b/examples/bluetooth/bttennis/tennisserver.cpp index 853b14ac..be6a0370 100644 --- a/examples/bluetooth/bttennis/tennisserver.cpp +++ b/examples/bluetooth/bttennis/tennisserver.cpp @@ -74,7 +74,7 @@ void TennisServer::startServer() return; //! [Create the server] - l2capServer = new QBluetoothServer(QBluetoothServer::L2capServer, this); + l2capServer = new QBluetoothServer(QBluetoothServiceInfo::L2capProtocol, this); connect(l2capServer, SIGNAL(newConnection()), this, SLOT(clientConnected())); l2capServer->listen(); //! [Create the server] |