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/qcoapsecurityconfiguration.h | |
parent | bad7ee3d4f329ad258b4ceacdb3818084208cf5f (diff) | |
parent | fd94d8e5673a5d5228aa2d38b605fde7a881332b (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I3ab43e890b692e3266522c4c3f8ea65499df2cbb
Diffstat (limited to 'src/coap/qcoapsecurityconfiguration.h')
-rw-r--r-- | src/coap/qcoapsecurityconfiguration.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/coap/qcoapsecurityconfiguration.h b/src/coap/qcoapsecurityconfiguration.h index 7dc00bf..f935b5e 100644 --- a/src/coap/qcoapsecurityconfiguration.h +++ b/src/coap/qcoapsecurityconfiguration.h @@ -49,17 +49,17 @@ public: QCoapPrivateKey(const Qt::HANDLE &handle); QCoapPrivateKey(const QCoapPrivateKey& other); - QCoapPrivateKey(QCoapPrivateKey&& other) Q_DECL_NOTHROW; + QCoapPrivateKey(QCoapPrivateKey&& other) noexcept; ~QCoapPrivateKey(); - QCoapPrivateKey &operator=(QCoapPrivateKey &&other) Q_DECL_NOTHROW + QCoapPrivateKey &operator=(QCoapPrivateKey &&other) noexcept { swap(other); return *this; } QCoapPrivateKey &operator=(const QCoapPrivateKey &other); - void swap(QCoapPrivateKey &other) Q_DECL_NOTHROW + void swap(QCoapPrivateKey &other) noexcept { qSwap(d, other.d); } - bool isEmpty() const; + bool isNull() const; QByteArray key() const; Qt::HANDLE handle() const; @@ -78,16 +78,16 @@ public: QCoapSecurityConfiguration(const QCoapSecurityConfiguration &other); ~QCoapSecurityConfiguration(); - QCoapSecurityConfiguration(QCoapSecurityConfiguration &&other) Q_DECL_NOTHROW; - QCoapSecurityConfiguration &operator=(QCoapSecurityConfiguration &&other) Q_DECL_NOTHROW + QCoapSecurityConfiguration(QCoapSecurityConfiguration &&other) noexcept; + QCoapSecurityConfiguration &operator=(QCoapSecurityConfiguration &&other) noexcept { swap(other); return *this; } QCoapSecurityConfiguration &operator=(const QCoapSecurityConfiguration &other); - void swap(QCoapSecurityConfiguration &other) Q_DECL_NOTHROW + void swap(QCoapSecurityConfiguration &other) noexcept { qSwap(d, other.d); } - void setIdentity(const QByteArray &identity); - QByteArray identity() const; + void setPreSharedKeyIdentity(const QByteArray &preSharedKeyIdentity); + QByteArray preSharedKeyIdentity() const; void setPreSharedKey(const QByteArray &preSharedKey); QByteArray preSharedKey() const; |