summaryrefslogtreecommitdiff
path: root/src/serialport/qserialport_unix.cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-05-12 17:31:08 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-06-30 11:46:09 +0000
commit96365c1edc5282b6ec7332f79f2f698ce5f6b6be (patch)
treebb3327df134aae7e8cf476eaf963532d92d17cf3 /src/serialport/qserialport_unix.cpp
parentbc948f5f695908ad11a19b1336975d07ff1de0e1 (diff)
downloadqtserialport-96365c1edc5282b6ec7332f79f2f698ce5f6b6be.tar.gz
Get rid of QSPP::readData()
Because we now (in the Qt 5.5 branch) use QIODevicePrivate's internal read buffer directly, there is no need to call buffer.read() in QSP::readData(). There is also no point in keeping the platform-specific implementations of QSPP::readData(), so remove them. Tested on Windows using the virtual com0com serial ports, and on Linux usig the virtual tty0tty serial ports. Change-Id: I136c6d10708cc6fc99a77c351c3945470530845d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Diffstat (limited to 'src/serialport/qserialport_unix.cpp')
-rw-r--r--src/serialport/qserialport_unix.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 1f90a18..14180ec 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -372,11 +372,6 @@ bool QSerialPortPrivate::setBreakEnabled(bool set)
return true;
}
-qint64 QSerialPortPrivate::readData(char *data, qint64 maxSize)
-{
- return buffer.read(data, maxSize);
-}
-
bool QSerialPortPrivate::waitForReadyRead(int msecs)
{
QElapsedTimer stopWatch;