diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-06-30 17:43:46 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-07-01 12:06:21 +0000 |
| commit | ad8b9773a2f996e988d7b0c4dd439a3e21ca8c09 (patch) | |
| tree | d69d4d7fb36ecdd8e3b5096f171642b4e35a0124 /src/serialport/qserialport.cpp | |
| parent | 96365c1edc5282b6ec7332f79f2f698ce5f6b6be (diff) | |
| download | qtserialport-ad8b9773a2f996e988d7b0c4dd439a3e21ca8c09.tar.gz | |
Get rid of QSPP::bytesToWrite()
It is not worth to spread the platform-specifics over multiple
files, as the difference are actually tiny and much better
expressed with an ifdef.
Change-Id: I5279e05d52ce5243ad3d0655c6353e1fb18891a1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/serialport/qserialport.cpp')
| -rw-r--r-- | src/serialport/qserialport.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index b252152..1aea7ca 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -1211,7 +1211,13 @@ qint64 QSerialPort::bytesAvailable() const qint64 QSerialPort::bytesToWrite() const { Q_D(const QSerialPort); - return d->bytesToWrite() + QIODevice::bytesToWrite(); + qint64 bytes = QIODevice::bytesToWrite(); +#ifdef Q_OS_WIN32 + bytes += d->actualBytesToWrite; +#else + bytes += d->writeBuffer.size(); +#endif + return bytes; } /*! |