diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-04-25 12:45:14 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-04-26 09:11:29 +0000 |
| commit | 13e971992160f7e0ff90af59bdc9eef1c17f53e5 (patch) | |
| tree | fadd7a60c556dcab906621516292855f3a10a6e7 | |
| parent | 053cd359549efb1366a94a5e8cb14e4ca157776e (diff) | |
Replace the Q_DECL_OVERRIDE macros with 'override'
Change-Id: I32f3712ed2c160e1dc26397d58114fa441c0fc9b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/coap/qcoapdiscoveryreply_p.h | 2 | ||||
| -rw-r--r-- | src/coap/qcoapinternalreply_p.h | 2 | ||||
| -rw-r--r-- | src/coap/qcoapinternalrequest_p.h | 4 | ||||
| -rw-r--r-- | src/coap/qcoapreply.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/coap/qcoapdiscoveryreply_p.h b/src/coap/qcoapdiscoveryreply_p.h index ccd5d72..5f4856e 100644 --- a/src/coap/qcoapdiscoveryreply_p.h +++ b/src/coap/qcoapdiscoveryreply_p.h @@ -54,7 +54,7 @@ class Q_AUTOTEST_EXPORT QCoapDiscoveryReplyPrivate : public QCoapReplyPrivate public: QCoapDiscoveryReplyPrivate(const QCoapRequest &request); - void _q_setContent(const QHostAddress &sender, const QCoapMessage &, QtCoap::ResponseCode) Q_DECL_OVERRIDE; + void _q_setContent(const QHostAddress &sender, const QCoapMessage &, QtCoap::ResponseCode) override; QVector<QCoapResource> resources; diff --git a/src/coap/qcoapinternalreply_p.h b/src/coap/qcoapinternalreply_p.h index cd24b87..8022769 100644 --- a/src/coap/qcoapinternalreply_p.h +++ b/src/coap/qcoapinternalreply_p.h @@ -64,7 +64,7 @@ public: int nextBlockToSend() const; using QCoapInternalMessage::addOption; - void addOption(const QCoapOption &option); + void addOption(const QCoapOption &option) override; void setSenderAddress(const QHostAddress &address); QtCoap::ResponseCode responseCode() const; diff --git a/src/coap/qcoapinternalrequest_p.h b/src/coap/qcoapinternalrequest_p.h index df22736..0f354b8 100644 --- a/src/coap/qcoapinternalrequest_p.h +++ b/src/coap/qcoapinternalrequest_p.h @@ -64,7 +64,7 @@ public: explicit QCoapInternalRequest(QObject *parent = nullptr); explicit QCoapInternalRequest(const QCoapRequest &request, QObject *parent = nullptr); - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; void initForAcknowledgment(quint16 messageId, const QByteArray &token); void initForReset(quint16 messageId); @@ -77,7 +77,7 @@ public: bool checkBlockNumber(uint blockNumber); using QCoapInternalMessage::addOption; - void addOption(const QCoapOption &option) Q_DECL_OVERRIDE; + void addOption(const QCoapOption &option) override; bool addUriOptions(QUrl uri, const QUrl &proxyUri = QUrl()); QCoapToken token() const; diff --git a/src/coap/qcoapreply.h b/src/coap/qcoapreply.h index 648dc3b..afdd5ea 100644 --- a/src/coap/qcoapreply.h +++ b/src/coap/qcoapreply.h @@ -73,8 +73,8 @@ protected: explicit QCoapReply(QCoapReplyPrivate &dd, QObject *parent = nullptr); - qint64 readData(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 writeData(const char *data, qint64 maxSize) override; Q_DECLARE_PRIVATE(QCoapReply) Q_PRIVATE_SLOT(d_func(), void _q_setRunning(const QCoapToken &, QCoapMessageId)) |