Update license headers and add new license files

[contrib/qtwebsockets.git] / src / websockets / qwebsocketcorsauthenticator.h

diff --git a/src/websockets/qwebsocketcorsauthenticator.h b/src/websockets/qwebsocketcorsauthenticator.h
index fb7d957..192bb8c 100644 (file)
--- a/src/websockets/qwebsocketcorsauthenticator.h
+++ b/src/websockets/qwebsocketcorsauthenticator.h
@@ -1,25 +1,40 @@
-/*
-QWebSockets implements the WebSocket protocol as defined in RFC 6455.
-Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+/****************************************************************************
+**
+** Copyright (C) 2014 Kurt Pattyn <pattyn.kurt@gmail.com>.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebSockets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 #ifndef QWEBSOCKETCORSAUTHENTICATOR_H
 #define QWEBSOCKETCORSAUTHENTICATOR_H
 
-#include "qwebsockets_global.h"
+#include "QtWebSockets/qwebsockets_global.h"
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -30,9 +45,16 @@ class Q_WEBSOCKETS_EXPORT QWebSocketCorsAuthenticator
     Q_DECLARE_PRIVATE(QWebSocketCorsAuthenticator)
 
 public:
-    QWebSocketCorsAuthenticator(const QString &origin);
+    explicit QWebSocketCorsAuthenticator(const QString &origin);
     ~QWebSocketCorsAuthenticator();
-    QWebSocketCorsAuthenticator(const QWebSocketCorsAuthenticator &other);
+    explicit QWebSocketCorsAuthenticator(const QWebSocketCorsAuthenticator &other);
+
+#ifdef Q_COMPILER_RVALUE_REFS
+    QWebSocketCorsAuthenticator(QWebSocketCorsAuthenticator &&other);
+    QWebSocketCorsAuthenticator &operator =(QWebSocketCorsAuthenticator &&other);
+#endif
+
+    void swap(QWebSocketCorsAuthenticator &other);
 
     QWebSocketCorsAuthenticator &operator =(const QWebSocketCorsAuthenticator &other);
 
@@ -42,7 +64,7 @@ public:
     bool allowed() const;
 
 private:
-    QWebSocketCorsAuthenticatorPrivate * const d_ptr;
+    QScopedPointer<QWebSocketCorsAuthenticatorPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE