Use qt_error_string rather than strerror.

Change-Id: Ide3f00cacd7a42e99823441a45609f8e50063fce
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/src/bluetooth/qbluetoothserver_bluez.cpp b/src/bluetooth/qbluetoothserver_bluez.cpp
index cf50d140..0b504d9a 100644
--- a/src/bluetooth/qbluetoothserver_bluez.cpp
+++ b/src/bluetooth/qbluetoothserver_bluez.cpp
@@ -257,7 +257,7 @@ void QBluetoothServer::setSecurityFlags(QBluetooth::SecurityFlags security)
 
         if (setsockopt(d->socket->socketDescriptor(), SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm)) < 0){
             qCWarning(QT_BT_BLUEZ) << "Failed to set socket option, closing socket for safety" << errno;
-            qCWarning(QT_BT_BLUEZ) << "Error: " << strerror(errno);
+            qCWarning(QT_BT_BLUEZ) << "Error: " << qt_error_string(errno);
             d->m_lastError = InputOutputError;
             emit error(d->m_lastError);
             d->socket->close();
@@ -274,7 +274,7 @@ void QBluetoothServer::setSecurityFlags(QBluetooth::SecurityFlags security)
 
         if (setsockopt(d->socket->socketDescriptor(), SOL_L2CAP, L2CAP_LM, &lm, sizeof(lm)) < 0){
             qCWarning(QT_BT_BLUEZ) << "Failed to set socket option, closing socket for safety" << errno;
-            qCWarning(QT_BT_BLUEZ) << "Error: " << strerror(errno);
+            qCWarning(QT_BT_BLUEZ) << "Error: " << qt_error_string(errno);
             d->m_lastError = InputOutputError;
             emit error(d->m_lastError);
             d->socket->close();
@@ -293,7 +293,7 @@ QBluetooth::SecurityFlags QBluetoothServer::securityFlags() const
 
     if (d->serverType == QBluetoothServiceInfo::RfcommProtocol) {
         if (getsockopt(d->socket->socketDescriptor(), SOL_RFCOMM, RFCOMM_LM, &lm, (socklen_t *)&len) < 0) {
-            qCWarning(QT_BT_BLUEZ) << "Failed to get security flags" << strerror(errno);
+            qCWarning(QT_BT_BLUEZ) << "Failed to get security flags" << qt_error_string(errno);
             return QBluetooth::NoSecurity;
         }
 
@@ -310,7 +310,7 @@ QBluetooth::SecurityFlags QBluetoothServer::securityFlags() const
             security |= QBluetooth::Authorization;
     } else {
         if (getsockopt(d->socket->socketDescriptor(), SOL_L2CAP, L2CAP_LM, &lm, (socklen_t *)&len) < 0) {
-            qCWarning(QT_BT_BLUEZ) << "Failed to get security flags" << strerror(errno);
+            qCWarning(QT_BT_BLUEZ) << "Failed to get security flags" << qt_error_string(errno);
             return QBluetooth::NoSecurity;
         }
 
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index 2b1eee9e..24879d11 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -166,7 +166,7 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address,
         connecting = true;
         q->setSocketState(QBluetoothSocket::ConnectingState);
     } else {
-        errorString = QString::fromLocal8Bit(strerror(errno));
+        errorString = qt_error_string(errno);
         q->setSocketError(QBluetoothSocket::UnknownSocketError);
     }
 }
@@ -179,7 +179,7 @@ void QBluetoothSocketPrivate::_q_writeNotify()
         len = sizeof(errorno);
         ::getsockopt(socket, SOL_SOCKET, SO_ERROR, &errorno, (socklen_t*)&len);
         if(errorno) {
-            errorString = QString::fromLocal8Bit(strerror(errorno));
+            errorString = qt_error_string(errorno);
             q->setSocketError(QBluetoothSocket::UnknownSocketError);
             return;
         }
@@ -230,7 +230,7 @@ void QBluetoothSocketPrivate::_q_readNotify()
         int errsv = errno;
         readNotifier->setEnabled(false);
         connectWriteNotifier->setEnabled(false);
-        errorString = QString::fromLocal8Bit(strerror(errsv));
+        errorString = qt_error_string(errsv);
         qCWarning(QT_BT_BLUEZ) << Q_FUNC_INFO << socket << "error:" << readFromDevice << errorString;
         if(errsv == EHOSTDOWN)
             q->setSocketError(QBluetoothSocket::HostNotFoundError);
diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp
index 90f90178..fc609919 100644
--- a/src/bluetooth/qbluetoothsocket_qnx.cpp
+++ b/src/bluetooth/qbluetoothsocket_qnx.cpp
@@ -145,7 +145,7 @@ void QBluetoothSocketPrivate::_q_readNotify()
         readNotifier->setEnabled(false);
         connectWriteNotifier->setEnabled(false);
         qCWarning(QT_BT_QNX) << Q_FUNC_INFO << socket << " error:" << readFromDevice << errorString; //TODO Try if this actually works
-        errorString = QString::fromLocal8Bit(strerror(errsv));
+        errorString = qt_error_string(errsv);
         q->setSocketError(QBluetoothSocket::UnknownSocketError);
 
         q->disconnectFromService();
@@ -325,7 +325,7 @@ void QBluetoothSocketPrivate::controlReply(ppsResult result)
             qCDebug(QT_BT_QNX) << "Mount point path is:" << path;
             socket = ::open(path.toStdString().c_str(), O_RDWR);
             if (socket == -1) {
-                errorString = QString::fromLocal8Bit(strerror(errno));
+                errorString = qt_error_string(errno);
                 q->setSocketError(QBluetoothSocket::UnknownSocketError);
                 qCWarning(QT_BT_QNX) << Q_FUNC_INFO << socket << " error:" << errno << errorString; //TODO Try if this actually works