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>

5 files changed, 7 insertions, 17 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;
 }
 
 /*!
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h
index 9d634b1..a39bc22 100644
--- a/src/serialport/qserialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -146,7 +146,6 @@ public:
 
     QSerialPort::SerialPortError decodeSystemError(int systemErrorCode = -1) const;
 
-    qint64 bytesToWrite() const;
     qint64 writeData(const char *data, qint64 maxSize);
 
     static QString portNameToSystemLocation(const QString &port);
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 14180ec..65c45d5 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -841,11 +841,6 @@ inline bool QSerialPortPrivate::initialize(QIODevice::OpenMode mode)
     return true;
 }
 
-qint64 QSerialPortPrivate::bytesToWrite() const
-{
-    return writeBuffer.size();
-}
-
 qint64 QSerialPortPrivate::writeData(const char *data, qint64 maxSize)
 {
     ::memcpy(writeBuffer.reserve(maxSize), data, maxSize);
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index 5f4da9d..b01d2d0 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -594,11 +594,6 @@ void QSerialPortPrivate::emitReadyRead()
     emit q->readyRead();
 }
 
-qint64 QSerialPortPrivate::bytesToWrite() const
-{
-    return actualBytesToWrite;
-}
-
 qint64 QSerialPortPrivate::writeData(const char *data, qint64 maxSize)
 {
     Q_Q(QSerialPort);
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp
index 86cbcb0..25a1f07 100644
--- a/src/serialport/qserialport_wince.cpp
+++ b/src/serialport/qserialport_wince.cpp
@@ -559,11 +559,6 @@ bool QSerialPortPrivate::notifyWrite()
     return true;
 }
 
-qint64 QSerialPortPrivate::bytesToWrite() const
-{
-    return writeBuffer.size();
-}
-
 qint64 QSerialPortPrivate::writeData(const char *data, qint64 maxSize)
 {
     ::memcpy(writeBuffer.reserve(maxSize), data, maxSize);