aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-30 16:12:27 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-30 16:39:38 +0100
commit3a4ad41be883a804218494b93b146bf8c6fa4589 (patch)
tree7cce215331dd6ecc2815587841139eab377d3866 /src
parent7bc66b0cdb18223092c1de525839dd81783ec058 (diff)
Replace old Q_DECL_NOEXCEPT macros with modern C++
Change-Id: Iab7b0c45ef3e5c8c042aa906f5eb4d9142b0f6d9 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qdefaultmaskgenerator_p.cpp4
-rw-r--r--src/websockets/qdefaultmaskgenerator_p.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/websockets/qdefaultmaskgenerator_p.cpp b/src/websockets/qdefaultmaskgenerator_p.cpp
index 7763868..03e7654 100644
--- a/src/websockets/qdefaultmaskgenerator_p.cpp
+++ b/src/websockets/qdefaultmaskgenerator_p.cpp
@@ -84,7 +84,7 @@ QDefaultMaskGenerator::~QDefaultMaskGenerator()
/*!
\internal
*/
-bool QDefaultMaskGenerator::seed() Q_DECL_NOEXCEPT
+bool QDefaultMaskGenerator::seed() noexcept
{
return true;
}
@@ -94,7 +94,7 @@ bool QDefaultMaskGenerator::seed() Q_DECL_NOEXCEPT
\internal
*/
-quint32 QDefaultMaskGenerator::nextMask() Q_DECL_NOEXCEPT
+quint32 QDefaultMaskGenerator::nextMask() noexcept
{
quint32 value = QRandomGenerator::global()->generate();
while (Q_UNLIKELY(value == 0)) {
diff --git a/src/websockets/qdefaultmaskgenerator_p.h b/src/websockets/qdefaultmaskgenerator_p.h
index 3ad4990..db1185e 100644
--- a/src/websockets/qdefaultmaskgenerator_p.h
+++ b/src/websockets/qdefaultmaskgenerator_p.h
@@ -64,8 +64,8 @@ public:
explicit QDefaultMaskGenerator(QObject *parent = nullptr);
~QDefaultMaskGenerator() override;
- bool seed() Q_DECL_NOEXCEPT override;
- quint32 nextMask() Q_DECL_NOEXCEPT override;
+ bool seed() noexcept override;
+ quint32 nextMask() noexcept override;
};
QT_END_NAMESPACE