1 files changed, 26 insertions, 27 deletions

diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index d1df26d9f1..d9b39a7752 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -61,10 +61,9 @@
 QT_BEGIN_NAMESPACE
 
 QLocalSocketPrivate::QLocalSocketPrivate() : QIODevicePrivate(),
-        delayConnect(0),
-        connectTimer(0),
+        delayConnect(nullptr),
+        connectTimer(nullptr),
         connectingSocket(-1),
-        connectingOpenMode(0),
         state(QLocalSocket::UnconnectedState)
 {
 }
@@ -82,8 +81,8 @@ void QLocalSocketPrivate::init()
     q->connect(&unixSocket, SIGNAL(disconnected()), q, SIGNAL(disconnected()));
     q->connect(&unixSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
                q, SLOT(_q_stateChanged(QAbstractSocket::SocketState)));
-    q->connect(&unixSocket, SIGNAL(error(QAbstractSocket::SocketError)),
-               q, SLOT(_q_error(QAbstractSocket::SocketError)));
+    q->connect(&unixSocket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
+               q, SLOT(_q_errorOccurred(QAbstractSocket::SocketError)));
     q->connect(&unixSocket, SIGNAL(readChannelFinished()), q, SIGNAL(readChannelFinished()));
     unixSocket.setParent(q);
 }
@@ -93,14 +92,14 @@ qint64 QLocalSocketPrivate::skip(qint64 maxSize)
     return unixSocket.skip(maxSize);
 }
 
-void QLocalSocketPrivate::_q_error(QAbstractSocket::SocketError socketError)
+void QLocalSocketPrivate::_q_errorOccurred(QAbstractSocket::SocketError socketError)
 {
     Q_Q(QLocalSocket);
     QString function = QLatin1String("QLocalSocket");
     QLocalSocket::LocalSocketError error = (QLocalSocket::LocalSocketError)socketError;
     QString errorString = generateErrorString(error, function);
     q->setErrorString(errorString);
-    emit q->error(error);
+    emit q->errorOccurred(error);
 }
 
 void QLocalSocketPrivate::_q_stateChanged(QAbstractSocket::SocketState newState)
@@ -173,7 +172,7 @@ QString QLocalSocketPrivate::generateErrorString(QLocalSocket::LocalSocketError
     return errorString;
 }
 
-void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, const QString &function)
+void QLocalSocketPrivate::setErrorAndEmit(QLocalSocket::LocalSocketError error, const QString &function)
 {
     Q_Q(QLocalSocket);
     switch (error) {
@@ -211,7 +210,7 @@ void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, co
 
     QString errorString = generateErrorString(error, function);
     q->setErrorString(errorString);
-    emit q->error(error);
+    emit q->errorOccurred(error);
 
     // errors cause a disconnect
     unixSocket.setSocketState(QAbstractSocket::UnconnectedState);
@@ -228,7 +227,7 @@ void QLocalSocket::connectToServer(OpenMode openMode)
     if (state() == ConnectedState || state() == ConnectingState) {
         QString errorString = d->generateErrorString(QLocalSocket::OperationError, QLatin1String("QLocalSocket::connectToserver"));
         setErrorString(errorString);
-        emit error(QLocalSocket::OperationError);
+        emit errorOccurred(QLocalSocket::OperationError);
         return;
     }
 
@@ -238,15 +237,15 @@ void QLocalSocket::connectToServer(OpenMode openMode)
     emit stateChanged(d->state);
 
     if (d->serverName.isEmpty()) {
-        d->errorOccurred(ServerNotFoundError,
-                QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(ServerNotFoundError,
+                           QLatin1String("QLocalSocket::connectToServer"));
         return;
     }
 
     // create the socket
     if (-1 == (d->connectingSocket = qt_safe_socket(PF_UNIX, SOCK_STREAM, 0, O_NONBLOCK))) {
-        d->errorOccurred(UnsupportedSocketOperationError,
-                        QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(UnsupportedSocketOperationError,
+                           QLatin1String("QLocalSocket::connectToServer"));
         return;
     }
 
@@ -282,7 +281,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
     name.sun_family = PF_UNIX;
     if (sizeof(name.sun_path) < (uint)encodedConnectingPathName.size() + 1) {
         QString function = QLatin1String("QLocalSocket::connectToServer");
-        errorOccurred(QLocalSocket::ServerNotFoundError, function);
+        setErrorAndEmit(QLocalSocket::ServerNotFoundError, function);
         return;
     }
     ::memcpy(name.sun_path, encodedConnectingPathName.constData(),
@@ -293,17 +292,17 @@ void QLocalSocketPrivate::_q_connectToSocket()
         {
         case EINVAL:
         case ECONNREFUSED:
-            errorOccurred(QLocalSocket::ConnectionRefusedError, function);
+            setErrorAndEmit(QLocalSocket::ConnectionRefusedError, function);
             break;
         case ENOENT:
-            errorOccurred(QLocalSocket::ServerNotFoundError, function);
+            setErrorAndEmit(QLocalSocket::ServerNotFoundError, function);
             break;
         case EACCES:
         case EPERM:
-            errorOccurred(QLocalSocket::SocketAccessError, function);
+            setErrorAndEmit(QLocalSocket::SocketAccessError, function);
             break;
         case ETIMEDOUT:
-            errorOccurred(QLocalSocket::SocketTimeoutError, function);
+            setErrorAndEmit(QLocalSocket::SocketTimeoutError, function);
             break;
         case EAGAIN:
             // Try again later, all of the sockets listening are full
@@ -321,7 +320,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
             delayConnect->setEnabled(true);
             break;
         default:
-            errorOccurred(QLocalSocket::UnknownSocketError, function);
+            setErrorAndEmit(QLocalSocket::UnknownSocketError, function);
         }
         return;
     }
@@ -337,11 +336,11 @@ void QLocalSocketPrivate::_q_connectToSocket()
         q->emit connected();
     } else {
         QString function = QLatin1String("QLocalSocket::connectToServer");
-        errorOccurred(QLocalSocket::UnknownSocketError, function);
+        setErrorAndEmit(QLocalSocket::UnknownSocketError, function);
     }
     connectingSocket = -1;
     connectingName.clear();
-    connectingOpenMode = 0;
+    connectingOpenMode = { };
 }
 
 bool QLocalSocket::setSocketDescriptor(qintptr socketDescriptor,
@@ -380,10 +379,10 @@ void QLocalSocketPrivate::cancelDelayedConnect()
     if (delayConnect) {
         delayConnect->setEnabled(false);
         delete delayConnect;
-        delayConnect = 0;
+        delayConnect = nullptr;
         connectTimer->stop();
         delete connectTimer;
-        connectTimer = 0;
+        connectTimer = nullptr;
     }
 }
 
@@ -438,7 +437,7 @@ void QLocalSocket::close()
         ::close(d->connectingSocket);
     d->connectingSocket = -1;
     d->connectingName.clear();
-    d->connectingOpenMode = 0;
+    d->connectingOpenMode = { };
     d->serverName.clear();
     d->fullServerName.clear();
     QIODevice::close();
@@ -530,8 +529,8 @@ bool QLocalSocket::waitForConnected(int msec)
         const int result = qt_poll_msecs(&pfd, 1, timeout);
 
         if (result == -1)
-            d->errorOccurred(QLocalSocket::UnknownSocketError,
-                             QLatin1String("QLocalSocket::waitForConnected"));
+            d->setErrorAndEmit(QLocalSocket::UnknownSocketError,
+                               QLatin1String("QLocalSocket::waitForConnected"));
         else if (result > 0)
             d->_q_connectToSocket();
     } while (state() == ConnectingState && !timer.hasExpired(msec));