diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-10-08 22:08:35 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-10-10 11:50:18 +0000 |
commit | ba8748b77a55ee7102c728995c4194a2915863d6 (patch) | |
tree | 8b86f2b659182077e1a72b402599e70e856630c4 /src/serialport/qserialport_unix.cpp | |
parent | 96b9590dbeb20e000d9d9308bee2162b1101a7e0 (diff) | |
download | qtserialport-ba8748b77a55ee7102c728995c4194a2915863d6.tar.gz |
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>
Diffstat (limited to 'src/serialport/qserialport_unix.cpp')
-rw-r--r-- | src/serialport/qserialport_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |