Use qt_subtract_from_timeout() to reduce a code duplication

Commit qtbase/ed0c0070f9b05c647019270dfc42073d071c830a
introduces a new helper function qt_subtract_from_timeout()
which can be used to reduce a code duplication.

Change-Id: I5c4941360f524225c14eac8c308fb16a546c802f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

5 files changed, 10 insertions, 18 deletions

diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index 369be62..6832883 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -123,14 +123,6 @@ QSerialPortPrivate::QSerialPortPrivate()
 {
 }
 
-int QSerialPortPrivate::timeoutValue(int msecs, int elapsed)
-{
-    if (msecs == -1)
-        return msecs;
-    msecs -= elapsed;
-    return qMax(msecs, 0);
-}
-
 void QSerialPortPrivate::setError(const QSerialPortErrorInfo &errorInfo)
 {
     Q_Q(QSerialPort);
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h
index be68e01..4d37254 100644
--- a/src/serialport/qserialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -126,8 +126,6 @@ public:
 
     QSerialPortPrivate();
 
-    static int timeoutValue(int msecs, int elapsed);
-
     bool open(QIODevice::OpenMode mode);
     void close();
 
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 244bc45..4a558be 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -389,7 +389,7 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs)
         bool readyToRead = false;
         bool readyToWrite = false;
         if (!waitForReadOrWrite(&readyToRead, &readyToWrite, true, !writeBuffer.isEmpty(),
-                                timeoutValue(msecs, stopWatch.elapsed()))) {
+                                qt_subtract_from_timeout(msecs, stopWatch.elapsed()))) {
             return false;
         }
 
@@ -398,7 +398,7 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs)
 
         if (readyToWrite && !completeAsyncWrite())
             return false;
-    } while (msecs == -1 || timeoutValue(msecs, stopWatch.elapsed()) > 0);
+    } while (msecs == -1 || qt_subtract_from_timeout(msecs, stopWatch.elapsed()) > 0);
     return false;
 }
 
@@ -414,7 +414,7 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs)
         bool readyToRead = false;
         bool readyToWrite = false;
         if (!waitForReadOrWrite(&readyToRead, &readyToWrite, true, !writeBuffer.isEmpty(),
-                                timeoutValue(msecs, stopWatch.elapsed()))) {
+                                qt_subtract_from_timeout(msecs, stopWatch.elapsed()))) {
             return false;
         }
 
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index 805dd3d..8e7c278 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -260,7 +260,8 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs)
     stopWatch.start();
 
     do {
-        OVERLAPPED *overlapped = waitForNotified(timeoutValue(msecs, stopWatch.elapsed()));
+        OVERLAPPED *overlapped = waitForNotified(
+                    qt_subtract_from_timeout(msecs, stopWatch.elapsed()));
         if (!overlapped)
             return false;
 
@@ -276,7 +277,7 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs)
             }
         }
 
-    } while (msecs == -1 || timeoutValue(msecs, stopWatch.elapsed()) > 0);
+    } while (msecs == -1 || qt_subtract_from_timeout(msecs, stopWatch.elapsed()) > 0);
 
     return false;
 }
@@ -293,7 +294,8 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs)
     stopWatch.start();
 
     forever {
-        OVERLAPPED *overlapped = waitForNotified(timeoutValue(msecs, stopWatch.elapsed()));
+        OVERLAPPED *overlapped = waitForNotified(
+                    qt_subtract_from_timeout(msecs, stopWatch.elapsed()));
         if (!overlapped)
             return false;
 
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp
index 7ff8938..b1975af 100644
--- a/src/serialport/qserialport_wince.cpp
+++ b/src/serialport/qserialport_wince.cpp
@@ -329,7 +329,7 @@ bool QSerialPortPrivate::waitForReadyRead(int msec)
         bool readyToWrite = false;
         if (!waitForReadOrWrite(&readyToRead, &readyToWrite,
                                 true, !writeBuffer.isEmpty(),
-                                timeoutValue(msec, stopWatch.elapsed()))) {
+                                qt_subtract_from_timeout(msec, stopWatch.elapsed()))) {
             return false;
         }
         if (readyToRead) {
@@ -355,7 +355,7 @@ bool QSerialPortPrivate::waitForBytesWritten(int msec)
         bool readyToWrite = false;
         if (!waitForReadOrWrite(&readyToRead, &readyToWrite,
                                 true, !writeBuffer.isEmpty(),
-                                timeoutValue(msec, stopWatch.elapsed()))) {
+                                qt_subtract_from_timeout(msec, stopWatch.elapsed()))) {
             return false;
         }
         if (readyToRead) {