diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2016-07-16 12:35:00 +0300 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2016-07-19 08:47:51 +0000 |
| commit | a7a1c6042c547c484b8443f94076f4f1a5d7f7ae (patch) | |
| tree | a812c7feed63ed258968fbe127aa7ce47f4c4ad7 | |
| parent | 69b6a9a19a37b990e43e0f9660b9ef687b5dafb3 (diff) | |
| download | qtserialport-a7a1c6042c547c484b8443f94076f4f1a5d7f7ae.tar.gz | |
Reuse QIODevice's write buffer
Change-Id: Ieda6cd8452391a1fd3276a35c9854cf764dbb679
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | src/serialport/qserialport.cpp | 7 | ||||
| -rw-r--r-- | src/serialport/qserialport_p.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 45f56c8..21727a0 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -88,7 +88,6 @@ QSerialPortErrorInfo::QSerialPortErrorInfo(QSerialPort::SerialPortError newError QSerialPortPrivate::QSerialPortPrivate() : readBufferMaxSize(0) - , writeBuffer(InitialBufferSize) , error(QSerialPort::NoError) , inputBaudRate(9600) , outputBaudRate(9600) @@ -124,6 +123,7 @@ QSerialPortPrivate::QSerialPortPrivate() , writeSequenceStarted(false) #endif { + writeBufferChunkSize = InitialBufferSize; } void QSerialPortPrivate::setError(const QSerialPortErrorInfo &errorInfo) @@ -1261,12 +1261,9 @@ qint64 QSerialPort::bytesAvailable() const */ qint64 QSerialPort::bytesToWrite() const { - Q_D(const QSerialPort); qint64 bytes = QIODevice::bytesToWrite(); #ifdef Q_OS_WIN32 - bytes += d->actualBytesToWrite; -#else - bytes += d->writeBuffer.size(); + bytes += d_func()->actualBytesToWrite; #endif return bytes; } diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index cb300ad..923d524 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -55,7 +55,6 @@ #include "qserialport.h" -#include <private/qringbuffer_p.h> #include <private/qiodevice_p.h> #if defined(Q_OS_WIN32) @@ -169,7 +168,6 @@ public: static QList<qint32> standardBaudRates(); qint64 readBufferMaxSize; - QRingBuffer writeBuffer; QSerialPort::SerialPortError error; QString systemLocation; qint32 inputBaudRate; |