1 files changed, 11 insertions, 11 deletions
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index 0c447e90a4..af0dc988af 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -13,16 +13,17 @@
 #include <errno.h>
 
 #include <qdir.h>
+#include <qdeadlinetimer.h>
 #include <qdebug.h>
-#include <qelapsedtimer.h>
 #include <qstringconverter.h>
 
 #ifdef Q_OS_VXWORKS
 #  include <selectLib.h>
 #endif
 
-#define QT_CONNECT_TIMEOUT 30000
+using namespace std::chrono_literals;
 
+#define QT_CONNECT_TIMEOUT 30000
 
 QT_BEGIN_NAMESPACE
 
@@ -401,8 +402,8 @@ bool QLocalSocketPrivate::parseSockaddr(const struct ::sockaddr_un &addr,
     if (!name.isEmpty() && !toUtf16.hasError()) {
         //conversion encodes the trailing zeros. So, in case of non-abstract namespace we
         //chop them off as \0 character is not allowed in filenames
-        if (!abstractNamespace && (name.at(name.length() - 1) == QChar::fromLatin1('\0'))) {
-            int truncPos = name.length() - 1;
+        if (!abstractNamespace && (name.at(name.size() - 1) == QChar::fromLatin1('\0'))) {
+            int truncPos = name.size() - 1;
             while (truncPos > 0 && name.at(truncPos - 1) == QChar::fromLatin1('\0'))
                 truncPos--;
             name.truncate(truncPos);
@@ -585,21 +586,20 @@ bool QLocalSocket::waitForConnected(int msec)
     if (state() != ConnectingState)
         return (state() == ConnectedState);
 
-    QElapsedTimer timer;
-    timer.start();
-
     pollfd pfd = qt_make_pollfd(d->connectingSocket, POLLIN);
 
-    do {
-        const int timeout = (msec > 0) ? qMax(msec - timer.elapsed(), Q_INT64_C(0)) : msec;
-        const int result = qt_poll_msecs(&pfd, 1, timeout);
+    QDeadlineTimer deadline{msec};
+    auto remainingTime = deadline.remainingTimeAsDuration();
 
+    do {
+        const int result = qt_safe_poll(&pfd, 1, deadline);
         if (result == -1)
             d->setErrorAndEmit(QLocalSocket::UnknownSocketError,
                                "QLocalSocket::waitForConnected"_L1);
         else if (result > 0)
             d->_q_connectToSocket();
-    } while (state() == ConnectingState && !timer.hasExpired(msec));
+    } while (state() == ConnectingState
+             && (remainingTime = deadline.remainingTimeAsDuration()) > 0ns);
 
     return (state() == ConnectedState);
 }