Improve the API of QCoapMessage

 - Rename QCoapMessage::MessageType -> QCoapMessage::Type
 - Rename option() -> optionAt()
 - Rename removeAllOptions() -> clearOptions()
 - Hide findOption(). option() is more convenient to use instead.
 - Add a setOptions() method.

This change is based on the feedback from API review.

Change-Id: I2093a06ca09eebb95865a82e09d2aa2265379e5d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

16 files changed, 113 insertions, 102 deletions

diff --git a/examples/coap/simplecoapclient/mainwindow.cpp b/examples/coap/simplecoapclient/mainwindow.cpp
index fc103ad..19f907a 100644
--- a/examples/coap/simplecoapclient/mainwindow.cpp
+++ b/examples/coap/simplecoapclient/mainwindow.cpp
@@ -154,8 +154,8 @@ static QString tryToResolveHostName(const QString hostName)
 
 void MainWindow::on_runButton_clicked()
 {
-    const auto msgType = ui->msgTypeCheckBox->isChecked() ? QCoapMessage::MessageType::Confirmable
-                                                          : QCoapMessage::MessageType::NonConfirmable;
+    const auto msgType = ui->msgTypeCheckBox->isChecked() ? QCoapMessage::Type::Confirmable
+                                                          : QCoapMessage::Type::NonConfirmable;
     QUrl url;
     url.setHost(tryToResolveHostName(ui->hostComboBox->currentText()));
     url.setPort(ui->portSpinBox->value());
diff --git a/src/coap/qcoapclient.cpp b/src/coap/qcoapclient.cpp
index f2205a0..6e1e52b 100644
--- a/src/coap/qcoapclient.cpp
+++ b/src/coap/qcoapclient.cpp
@@ -570,7 +570,7 @@ bool QCoapClientPrivate::send(QCoapReply *reply)
     // According to https://tools.ietf.org/html/rfc7252#section-8.1,
     // multicast requests MUST be Non-confirmable.
     if (QHostAddress(reply->url().host()).isMulticast()
-            && reply->request().type() == QCoapMessage::MessageType::Confirmable) {
+            && reply->request().type() == QCoapMessage::Type::Confirmable) {
         qCWarning(lcCoapClient, "Failed to send request, "
                                 "multicast requests must be non-confirmable.");
         return false;
diff --git a/src/coap/qcoapinternalreply.cpp b/src/coap/qcoapinternalreply.cpp
index 191e8ba..fe27ee0 100644
--- a/src/coap/qcoapinternalreply.cpp
+++ b/src/coap/qcoapinternalreply.cpp
@@ -92,7 +92,7 @@ QCoapInternalReply *QCoapInternalReply::createFromFrame(const QByteArray &reply,
 
     // Parse Header and Token
     d->message.setVersion((pduData[0] >> 6) & 0x03);
-    d->message.setType(QCoapMessage::MessageType((pduData[0] >> 4) & 0x03));
+    d->message.setType(QCoapMessage::Type((pduData[0] >> 4) & 0x03));
     quint8 tokenLength = (pduData[0]) & 0x0F;
     d->responseCode = static_cast<QtCoap::ResponseCode>(pduData[1]);
     d->message.setMessageId(static_cast<quint16>((static_cast<quint16>(pduData[2]) << 8)
diff --git a/src/coap/qcoapinternalrequest.cpp b/src/coap/qcoapinternalrequest.cpp
index 2e10432..0237259 100644
--- a/src/coap/qcoapinternalrequest.cpp
+++ b/src/coap/qcoapinternalrequest.cpp
@@ -111,11 +111,11 @@ void QCoapInternalRequest::initForAcknowledgment(quint16 messageId, const QByteA
     Q_D(QCoapInternalRequest);
 
     setMethod(QtCoap::Method::Invalid);
-    d->message.setType(QCoapMessage::MessageType::Acknowledgment);
+    d->message.setType(QCoapMessage::Type::Acknowledgment);
     d->message.setMessageId(messageId);
     d->message.setToken(token);
     d->message.setPayload(QByteArray());
-    d->message.removeAllOptions();
+    d->message.clearOptions();
 }
 
 /*!
@@ -130,11 +130,11 @@ void QCoapInternalRequest::initForReset(quint16 messageId)
     Q_D(QCoapInternalRequest);
 
     setMethod(QtCoap::Method::Invalid);
-    d->message.setType(QCoapMessage::MessageType::Reset);
+    d->message.setType(QCoapMessage::Type::Reset);
     d->message.setMessageId(messageId);
     d->message.setToken(QByteArray());
     d->message.setPayload(QByteArray());
-    d->message.removeAllOptions();
+    d->message.clearOptions();
 }
 
 /*!
diff --git a/src/coap/qcoapmessage.cpp b/src/coap/qcoapmessage.cpp
index d07611c..21462f7 100644
--- a/src/coap/qcoapmessage.cpp
+++ b/src/coap/qcoapmessage.cpp
@@ -32,7 +32,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QCoapMessagePrivate::QCoapMessagePrivate(QCoapMessage::MessageType _type) :
+QCoapMessagePrivate::QCoapMessagePrivate(QCoapMessage::Type _type) :
     type(_type)
 {
 }
@@ -64,7 +64,7 @@ QCoapMessagePrivate::~QCoapMessagePrivate()
 */
 
 /*!
-    \enum QCoapMessage::MessageType
+    \enum QCoapMessage::Type
 
     Indicates the type of the message.
 
@@ -179,7 +179,7 @@ void QCoapMessage::removeOption(QCoapOption::OptionName name)
 /*!
     Removes all options.
 */
-void QCoapMessage::removeAllOptions()
+void QCoapMessage::clearOptions()
 {
     Q_D(QCoapMessage);
     d->options.clear();
@@ -201,7 +201,7 @@ quint8 QCoapMessage::version() const
 
     \sa setType()
 */
-QCoapMessage::MessageType QCoapMessage::type() const
+QCoapMessage::Type QCoapMessage::type() const
 {
     Q_D(const QCoapMessage);
     return d->type;
@@ -252,7 +252,7 @@ QByteArray QCoapMessage::payload() const
 /*!
     Returns the option at \a index position.
 */
-QCoapOption QCoapMessage::option(int index) const
+QCoapOption QCoapMessage::optionAt(int index) const
 {
     Q_D(const QCoapMessage);
     return d->options.at(index);
@@ -260,25 +260,27 @@ QCoapOption QCoapMessage::option(int index) const
 
 /*!
     Finds and returns the first option with the given \a name.
-    If there is no such option, returns an Invalid CoapOption with an empty value.
+    If there is no such option, returns an invalid QCoapOption with an empty value.
 */
 QCoapOption QCoapMessage::option(QCoapOption::OptionName name) const
 {
     Q_D(const QCoapMessage);
 
-    auto it = findOption(name);
+    auto it = d->findOption(name);
     return it != d->options.end() ? *it : QCoapOption();
 }
 
 /*!
+    \internal
+
     Finds and returns a constant iterator to the first option
     with the given \a name.
     If there is no such option, returns \c d->options.end().
 */
-QVector<QCoapOption>::const_iterator QCoapMessage::findOption(QCoapOption::OptionName name) const
+QVector<QCoapOption>::const_iterator
+QCoapMessagePrivate::findOption(QCoapOption::OptionName name) const
 {
-    Q_D(const QCoapMessage);
-    return std::find_if(d->options.begin(), d->options.end(), [name](const QCoapOption &option) {
+    return std::find_if(options.begin(), options.end(), [name](const QCoapOption &option) {
         return option.name() == name;
     });
 }
@@ -290,7 +292,7 @@ QVector<QCoapOption>::const_iterator QCoapMessage::findOption(QCoapOption::Optio
 bool QCoapMessage::hasOption(QCoapOption::OptionName name) const
 {
     Q_D(const QCoapMessage);
-    return findOption(name) != d->options.end();
+    return d->findOption(name) != d->options.end();
 }
 
 /*!
@@ -342,7 +344,7 @@ void QCoapMessage::setVersion(quint8 version)
 
     \sa type()
 */
-void QCoapMessage::setType(const MessageType &type)
+void QCoapMessage::setType(const Type &type)
 {
     Q_D(QCoapMessage);
     d->type = type;
@@ -387,6 +389,15 @@ void QCoapMessage::setPayload(const QByteArray &payload)
     d->payload = payload;
 }
 
+/*!
+    Sets the message options to \a options.
+*/
+void QCoapMessage::setOptions(const QVector<QCoapOption> &options)
+{
+    Q_D(QCoapMessage);
+    d->options = options;
+}
+
 void QCoapMessage::swap(QCoapMessage &other) Q_DECL_NOTHROW
 {
     qSwap(d_ptr, other.d_ptr);
diff --git a/src/coap/qcoapmessage.h b/src/coap/qcoapmessage.h
index 36288a7..b88a41a 100644
--- a/src/coap/qcoapmessage.h
+++ b/src/coap/qcoapmessage.h
@@ -44,7 +44,7 @@ class QCoapMessagePrivate;
 class Q_COAP_EXPORT QCoapMessage
 {
 public:
-    enum class MessageType : quint8 {
+    enum class Type : quint8 {
         Confirmable,
         NonConfirmable,
         Acknowledgment,
@@ -60,20 +60,20 @@ public:
     QCoapMessage &operator=(QCoapMessage &&other) Q_DECL_NOTHROW;
 
     quint8 version() const;
-    MessageType type() const;
+    Type type() const;
     QByteArray token() const;
     quint8 tokenLength() const;
     quint16 messageId() const;
     QByteArray payload() const;
     void setVersion(quint8 version);
-    void setType(const MessageType &type);
+    void setType(const Type &type);
     void setToken(const QByteArray &token);
     void setMessageId(quint16);
     void setPayload(const QByteArray &payload);
+    void setOptions(const QVector<QCoapOption> &options);
 
-    QCoapOption option(int index) const;
+    QCoapOption optionAt(int index) const;
     QCoapOption option(QCoapOption::OptionName name) const;
-    QVector<QCoapOption>::const_iterator findOption(QCoapOption::OptionName name) const;
     bool hasOption(QCoapOption::OptionName name) const;
     const QVector<QCoapOption> &options() const;
     QVector<QCoapOption> options(QCoapOption::OptionName name) const;
@@ -82,7 +82,7 @@ public:
     void addOption(const QCoapOption &option);
     void removeOption(const QCoapOption &option);
     void removeOption(QCoapOption::OptionName name);
-    void removeAllOptions();
+    void clearOptions();
 
 protected:
     explicit QCoapMessage(QCoapMessagePrivate &dd);
@@ -99,6 +99,6 @@ Q_DECLARE_SHARED(QCoapMessage)
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QCoapMessage)
-Q_DECLARE_METATYPE(QCoapMessage::MessageType)
+Q_DECLARE_METATYPE(QCoapMessage::Type)
 
 #endif // QCOAPMESSAGE_H
diff --git a/src/coap/qcoapmessage_p.h b/src/coap/qcoapmessage_p.h
index b16ba2b..fbff1b8 100644
--- a/src/coap/qcoapmessage_p.h
+++ b/src/coap/qcoapmessage_p.h
@@ -51,12 +51,14 @@ QT_BEGIN_NAMESPACE
 class Q_AUTOTEST_EXPORT QCoapMessagePrivate : public QSharedData
 {
 public:
-    QCoapMessagePrivate(QCoapMessage::MessageType type = QCoapMessage::MessageType::NonConfirmable);
+    QCoapMessagePrivate(QCoapMessage::Type type = QCoapMessage::Type::NonConfirmable);
     QCoapMessagePrivate(const QCoapMessagePrivate &other);
     ~QCoapMessagePrivate();
 
+    QVector<QCoapOption>::const_iterator findOption(QCoapOption::OptionName name) const;
+
     quint8 version = 1;
-    QCoapMessage::MessageType type = QCoapMessage::MessageType::NonConfirmable;
+    QCoapMessage::Type type = QCoapMessage::Type::NonConfirmable;
     quint16 messageId = 0;
     QByteArray token;
     QVector<QCoapOption> options;
diff --git a/src/coap/qcoapprotocol.cpp b/src/coap/qcoapprotocol.cpp
index 2de5583..2f4c278 100644
--- a/src/coap/qcoapprotocol.cpp
+++ b/src/coap/qcoapprotocol.cpp
@@ -178,7 +178,7 @@ void QCoapProtocol::sendRequest(QPointer<QCoapReply> reply, QCoapConnection *con
             internalRequest->setToSendBlock(0, d->blockSize);
     }
 
-    if (requestMessage->type() == QCoapMessage::MessageType::Confirmable)
+    if (requestMessage->type() == QCoapMessage::Type::Confirmable)
         internalRequest->setTimeout(QtCoap::randomGenerator().bounded(minTimeout(), maxTimeout()));
     else
         internalRequest->setTimeout(maxTimeout());
@@ -239,7 +239,7 @@ void QCoapProtocolPrivate::onRequestTimeout(QCoapInternalRequest *request)
     if (!isRequestRegistered(request))
         return;
 
-    if (request->message()->type() == QCoapMessage::MessageType::Confirmable
+    if (request->message()->type() == QCoapMessage::Type::Confirmable
             && request->retransmissionCounter() < maxRetransmit) {
         sendRequest(request);
     } else {
@@ -376,7 +376,7 @@ void QCoapProtocolPrivate::onFrameReceived(const QByteArray &data, const QHostAd
         // Remove option to ensure that it will stop
         request->removeOption(QCoapOption::Observe);
         sendReset(request);
-    } else if (messageReceived->type() == QCoapMessage::MessageType::Confirmable) {
+    } else if (messageReceived->type() == QCoapMessage::Type::Confirmable) {
         sendAcknowledgment(request);
     }
 
@@ -515,7 +515,7 @@ void QCoapProtocolPrivate::onLastMessageReceived(QCoapInternalRequest *request,
 
     auto lastReply = replies.last();
     // Ignore empty ACK messages
-    if (lastReply->message()->type() == QCoapMessage::MessageType::Acknowledgment
+    if (lastReply->message()->type() == QCoapMessage::Type::Acknowledgment
             && lastReply->responseCode() == QtCoap::ResponseCode::EmptyMessage) {
         exchangeMap[request->token()].replies.takeLast();
         return;
diff --git a/src/coap/qcoaprequest.cpp b/src/coap/qcoaprequest.cpp
index 47abc2b..59cdb59 100644
--- a/src/coap/qcoaprequest.cpp
+++ b/src/coap/qcoaprequest.cpp
@@ -44,7 +44,7 @@ const auto CoapScheme = QLatin1String("coap");
 const auto CoapSecureScheme = QLatin1String("coaps");
 }
 
-QCoapRequestPrivate::QCoapRequestPrivate(const QUrl &url, QCoapMessage::MessageType type,
+QCoapRequestPrivate::QCoapRequestPrivate(const QUrl &url, QCoapMessage::Type type,
                                          const QUrl &proxyUrl) :
     QCoapMessagePrivate(type),
     proxyUri(proxyUrl)
@@ -114,7 +114,7 @@ void QCoapRequestPrivate::setUrl(const QUrl &url)
     Constructs a QCoapRequest object with the target \a url,
     the proxy URL \a proxyUrl and the \a type of the message.
 */
-QCoapRequest::QCoapRequest(const QUrl &url, MessageType type, const QUrl &proxyUrl) :
+QCoapRequest::QCoapRequest(const QUrl &url, Type type, const QUrl &proxyUrl) :
     QCoapMessage(*new QCoapRequestPrivate(url, type, proxyUrl))
 {
 }
@@ -122,7 +122,7 @@ QCoapRequest::QCoapRequest(const QUrl &url, MessageType type, const QUrl &proxyU
 /*!
     Constructs a QCoapRequest from a string literal
 */
-QCoapRequest::QCoapRequest(const char *url, MessageType type) :
+QCoapRequest::QCoapRequest(const char *url, Type type) :
     QCoapMessage(*new QCoapRequestPrivate(QUrl(QString::fromUtf8(url)), type))
 {
 }
diff --git a/src/coap/qcoaprequest.h b/src/coap/qcoaprequest.h
index c833334..e506c83 100644
--- a/src/coap/qcoaprequest.h
+++ b/src/coap/qcoaprequest.h
@@ -46,10 +46,9 @@ class Q_COAP_EXPORT QCoapRequest : public QCoapMessage
 {
 public:
     explicit QCoapRequest(const QUrl &url = QUrl(),
-                 MessageType type = MessageType::NonConfirmable,
-                 const QUrl &proxyUrl = QUrl());
-    explicit QCoapRequest(const char* url,
-                 MessageType type = MessageType::NonConfirmable);
+                          Type type = Type::NonConfirmable,
+                          const QUrl &proxyUrl = QUrl());
+    explicit QCoapRequest(const char* url, Type type = Type::NonConfirmable);
     QCoapRequest(const QCoapRequest &other);
     ~QCoapRequest();
 
diff --git a/src/coap/qcoaprequest_p.h b/src/coap/qcoaprequest_p.h
index 67c26c6..eae236d 100644
--- a/src/coap/qcoaprequest_p.h
+++ b/src/coap/qcoaprequest_p.h
@@ -52,8 +52,8 @@ class Q_AUTOTEST_EXPORT QCoapRequestPrivate : public QCoapMessagePrivate
 {
 public:
     QCoapRequestPrivate(const QUrl &url = QUrl(),
-            QCoapMessage::MessageType type = QCoapMessage::MessageType::NonConfirmable,
-            const QUrl &proxyUrl = QUrl());
+                        QCoapMessage::Type type = QCoapMessage::Type::NonConfirmable,
+                        const QUrl &proxyUrl = QUrl());
     QCoapRequestPrivate(const QCoapRequestPrivate &other) = default;
     ~QCoapRequestPrivate();
 
diff --git a/tests/auto/qcoapclient/tst_qcoapclient.cpp b/tests/auto/qcoapclient/tst_qcoapclient.cpp
index b06fa21..c7fce74 100644
--- a/tests/auto/qcoapclient/tst_qcoapclient.cpp
+++ b/tests/auto/qcoapclient/tst_qcoapclient.cpp
@@ -498,7 +498,7 @@ void tst_QCoapClient::timeout()
     QElapsedTimer timeoutTimer;
     timeoutTimer.start();
     QScopedPointer<QCoapReply> reply(
-                client.get(QCoapRequest(url, QCoapMessage::MessageType::Confirmable)));
+                client.get(QCoapRequest(url, QCoapMessage::Type::Confirmable)));
     QSignalSpy spyClientError(&client, &QCoapClient::error);
     QSignalSpy spyReplyError(reply.data(), &QCoapReply::error);
     QSignalSpy spyReplyAborted(reply.data(), &QCoapReply::aborted);
@@ -555,7 +555,7 @@ void tst_QCoapClient::abort()
 void tst_QCoapClient::blockwiseReply_data()
 {
     QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QCoapMessage::MessageType>("type");
+    QTest::addColumn<QCoapMessage::Type>("type");
     QTest::addColumn<QByteArray>("replyData");
 
     QByteArray data;
@@ -582,34 +582,34 @@ void tst_QCoapClient::blockwiseReply_data()
 
     QTest::newRow("get_large")
             << QUrl(testServerUrl() + "/large")
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << data;
     QTest::newRow("get_large_separate")
             << QUrl(testServerUrl() + "/large-separate")
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << data;
     QTest::newRow("get_large_confirmable")
             << QUrl(testServerUrl() + "/large")
-            << QCoapMessage::MessageType::Confirmable
+            << QCoapMessage::Type::Confirmable
             << data;
     QTest::newRow("get_large_separate_confirmable")
             << QUrl(testServerUrl() + "/large-separate")
-            << QCoapMessage::MessageType::Confirmable
+            << QCoapMessage::Type::Confirmable
             << data;
     QTest::newRow("get_large_16bits")
             << QUrl(testServerUrl() + "/large")
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << data;
     QTest::newRow("get_large_16bits_confirmable")
             << QUrl(testServerUrl() + "/large")
-            << QCoapMessage::MessageType::Confirmable
+            << QCoapMessage::Type::Confirmable
             << data;
 }
 
 void tst_QCoapClient::blockwiseReply()
 {
     QFETCH(QUrl, url);
-    QFETCH(QCoapMessage::MessageType, type);
+    QFETCH(QCoapMessage::Type, type);
     QFETCH(QByteArray, replyData);
 
     QCoapClient client;
@@ -633,7 +633,7 @@ void tst_QCoapClient::blockwiseReply()
 void tst_QCoapClient::blockwiseRequest_data()
 {
     QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QCoapMessage::MessageType>("type");
+    QTest::addColumn<QCoapMessage::Type>("type");
     QTest::addColumn<QByteArray>("requestData");
     QTest::addColumn<QtCoap::ResponseCode>("responseCode");
     QTest::addColumn<QByteArray>("replyData");
@@ -644,12 +644,12 @@ void tst_QCoapClient::blockwiseRequest_data()
         data.append(alphabet);
 
     QTest::newRow("large_post_empty_reply") << QUrl(testServerUrl() + "/query")
-                                            << QCoapMessage::MessageType::NonConfirmable
+                                            << QCoapMessage::Type::NonConfirmable
                                             << data
                                             << QtCoap::ResponseCode::MethodNotAllowed
                                             << QByteArray();
     QTest::newRow("large_post_large_reply") << QUrl(testServerUrl() + "/large-post")
-                                            << QCoapMessage::MessageType::NonConfirmable
+                                            << QCoapMessage::Type::NonConfirmable
                                             << data
                                             << QtCoap::ResponseCode::Changed
                                             << data.toUpper();
@@ -658,7 +658,7 @@ void tst_QCoapClient::blockwiseRequest_data()
 void tst_QCoapClient::blockwiseRequest()
 {
     QFETCH(QUrl, url);
-    QFETCH(QCoapMessage::MessageType, type);
+    QFETCH(QCoapMessage::Type, type);
     QFETCH(QByteArray, requestData);
     QFETCH(QtCoap::ResponseCode, responseCode);
     QFETCH(QByteArray, replyData);
@@ -716,49 +716,49 @@ void tst_QCoapClient::observe_data()
 {
     QWARN("Observe tests may take some time, don't forget to raise Tests timeout in settings.");
     QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QCoapMessage::MessageType>("type");
+    QTest::addColumn<QCoapMessage::Type>("type");
 
     QTest::newRow("observe")
             << QUrl(testServerUrl() + "/obs")
-            << QCoapMessage::MessageType::NonConfirmable;
+            << QCoapMessage::Type::NonConfirmable;
 
     QTest::newRow("observe_no_scheme_no_port")
             << QUrl(testServerHost() + "/obs")
-            << QCoapMessage::MessageType::NonConfirmable;
+            << QCoapMessage::Type::NonConfirmable;
 
     QTest::newRow("observe_confirmable")
             << QUrl(testServerUrl() + "/obs")
-            << QCoapMessage::MessageType::Confirmable;
+            << QCoapMessage::Type::Confirmable;
 
     QTest::newRow("observe_receive")
             << QUrl(testServerUrl() + "/obs-non")
-            << QCoapMessage::MessageType::NonConfirmable;
+            << QCoapMessage::Type::NonConfirmable;
 
     QTest::newRow("observe_receive_confirmable")
             << QUrl(testServerUrl() + "/obs-non")
-            << QCoapMessage::MessageType::Confirmable;
+            << QCoapMessage::Type::Confirmable;
 
     QTest::newRow("observe_large")
             << QUrl(testServerUrl() + "/obs-large")
-            << QCoapMessage::MessageType::NonConfirmable;
+            << QCoapMessage::Type::NonConfirmable;
 
     QTest::newRow("observe_large_confirmable")
             << QUrl(testServerUrl() + "/obs-large")
-            << QCoapMessage::MessageType::Confirmable;
+            << QCoapMessage::Type::Confirmable;
 
     QTest::newRow("observe_pumping")
             << QUrl(testServerUrl() + "/obs-pumping")
-            << QCoapMessage::MessageType::NonConfirmable;
+            << QCoapMessage::Type::NonConfirmable;
 
     QTest::newRow("observe_pumping_confirmable")
             << QUrl(testServerUrl() + "/obs-pumping")
-            << QCoapMessage::MessageType::Confirmable;
+            << QCoapMessage::Type::Confirmable;
 }
 
 void tst_QCoapClient::observe()
 {
     QFETCH(QUrl, url);
-    QFETCH(QCoapMessage::MessageType, type);
+    QFETCH(QCoapMessage::Type, type);
 
     QCoapClient client;
     QCoapRequest request(url);
@@ -788,8 +788,7 @@ void tst_QCoapClient::observe()
 void tst_QCoapClient::confirmableMulticast()
 {
     QCoapClient client;
-    const auto reply = client.get(QCoapRequest("224.0.1.187",
-                                               QCoapMessage::MessageType::Confirmable));
+    const auto reply = client.get(QCoapRequest("224.0.1.187", QCoapMessage::Type::Confirmable));
     QVERIFY2(!reply, "Confirmable multicast request didn't fail as expected.");
 }
 
diff --git a/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp b/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp
index da2531b..61a3dbc 100644
--- a/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp
+++ b/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp
@@ -52,7 +52,7 @@ private Q_SLOTS:
 void tst_QCoapInternalReply::parseReplyPdu_data()
 {
     QTest::addColumn<QtCoap::ResponseCode>("responseCode");
-    QTest::addColumn<QCoapMessage::MessageType>("type");
+    QTest::addColumn<QCoapMessage::Type>("type");
     QTest::addColumn<quint16>("messageId");
     QTest::addColumn<QByteArray>("token");
     QTest::addColumn<quint8>("tokenLength");
@@ -73,7 +73,7 @@ void tst_QCoapInternalReply::parseReplyPdu_data()
 
     QTest::newRow("reply_with_options_and_payload")
             << QtCoap::ResponseCode::Content
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << quint16(64463)
             << QByteArray("4647f09b")
             << quint8(4)
@@ -87,7 +87,7 @@ void tst_QCoapInternalReply::parseReplyPdu_data()
 
     QTest::newRow("reply_with_payload")
             << QtCoap::ResponseCode::Content
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << quint16(64463)
             << QByteArray("4647f09b")
             << quint8(4)
@@ -100,7 +100,7 @@ void tst_QCoapInternalReply::parseReplyPdu_data()
 
     QTest::newRow("reply_with_options")
             << QtCoap::ResponseCode::Content
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << quint16(64463)
             << QByteArray("4647f09b")
             << quint8(4)
@@ -112,7 +112,7 @@ void tst_QCoapInternalReply::parseReplyPdu_data()
 
     QTest::newRow("reply_only")
             << QtCoap::ResponseCode::Content
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << quint16(64463)
             << QByteArray("4647f09b")
             << quint8(4)
@@ -124,7 +124,7 @@ void tst_QCoapInternalReply::parseReplyPdu_data()
 
     QTest::newRow("reply_with_big_option")
             << QtCoap::ResponseCode::Content
-            << QCoapMessage::MessageType::NonConfirmable
+            << QCoapMessage::Type::NonConfirmable
             << quint16(64463)
             << QByteArray("4647f09b")
             << quint8(4)
@@ -139,7 +139,7 @@ void tst_QCoapInternalReply::parseReplyPdu_data()
 void tst_QCoapInternalReply::parseReplyPdu()
 {
     QFETCH(QtCoap::ResponseCode, responseCode);
-    QFETCH(QCoapMessage::MessageType, type);
+    QFETCH(QCoapMessage::Type, type);
     QFETCH(quint16, messageId);
     QFETCH(QByteArray, token);
     QFETCH(quint8, tokenLength);
@@ -159,7 +159,7 @@ void tst_QCoapInternalReply::parseReplyPdu()
     QCOMPARE(reply->message()->token().toHex(), token);
     QCOMPARE(reply->message()->optionCount(), optionsNames.count());
     for (int i = 0; i < reply->message()->optionCount(); ++i) {
-        QCoapOption option = reply->message()->option(i);
+        QCoapOption option = reply->message()->optionAt(i);
         QCOMPARE(option.name(), optionsNames.at(i));
         QCOMPARE(option.length(), optionsLengths.at(i));
         QCOMPARE(option.value(), optionsValues.at(i));
diff --git a/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp b/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp
index 6a61eb1..1e5c732 100644
--- a/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp
+++ b/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp
@@ -63,7 +63,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
 {
     QTest::addColumn<QUrl>("url");
     QTest::addColumn<QtCoap::Method>("method");
-    QTest::addColumn<QCoapMessage::MessageType>("type");
+    QTest::addColumn<QCoapMessage::Type>("type");
     QTest::addColumn<quint16>("messageId");
     QTest::addColumn<QByteArray>("token");
     QTest::addColumn<QString>("pduHeader");
@@ -72,7 +72,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_with_option_and_payload")
         << QUrl("coap://10.20.30.40:5683/test")
         << QtCoap::Method::Get
-        << QCoapRequest::MessageType::NonConfirmable
+        << QCoapRequest::Type::NonConfirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "5401dc504647f09bb474657374ff"
@@ -81,7 +81,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_domain")
         << QUrl("coap://domain.com:5683/test")
         << QtCoap::Method::Get
-        << QCoapRequest::MessageType::NonConfirmable
+        << QCoapRequest::Type::NonConfirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "5401dc504647f09b3a646f6d61696e2e636f6d8474657374ff"
@@ -90,7 +90,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_ipv6")
         << QUrl("coap://[::ffff:ac11:3]:5683/test")
         << QtCoap::Method::Get
-        << QCoapRequest::MessageType::NonConfirmable
+        << QCoapRequest::Type::NonConfirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "5401dc504647f09bb474657374ff"
@@ -99,7 +99,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_without_payload")
         << QUrl("coap://10.20.30.40:5683/test")
         << QtCoap::Method::Get
-        << QCoapRequest::MessageType::NonConfirmable
+        << QCoapRequest::Type::NonConfirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "5401dc504647f09bb474657374"
@@ -108,7 +108,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_without_option")
         << QUrl("coap://10.20.30.40:5683/")
         << QtCoap::Method::Put
-        << QCoapRequest::MessageType::Confirmable
+        << QCoapRequest::Type::Confirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "4403dc504647f09bff"
@@ -117,7 +117,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_only")
         << QUrl("coap://10.20.30.40:5683/")
         << QtCoap::Method::Get
-        << QCoapRequest::MessageType::NonConfirmable
+        << QCoapRequest::Type::NonConfirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "5401dc504647f09b"
@@ -126,7 +126,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_with_multiple_options")
         << QUrl("coap://10.20.30.40:5683/test/oui")
         << QtCoap::Method::Get
-        << QCoapRequest::MessageType::NonConfirmable
+        << QCoapRequest::Type::NonConfirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "5401dc504647f09bb474657374036f7569"
@@ -135,7 +135,7 @@ void tst_QCoapInternalRequest::requestToFrame_data()
     QTest::newRow("request_with_big_option_number")
         << QUrl("coap://10.20.30.40:5683/test")
         << QtCoap::Method::Get
-        << QCoapRequest::MessageType::NonConfirmable
+        << QCoapRequest::Type::NonConfirmable
         << quint16(56400)
         << QByteArray::fromHex("4647f09b")
         << "5401dc504647f09bb474657374dd240d6162636465666768696a6b6c6d6e6f70"
@@ -147,7 +147,7 @@ void tst_QCoapInternalRequest::requestToFrame()
 {
     QFETCH(QUrl, url);
     QFETCH(QtCoap::Method, method);
-    QFETCH(QCoapMessage::MessageType, type);
+    QFETCH(QCoapMessage::Type, type);
     QFETCH(quint16, messageId);
     QFETCH(QByteArray, token);
     QFETCH(QString, pduHeader);
@@ -218,7 +218,7 @@ void tst_QCoapInternalRequest::parseUri()
     QFETCH(QUrl, proxyUri);
     QFETCH(QVector<QCoapOption>, options);
 
-    QCoapRequest request(uri, QCoapMessage::MessageType::NonConfirmable, proxyUri);
+    QCoapRequest request(uri, QCoapMessage::Type::NonConfirmable, proxyUri);
     QCoapInternalRequest internalRequest(request);
 
     for (QCoapOption opt : options)
diff --git a/tests/auto/qcoapmessage/tst_qcoapmessage.cpp b/tests/auto/qcoapmessage/tst_qcoapmessage.cpp
index 8801ed0..e13281e 100644
--- a/tests/auto/qcoapmessage/tst_qcoapmessage.cpp
+++ b/tests/auto/qcoapmessage/tst_qcoapmessage.cpp
@@ -39,8 +39,8 @@ class tst_QCoapMessage : public QObject
 
 private Q_SLOTS:
     void copyAndDetach();
-    void setMessageType_data();
-    void setMessageType();
+    void setType_data();
+    void setType();
     void addOption();
     void addOption_string_data();
     void addOption_string();
@@ -59,7 +59,7 @@ void tst_QCoapMessage::copyAndDetach()
     a.setMessageId(3);
     a.setPayload("payload");
     a.setToken("token");
-    a.setType(QCoapMessage::MessageType::Acknowledgment);
+    a.setType(QCoapMessage::Type::Acknowledgment);
     a.setVersion(5);
 
     // Test the copy
@@ -67,7 +67,7 @@ void tst_QCoapMessage::copyAndDetach()
     QVERIFY2(b.messageId() == 3, "Message not copied correctly");
     QVERIFY2(b.payload() == "payload", "Message not copied correctly");
     QVERIFY2(b.token() == "token", "Message not copied correctly");
-    QVERIFY2(b.type() == QCoapMessage::MessageType::Acknowledgment, "Message not copied correctly");
+    QVERIFY2(b.type() == QCoapMessage::Type::Acknowledgment, "Message not copied correctly");
     QVERIFY2(b.version() == 5, "Message not copied correctly");
 
     // Detach
@@ -76,19 +76,19 @@ void tst_QCoapMessage::copyAndDetach()
     QCOMPARE(a.messageId(), 3);
 }
 
-void tst_QCoapMessage::setMessageType_data()
+void tst_QCoapMessage::setType_data()
 {
-    QTest::addColumn<QCoapMessage::MessageType>("type");
+    QTest::addColumn<QCoapMessage::Type>("type");
 
-    QTest::newRow("acknowledgment") << QCoapMessage::MessageType::Acknowledgment;
-    QTest::newRow("confirmable") << QCoapMessage::MessageType::Confirmable;
-    QTest::newRow("non-confirmable") << QCoapMessage::MessageType::NonConfirmable;
-    QTest::newRow("reset") << QCoapMessage::MessageType::Reset;
+    QTest::newRow("acknowledgment") << QCoapMessage::Type::Acknowledgment;
+    QTest::newRow("confirmable") << QCoapMessage::Type::Confirmable;
+    QTest::newRow("non-confirmable") << QCoapMessage::Type::NonConfirmable;
+    QTest::newRow("reset") << QCoapMessage::Type::Reset;
 }
 
-void tst_QCoapMessage::setMessageType()
+void tst_QCoapMessage::setType()
 {
-    QFETCH(QCoapMessage::MessageType, type);
+    QFETCH(QCoapMessage::Type, type);
     QCoapMessage message;
     message.setType(type);
     QCOMPARE(message.type(), type);
@@ -256,7 +256,7 @@ void tst_QCoapMessage::removeAll()
     message.addOption(QCoapOption::LocationPath, "path");
     message.addOption(QCoapOption::ProxyUri, "proxy1");
     message.addOption(QCoapOption::ProxyUri, "proxy2");
-    message.removeAllOptions();
+    message.clearOptions();
 
     QVERIFY(message.options().isEmpty());
 }
diff --git a/tests/auto/qcoaprequest/tst_qcoaprequest.cpp b/tests/auto/qcoaprequest/tst_qcoaprequest.cpp
index 9f66b98..592d4eb 100644
--- a/tests/auto/qcoaprequest/tst_qcoaprequest.cpp
+++ b/tests/auto/qcoaprequest/tst_qcoaprequest.cpp
@@ -160,7 +160,7 @@ void tst_QCoapRequest::copyAndDetach()
     a.setMessageId(3);
     a.setPayload("payload");
     a.setToken("token");
-    a.setType(QCoapMessage::MessageType::Acknowledgment);
+    a.setType(QCoapMessage::Type::Acknowledgment);
     a.setVersion(5);
     a.setMethod(QtCoap::Method::Delete);
     QUrl testUrl("coap://url:500/resource");
@@ -173,7 +173,7 @@ void tst_QCoapRequest::copyAndDetach()
     QVERIFY2(b.messageId() == 3, "Message not copied correctly");
     QVERIFY2(b.payload() == "payload", "Message not copied correctly");
     QVERIFY2(b.token() == "token", "Message not copied correctly");
-    QVERIFY2(b.type() == QCoapMessage::MessageType::Acknowledgment, "Message not copied correctly");
+    QVERIFY2(b.type() == QCoapMessage::Type::Acknowledgment, "Message not copied correctly");
     QVERIFY2(b.version() == 5, "Message not copied correctly");
 
     // Test the QCoapRequest copy