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_wince.cpp | |
| parent | 96b9590dbeb20e000d9d9308bee2162b1101a7e0 (diff) | |
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_wince.cpp')
| -rw-r--r-- | src/serialport/qserialport_wince.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index 7ff89382..b1975af1 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) { |