diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-18 03:05:08 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-18 03:05:08 +0200 |
commit | 02d7238391ae0addc6517759b10d01948b108cb3 (patch) | |
tree | b0c4d0497d73e1edde92c3eb4f1a72b726c39396 /src/coap/qcoapclient.h | |
parent | bad7ee3d4f329ad258b4ceacdb3818084208cf5f (diff) | |
parent | fd94d8e5673a5d5228aa2d38b605fde7a881332b (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I3ab43e890b692e3266522c4c3f8ea65499df2cbb
Diffstat (limited to 'src/coap/qcoapclient.h')
-rw-r--r-- | src/coap/qcoapclient.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/coap/qcoapclient.h b/src/coap/qcoapclient.h index fb06903..7171b59 100644 --- a/src/coap/qcoapclient.h +++ b/src/coap/qcoapclient.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE class QCoapReply; -class QCoapDiscoveryReply; +class QCoapResourceDiscoveryReply; class QCoapRequest; class QCoapProtocol; class QCoapConnection; @@ -53,7 +53,7 @@ class Q_COAP_EXPORT QCoapClient : public QObject { Q_OBJECT public: - explicit QCoapClient(QtCoap::SecurityMode securityMode = QtCoap::SecurityMode::NoSec, + explicit QCoapClient(QtCoap::SecurityMode securityMode = QtCoap::SecurityMode::NoSecurity, QObject *parent = nullptr); explicit QCoapClient(QCoapConnection *connection, QObject *parent = nullptr); ~QCoapClient(); @@ -74,19 +74,21 @@ public: void cancelObserve(const QUrl &url); void disconnect(); - QCoapDiscoveryReply *discover(QtCoap::MulticastGroup group = QtCoap::MulticastGroup::AllCoapNodesIPv4, - int port = QtCoap::DefaultPort, - const QString &discoveryPath = QLatin1String("/.well-known/core")); - QCoapDiscoveryReply *discover(const QUrl &baseUrl, - const QString &discoveryPath = QLatin1String("/.well-known/core")); + QCoapResourceDiscoveryReply *discover( + QtCoap::MulticastGroup group = QtCoap::MulticastGroup::AllCoapNodesIPv4, + int port = QtCoap::DefaultPort, + const QString &discoveryPath = QLatin1String("/.well-known/core")); + QCoapResourceDiscoveryReply *discover( + const QUrl &baseUrl, + const QString &discoveryPath = QLatin1String("/.well-known/core")); void setSecurityConfiguration(const QCoapSecurityConfiguration &configuration); void setBlockSize(quint16 blockSize); void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value); - void setMaxServerResponseDelay(uint responseDelay); + void setMaximumServerResponseDelay(uint responseDelay); void setAckTimeout(uint ackTimeout); void setAckRandomFactor(double ackRandomFactor); - void setMaxRetransmit(uint maxRetransmit); + void setMaximumRetransmitCount(uint maximumRetransmitCount); Q_SIGNALS: void finished(QCoapReply *reply); @@ -95,9 +97,6 @@ Q_SIGNALS: void error(QCoapReply *reply, QtCoap::Error error); protected: - explicit QCoapClient(QCoapProtocol *protocol, QCoapConnection *connection, - QObject *parent = nullptr); - Q_DECLARE_PRIVATE(QCoapClient) }; |