From 752de447fe646c20f35b0b304ec2ff737be10ab6 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 18 Mar 2015 15:50:15 +0100 Subject: Minor code optimization QBluetoothSocketPrivate::close() was always called when the internal socket state has been set to ClosingState. The removed checks were meaningless. Change-Id: Ia36808a21de7dd1076cdd47bca8fd6855ec957c3 Reviewed-by: Timur Pocheptsov --- src/bluetooth/qbluetoothsocket_bluez.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/bluetooth/qbluetoothsocket_bluez.cpp') diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index 9eedc492..9f68386c 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -511,20 +511,10 @@ qint64 QBluetoothSocketPrivate::readData(char *data, qint64 maxSize) void QBluetoothSocketPrivate::close() { - Q_Q(QBluetoothSocket); - - // Only go through closing if the socket was fully opened - if(state == QBluetoothSocket::ConnectedState) - q->setSocketState(QBluetoothSocket::ClosingState); - - if(txBuffer.size() > 0 && - state == QBluetoothSocket::ClosingState){ + if (txBuffer.size() > 0) connectWriteNotifier->setEnabled(true); - } - else { + else abort(); - } - } bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType_, -- cgit v1.2.3