1 files changed, 8 insertions, 8 deletions
diff --git a/src/coap/qcoapsecurityconfiguration.cpp b/src/coap/qcoapsecurityconfiguration.cpp
index 02b4022..c9dba57 100644
--- a/src/coap/qcoapsecurityconfiguration.cpp
+++ b/src/coap/qcoapsecurityconfiguration.cpp
@@ -123,7 +123,7 @@ QCoapPrivateKey::QCoapPrivateKey(const QCoapPrivateKey &other)
     Move-constructs a QCoapPrivateKey, making it point to the same
     object as \a other was pointing to.
 */
-QCoapPrivateKey::QCoapPrivateKey(QCoapPrivateKey &&other) Q_DECL_NOTHROW
+QCoapPrivateKey::QCoapPrivateKey(QCoapPrivateKey &&other) noexcept
     : d(other.d)
 {
     other.d = nullptr;
@@ -149,9 +149,9 @@ QCoapPrivateKey &QCoapPrivateKey::operator=(const QCoapPrivateKey &other)
 }
 
 /*!
-    Returns \c true if the private key is empty, returns \c false otherwise.
+    Returns \c true if the private key is null, returns \c false otherwise.
 */
-bool QCoapPrivateKey::isEmpty() const
+bool QCoapPrivateKey::isNull() const
 {
     return d->algorithm == QSsl::Opaque ? !d->opaqueKey : d->key.isEmpty();
 }
@@ -236,7 +236,7 @@ QCoapSecurityConfiguration::QCoapSecurityConfiguration(const QCoapSecurityConfig
     object as \a other was pointing to.
 */
 QCoapSecurityConfiguration::QCoapSecurityConfiguration(
-        QCoapSecurityConfiguration &&other) Q_DECL_NOTHROW
+        QCoapSecurityConfiguration &&other) noexcept
     : d(other.d)
 {
     other.d = nullptr;
@@ -262,9 +262,9 @@ QCoapSecurityConfiguration::~QCoapSecurityConfiguration()
 /*!
     Sets the PSK client identity (to be advised to the server) to \a identity.
 
-    \sa identity()
+    \sa preSharedKeyIdentity()
 */
-void QCoapSecurityConfiguration::setIdentity(const QByteArray &identity)
+void QCoapSecurityConfiguration::setPreSharedKeyIdentity(const QByteArray &identity)
 {
     d->identity = identity;
 }
@@ -272,9 +272,9 @@ void QCoapSecurityConfiguration::setIdentity(const QByteArray &identity)
 /*!
     Returns the PSK client identity.
 
-    \sa setIdentity()
+    \sa setPreSharedKeyIdentity()
 */
-QByteArray QCoapSecurityConfiguration::identity() const
+QByteArray QCoapSecurityConfiguration::preSharedKeyIdentity() const
 {
     return d->identity;
 }