diff options
author | Laszlo Papp <lpapp@kde.org> | 2013-10-29 21:17:37 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 09:34:40 +0100 |
commit | 51fe3f4b3b1021f79bdea9f5d0d8735cbb68d9a1 (patch) | |
tree | 24887a7a224c53e268056799297d7df4e684dacb | |
parent | e300556a9c8795d98311e5d716262ab85caa4c93 (diff) | |
download | qtserialport-51fe3f4b3b1021f79bdea9f5d0d8735cbb68d9a1.tar.gz |
Make the return value void for methods that would always return true
Change-Id: Iaa869b8b618db630d46726d7ebeac83e8a826af3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
-rw-r--r-- | src/serialport/qserialport_unix.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialport_unix_p.h | 2 | ||||
-rw-r--r-- | src/serialport/qserialport_win.cpp | 28 | ||||
-rw-r--r-- | src/serialport/qserialport_win_p.h | 6 |
4 files changed, 17 insertions, 23 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 0bab22d..6799814 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -808,14 +808,12 @@ bool QSerialPortPrivate::writeNotification(int maxSize) return (writeBuffer.size() < tmp); } -bool QSerialPortPrivate::exceptionNotification() +void QSerialPortPrivate::exceptionNotification() { Q_Q(QSerialPort); QSerialPort::SerialPortError error = decodeSystemError(); q->setError(error); - - return true; } bool QSerialPortPrivate::updateTermios() diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h index 83f89e3..2d09ee4 100644 --- a/src/serialport/qserialport_unix_p.h +++ b/src/serialport/qserialport_unix_p.h @@ -121,7 +121,7 @@ public: bool readNotification(); bool writeNotification(int maxSize = INT_MAX); - bool exceptionNotification(); + void exceptionNotification(); static QString portNameToSystemLocation(const QString &port); static QString portNameFromSystemLocation(const QString &location); diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index cc731d0..79a5190 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -182,10 +182,10 @@ public: bool processCompletionRoutine() Q_DECL_OVERRIDE { DWORD numberOfBytesTransferred = 0; ::GetOverlappedResult(dptr->descriptor, &o, &numberOfBytesTransferred, FALSE); - bool ret = dptr->completeAsyncRead(numberOfBytesTransferred); + dptr->completeAsyncRead(numberOfBytesTransferred); // start async read for possible remainder into driver queue - if (ret && (numberOfBytesTransferred > 0) && (dptr->policy == QSerialPort::IgnorePolicy)) { + if ((numberOfBytesTransferred > 0) && (dptr->policy == QSerialPort::IgnorePolicy)) { dptr->startAsyncRead(); } else { // driver queue is emplty, so startup wait comm event CommOverlappedEventNotifier *n = @@ -194,7 +194,7 @@ public: n->startWaitCommEvent(); } - return ret; + return true; } }; @@ -209,7 +209,8 @@ public: setEnabled(false); DWORD numberOfBytesTransferred = 0; ::GetOverlappedResult(dptr->descriptor, &o, &numberOfBytesTransferred, FALSE); - return dptr->completeAsyncWrite(numberOfBytesTransferred); + dptr->completeAsyncWrite(numberOfBytesTransferred); + return true; } }; @@ -727,18 +728,17 @@ bool QSerialPortPrivate::startAsyncWrite(int maxSize) #endif // #ifndef Q_OS_WINCE -bool QSerialPortPrivate::processIoErrors(bool error) +void QSerialPortPrivate::processIoErrors(bool error) { Q_Q(QSerialPort); if (error) { q->setError(QSerialPort::ResourceError); - return true; + return; } DWORD errors = 0; - const bool ret = ::ClearCommError(descriptor, &errors, NULL); - if (ret && errors) { + if (::ClearCommError(descriptor, &errors, NULL) && errors) { if (errors & CE_FRAME) { q->setError(QSerialPort::FramingError); } else if (errors & CE_RXPARITY) { @@ -750,12 +750,11 @@ bool QSerialPortPrivate::processIoErrors(bool error) q->setError(QSerialPort::UnknownError); } } - return ret; } #ifndef Q_OS_WINCE -bool QSerialPortPrivate::completeAsyncRead(DWORD numberOfBytes) +void QSerialPortPrivate::completeAsyncRead(DWORD numberOfBytes) { Q_Q(QSerialPort); @@ -773,14 +772,14 @@ bool QSerialPortPrivate::completeAsyncRead(DWORD numberOfBytes) if (policy == QSerialPort::SkipPolicy) { readBuffer.getChar(); // Force returning without emitting a readyRead() signal - return true; + return; } // Abort receiving if (policy == QSerialPort::StopReceivingPolicy) { readyReadEmitted = true; emit q->readyRead(); - return true; + return; } // Replace received character by zero @@ -794,10 +793,9 @@ bool QSerialPortPrivate::completeAsyncRead(DWORD numberOfBytes) readyReadEmitted = true; emit q->readyRead(); } - return true; } -bool QSerialPortPrivate::completeAsyncWrite(DWORD numberOfBytes) +void QSerialPortPrivate::completeAsyncWrite(DWORD numberOfBytes) { Q_Q(QSerialPort); @@ -812,8 +810,6 @@ bool QSerialPortPrivate::completeAsyncWrite(DWORD numberOfBytes) writeSequenceStarted = false; else startAsyncWrite(WriteChunkSize); - - return true; } AbstractOverlappedEventNotifier *QSerialPortPrivate::lookupFreeWriteCompletionNotifier() diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h index 24e7289..c82fff9 100644 --- a/src/serialport/qserialport_win_p.h +++ b/src/serialport/qserialport_win_p.h @@ -100,12 +100,12 @@ public: bool setFlowControl(QSerialPort::FlowControl flowControl); bool setDataErrorPolicy(QSerialPort::DataErrorPolicy policy); - bool processIoErrors(bool error); + void processIoErrors(bool error); #ifndef Q_OS_WINCE bool startAsyncRead(); bool startAsyncWrite(int maxSize = INT_MAX); - bool completeAsyncRead(DWORD numberOfBytes); - bool completeAsyncWrite(DWORD numberOfBytes); + void completeAsyncRead(DWORD numberOfBytes); + void completeAsyncWrite(DWORD numberOfBytes); AbstractOverlappedEventNotifier *lookupFreeWriteCompletionNotifier(); AbstractOverlappedEventNotifier *lookupCommEventNotifier(); AbstractOverlappedEventNotifier *lookupReadCompletionNotifier(); |