diff options
| author | Kevin Funk <kfunk@kde.org> | 2017-09-20 20:57:46 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-21 09:09:49 +0000 |
| commit | baa87d4c34059b790c93d210f07696de818e8d5e (patch) | |
| tree | c7ea7df466446be2c48995ee01ac2d87aa96a983 /src | |
| parent | 659c640824caefbf984f5067e4c5694122c78186 (diff) | |
Replace Q_DECL_OVERRIDE with override
Change-Id: Ia7491b477bac319a8e0ee1a3e20778c8078edb15
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialport/qserialport.h | 24 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 4 |
2 files changed, 14 insertions, 14 deletions
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 4941a86d..87d7e405 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -163,7 +163,7 @@ public: } protected: - bool event(QEvent *e) Q_DECL_OVERRIDE + bool event(QEvent *e) override { if (e->type() == QEvent::SockAct) { dptr->readNotification(); @@ -186,7 +186,7 @@ public: } protected: - bool event(QEvent *e) Q_DECL_OVERRIDE + bool event(QEvent *e) override { if (e->type() == QEvent::SockAct) { dptr->completeAsyncWrite(); |