diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:15 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:15 +0100 |
commit | 5eb8fd9f69db3b79f37a374f32296f96eb56d6d3 (patch) | |
tree | 3aab8bd2d059dc24132490acced178bf746a1a94 /tests | |
parent | 18b57342a009b310c280feeaec3d7cf9f6b98dcb (diff) | |
parent | 1bba2694302b7200d62d715827f20e8f830d9e03 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ie774891eca63ff51e8829d189ca1b69d75adfe64
Diffstat (limited to 'tests')
-rw-r--r-- | tests/bttestui/btlocaldevice.cpp | 30 | ||||
-rw-r--r-- | tests/bttestui/main.cpp | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index 07edbe0c..583a8c6b 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -93,17 +93,17 @@ BtLocalDevice::BtLocalDevice(QObject *parent) : connect(socket, SIGNAL(connected()), this, SLOT(socketConnected())); connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected())); connect(socket, SIGNAL(readyRead()), this, SLOT(readData())); - setSecFlags(socket->preferredSecurityFlags()); + setSecFlags(static_cast<int>(socket->preferredSecurityFlags())); server = new QBluetoothServer(SOCKET_PROTOCOL, this); connect(server, SIGNAL(newConnection()), this, SLOT(serverNewConnection())); connect(server, SIGNAL(error(QBluetoothServer::Error)), this, SLOT(serverError(QBluetoothServer::Error))); } else { - deviceAgent = 0; - serviceAgent = 0; - socket = 0; - server = 0; + deviceAgent = nullptr; + serviceAgent = nullptr; + socket = nullptr; + server = nullptr; } } @@ -119,7 +119,7 @@ BtLocalDevice::~BtLocalDevice() int BtLocalDevice::secFlags() const { - return (int)securityFlags; + return static_cast<int>(securityFlags); } void BtLocalDevice::setSecFlags(int newFlags) @@ -150,7 +150,7 @@ QString BtLocalDevice::hostMode() const void BtLocalDevice::setHostMode(int newMode) { - localDevice->setHostMode((QBluetoothLocalDevice::HostMode)newMode); + localDevice->setHostMode(static_cast<QBluetoothLocalDevice::HostMode>(newMode)); } void BtLocalDevice::requestPairingUpdate(bool isPairing) @@ -272,7 +272,7 @@ void BtLocalDevice::discoveryCanceled() void BtLocalDevice::discoveryError(QBluetoothDeviceDiscoveryAgent::Error error) { - QBluetoothDeviceDiscoveryAgent *client = qobject_cast<QBluetoothDeviceDiscoveryAgent *>(sender()); + auto *client = qobject_cast<QBluetoothDeviceDiscoveryAgent *>(sender()); if (!client) return; qDebug() << "###### Device Discovery Error:" << error << (client ? client->errorString() : QString()); @@ -380,7 +380,7 @@ void BtLocalDevice::serviceDiscoveryCanceled() void BtLocalDevice::serviceDiscoveryError(QBluetoothServiceDiscoveryAgent::Error error) { - QBluetoothServiceDiscoveryAgent *client = qobject_cast<QBluetoothServiceDiscoveryAgent *>(sender()); + auto *client = qobject_cast<QBluetoothServiceDiscoveryAgent *>(sender()); if (!client) return; qDebug() << "###### Service Discovery Error:" << error << (client ? client->errorString() : QString()); @@ -487,7 +487,7 @@ void BtLocalDevice::socketDisconnected() void BtLocalDevice::socketError(QBluetoothSocket::SocketError error) { - QBluetoothSocket *client = qobject_cast<QBluetoothSocket *>(sender()); + auto *client = qobject_cast<QBluetoothSocket *>(sender()); qDebug() << "###### Socket error" << error << (client ? client->errorString() : QString()); } @@ -495,7 +495,7 @@ void BtLocalDevice::socketError(QBluetoothSocket::SocketError error) void BtLocalDevice::socketStateChanged(QBluetoothSocket::SocketState state) { qDebug() << "###### Socket state" << state; - emit socketStateUpdate((int) state); + emit socketStateUpdate(static_cast<int>(state)); } void BtLocalDevice::dumpSocketInformation() @@ -687,7 +687,7 @@ void BtLocalDevice::serverNewConnection() void BtLocalDevice::clientSocketDisconnected() { - QBluetoothSocket *client = qobject_cast<QBluetoothSocket *>(sender()); + auto *client = qobject_cast<QBluetoothSocket *>(sender()); if (!client) return; @@ -700,7 +700,7 @@ void BtLocalDevice::clientSocketDisconnected() void BtLocalDevice::clientSocketReadyRead() { - QBluetoothSocket *socket = qobject_cast<QBluetoothSocket *>(sender()); + auto *socket = qobject_cast<QBluetoothSocket *>(sender()); if (!socket) return; @@ -757,7 +757,7 @@ void BtLocalDevice::dumpServerInformation() case QBluetoothSocket::NetworkError: tmp += "NetworkError"; break; case QBluetoothSocket::UnsupportedProtocolError: tmp += "UnsupportedProtocolError"; break; //case QBluetoothSocket::OperationError: tmp+= "OperationError"; break; - default: tmp += QString::number((int)client->error()); break; + default: tmp += QString::number(static_cast<int>(client->error())); break; } qDebug() << "socket error:" << tmp << client->errorString(); @@ -830,7 +830,7 @@ void BtLocalDevice::powerOn() void BtLocalDevice::reset() { - emit error((QBluetoothLocalDevice::Error)1000); + emit error(static_cast<QBluetoothLocalDevice::Error>(1000)); if (serviceAgent) { serviceAgent->clear(); } diff --git a/tests/bttestui/main.cpp b/tests/bttestui/main.cpp index 857efa90..35f95b6e 100644 --- a/tests/bttestui/main.cpp +++ b/tests/bttestui/main.cpp @@ -50,5 +50,5 @@ int main(int argc, char *argv[]) QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit())); view.show(); - return app.exec(); + return QGuiApplication::exec(); } |