diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:02:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:02:23 +0200 |
| commit | bad7ee3d4f329ad258b4ceacdb3818084208cf5f (patch) | |
| tree | b2b2e5dfe98143f357eca7b05a0406c41ef33fa6 /src/coap/qcoapreply_p.h | |
| parent | 2050395003076fea84a8bdcc3948e8b50262a39c (diff) | |
| parent | 18289e7c1d2778460dccb1135fe283bd234954ad (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I92c022cdbcba00b16d33bcbe6bcddbf525a796b0
Diffstat (limited to 'src/coap/qcoapreply_p.h')
| -rw-r--r-- | src/coap/qcoapreply_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/coap/qcoapreply_p.h b/src/coap/qcoapreply_p.h index b786ce2..68e9062 100644 --- a/src/coap/qcoapreply_p.h +++ b/src/coap/qcoapreply_p.h @@ -58,14 +58,14 @@ public: virtual void _q_setContent(const QHostAddress &sender, const QCoapMessage &, QtCoap::ResponseCode); void _q_setNotified(); void _q_setObserveCancelled(); - void _q_setFinished(QtCoap::Error = QtCoap::NoError); + void _q_setFinished(QtCoap::Error = QtCoap::Error::Ok); void _q_setError(QtCoap::ResponseCode code); void _q_setError(QtCoap::Error); QCoapRequest request; QCoapMessage message; - QtCoap::ResponseCode responseCode = QtCoap::InvalidCode; - QtCoap::Error error = QtCoap::NoError; + QtCoap::ResponseCode responseCode = QtCoap::ResponseCode::InvalidCode; + QtCoap::Error error = QtCoap::Error::Ok; bool isRunning = false; bool isFinished = false; bool isAborted = false; |