summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketcorsauthenticator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/websockets/qwebsocketcorsauthenticator.cpp')
-rw-r--r--src/websockets/qwebsocketcorsauthenticator.cpp51
1 files changed, 6 insertions, 45 deletions
diff --git a/src/websockets/qwebsocketcorsauthenticator.cpp b/src/websockets/qwebsocketcorsauthenticator.cpp
index 5d1cde4..e2529c2 100644
--- a/src/websockets/qwebsocketcorsauthenticator.cpp
+++ b/src/websockets/qwebsocketcorsauthenticator.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Kurt Pattyn <pattyn.kurt@gmail.com>.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebSockets module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 Kurt Pattyn <pattyn.kurt@gmail.com>.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
/*!
\class QWebSocketCorsAuthenticator
@@ -122,33 +86,30 @@ QWebSocketCorsAuthenticator::operator =(const QWebSocketCorsAuthenticator &other
return *this;
}
-#ifdef Q_COMPILER_RVALUE_REFS
/*!
Move-constructs a QWebSocketCorsAuthenticator, making it point at the same
object \a other was pointing to.
*/
-QWebSocketCorsAuthenticator::QWebSocketCorsAuthenticator(QWebSocketCorsAuthenticator &&other) :
- d_ptr(other.d_ptr.take())
+QWebSocketCorsAuthenticator::QWebSocketCorsAuthenticator(QWebSocketCorsAuthenticator &&other) noexcept :
+ d_ptr(other.d_ptr.release())
{}
/*!
Move-assigns \a other to this instance.
*/
QWebSocketCorsAuthenticator &
-QWebSocketCorsAuthenticator::operator =(QWebSocketCorsAuthenticator &&other)
+QWebSocketCorsAuthenticator::operator =(QWebSocketCorsAuthenticator &&other) noexcept
{
qSwap(d_ptr, other.d_ptr);
return *this;
}
-#endif
-
/*!
Swaps \a other with this authenticator.
This operation is very fast and never fails.
*/
-void QWebSocketCorsAuthenticator::swap(QWebSocketCorsAuthenticator &other)
+void QWebSocketCorsAuthenticator::swap(QWebSocketCorsAuthenticator &other) noexcept
{
if (&other != this)
qSwap(d_ptr, other.d_ptr);