summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-03-11 23:12:40 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-03-12 08:38:43 +0000
commitae7cd02d1c5b9d3f659a3a2430f47c8fa41672b7 (patch)
treeef2d5d560dcca76f1088ea0458b578fcd2d7cdbe
parent53afe73154c7c00b54cd280fa3d6c9127a2bc84b (diff)
downloadqtserialport-ae7cd02d1c5b9d3f659a3a2430f47c8fa41672b7.tar.gz
Get rid of C-style's SERIALPORT_BUFFERSIZE macro
It is reasonable make it as enum and part of QSP class. Change-Id: I13d4561568b2688f7d1a054073455c23a64c1b94 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--src/serialport/qserialport.cpp2
-rw-r--r--src/serialport/qserialport_p.h7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index cb87689..99ad993 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
QSerialPortPrivate::QSerialPortPrivate()
: readBufferMaxSize(0)
- , writeBuffer(SERIALPORT_BUFFERSIZE)
+ , writeBuffer(InitialBufferSize)
, error(QSerialPort::NoError)
, inputBaudRate(9600)
, outputBaudRate(9600)
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h
index 3da5b59..60f9ee1 100644
--- a/src/serialport/qserialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -97,10 +97,6 @@ struct serial_struct {
QT_BEGIN_NAMESPACE
-#ifndef SERIALPORT_BUFFERSIZE
-# define SERIALPORT_BUFFERSIZE 16384
-#endif
-
class QThread;
class QWinOverlappedIoNotifier;
class QTimer;
@@ -115,7 +111,8 @@ class QSerialPortPrivate : public QIODevicePrivate
Q_DECLARE_PUBLIC(QSerialPort)
public:
enum IoConstants {
- ReadChunkSize = 512
+ ReadChunkSize = 512,
+ InitialBufferSize = 16384
};
QSerialPortPrivate();