diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/serialport/qserialport.cpp | 9 | ||||
| -rw-r--r-- | src/serialport/qserialport.h | 24 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 4 | ||||
| -rw-r--r-- | src/serialport/qwinoverlappedionotifier.cpp | 6 |
5 files changed, 24 insertions, 21 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0338efe0..dc68d388 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.10.1 +MODULE_VERSION = 5.11.0 diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 3b887366..a53212ff 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -1396,10 +1396,13 @@ bool QSerialPort::isBreakEnabled() const /*! \reimp + + \omit + This function does not really read anything, as we use QIODevicePrivate's + buffer. The buffer will be read inside of QIODevice before this + method will be called. + \endomit */ -// This function does not really read anything, as we use QIODevicePrivate's -// buffer. The buffer will be read inside of QIODevice before this -// method will be called. qint64 QSerialPort::readData(char *data, qint64 maxSize) { Q_UNUSED(data); diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index e4a61eda..655297c8 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -210,8 +210,8 @@ public: void setPort(const QSerialPortInfo &info); - bool open(OpenMode mode) Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; + bool open(OpenMode mode) override; + void close() override; #if QT_DEPRECATED_SINCE(5, 3) QT_DEPRECATED void setSettingsRestoredOnClose(bool restore); @@ -243,7 +243,7 @@ public: bool flush(); bool clear(Directions directions = AllDirections); - bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove me + bool atEnd() const override; // ### Qt6: remove me #if QT_DEPRECATED_SINCE(5, 2) QT_DEPRECATED bool setDataErrorPolicy(DataErrorPolicy policy = IgnorePolicy); @@ -256,14 +256,14 @@ public: qint64 readBufferSize() const; void setReadBufferSize(qint64 size); - bool isSequential() const Q_DECL_OVERRIDE; + bool isSequential() const override; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; + qint64 bytesToWrite() const override; + bool canReadLine() const override; - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; + bool waitForBytesWritten(int msecs = 30000) override; #if QT_DEPRECATED_SINCE(5, 5) QT_DEPRECATED bool sendBreak(int duration = 0); @@ -294,9 +294,9 @@ Q_SIGNALS: void breakEnabledChanged(bool set); protected: - qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - qint64 readLineData(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxSize) override; + qint64 readLineData(char *data, qint64 maxSize) override; + qint64 writeData(const char *data, qint64 maxSize) override; private: // ### Qt6: remove me. diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 05db3171..a13a2890 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -156,7 +156,7 @@ public: } protected: - bool event(QEvent *e) Q_DECL_OVERRIDE + bool event(QEvent *e) override { if (e->type() == QEvent::SockAct) { dptr->readNotification(); @@ -179,7 +179,7 @@ public: } protected: - bool event(QEvent *e) Q_DECL_OVERRIDE + bool event(QEvent *e) override { if (e->type() == QEvent::SockAct) { dptr->completeAsyncWrite(); diff --git a/src/serialport/qwinoverlappedionotifier.cpp b/src/serialport/qwinoverlappedionotifier.cpp index dfae3b00..615dacc9 100644 --- a/src/serialport/qwinoverlappedionotifier.cpp +++ b/src/serialport/qwinoverlappedionotifier.cpp @@ -384,9 +384,9 @@ bool QWinOverlappedIoNotifier::waitForNotified(QDeadlineTimer deadline, OVERLAPP return false; } -/*! - * Note: This function runs in the I/O completion port thread. - */ +/* + * Note: This function runs in the I/O completion port thread. + */ void QWinOverlappedIoNotifierPrivate::notify(DWORD numberOfBytes, DWORD errorCode, OVERLAPPED *overlapped) { |