diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-11 18:58:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-11 18:58:15 +0200 |
| commit | 5fbb69b1cad02d58d48e4753e6d246e68fcc6fab (patch) | |
| tree | f46679b33f3176abd15b71b0d83046a1a884fcb7 /src/serialport/qserialport_win.cpp | |
| parent | f6639e64a98ebdebdee903e4f6ec4fea032f63a7 (diff) | |
| parent | 63ac6874eeea037b4b8b1a450a938999fb4f31b8 (diff) | |
| download | qtserialport-5fbb69b1cad02d58d48e4753e6d246e68fcc6fab.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I49f290620c04e95a962d36901137f458c9ce9578
Diffstat (limited to 'src/serialport/qserialport_win.cpp')
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 5dccd39..b41af02 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -257,7 +257,7 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs) stopWatch.start(); do { - OVERLAPPED *overlapped = waitForNotified( + const OVERLAPPED *overlapped = waitForNotified( qt_subtract_from_timeout(msecs, stopWatch.elapsed())); if (!overlapped) return false; @@ -290,8 +290,8 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) QElapsedTimer stopWatch; stopWatch.start(); - forever { - OVERLAPPED *overlapped = waitForNotified( + for (;;) { + const OVERLAPPED *overlapped = waitForNotified( qt_subtract_from_timeout(msecs, stopWatch.elapsed())); if (!overlapped) return false; @@ -598,7 +598,7 @@ OVERLAPPED *QSerialPortPrivate::waitForNotified(int msecs) OVERLAPPED *overlapped = notifier->waitForAnyNotified(msecs); if (!overlapped) { setError(getSystemError(WAIT_TIMEOUT)); - return 0; + return Q_NULLPTR; } return overlapped; } |