summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2016-05-21 14:02:02 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2016-06-03 05:46:53 +0000
commitb345036a0e633a3c211ba396f03b93a6ed90f0ff (patch)
tree1e6b82bfc7bb19750210c11af3afe2cc3fb3686d
parent0a6313018cbd4c78b1e959236bd96c62d5d59c1c (diff)
downloadqtserialport-b345036a0e633a3c211ba396f03b93a6ed90f0ff.tar.gz
Add some missed 'const' and 'Q_NULLPTR' keywords
Change-Id: Iaf06a0b3a8304ad44519f8d2187665c9f0d02aba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--src/serialport/qserialport_win.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index 412e20c..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;
@@ -291,7 +291,7 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs)
stopWatch.start();
for (;;) {
- OVERLAPPED *overlapped = waitForNotified(
+ 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;
}