summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2021-01-26 12:46:05 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2021-01-29 12:02:15 +0000
commit862366f6ec7d35078f22e849c266bffeab1bc9c2 (patch)
tree74d311f19ab4bd51073bac1227c74b7801771558 /src
parent36c0c8d92adffbaecb3c195e1a40eff67857e19e (diff)
Qt6: remove overridden atEnd() method
Task-number: QTBUG-89880 Change-Id: I0f71a210f4807f391b4dd7a303c229bddb141b80 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/serialport/qserialport.cpp27
-rw-r--r--src/serialport/qserialport.h1
2 files changed, 0 insertions, 28 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index 7f10d404..75aded42 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -955,33 +955,6 @@ bool QSerialPort::clear(Directions directions)
}
/*!
- \reimp
-
- Returns \c true if no more data is currently available for reading; otherwise
- returns \c false.
-
- This function is most commonly used when reading data from the
- serial port in a loop. For example:
-
- \code
- // This slot is connected to QSerialPort::readyRead()
- void QSerialPortClass::readyReadSlot()
- {
- while (!port.atEnd()) {
- QByteArray data = port.read(100);
- ....
- }
- }
- \endcode
-
- \sa bytesAvailable(), readyRead()
- */
-bool QSerialPort::atEnd() const
-{
- return QIODevice::atEnd();
-}
-
-/*!
\property QSerialPort::error
\brief the error status of the serial port
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h
index 99890bf8..cf126ddf 100644
--- a/src/serialport/qserialport.h
+++ b/src/serialport/qserialport.h
@@ -191,7 +191,6 @@ public:
bool flush();
bool clear(Directions directions = AllDirections);
- bool atEnd() const override; // ### Qt6: remove me
SerialPortError error() const;
void clearError();