diff options
Diffstat (limited to 'src/core/api/qwebenginescript.h')
| -rw-r--r-- | src/core/api/qwebenginescript.h | 55 |
1 files changed, 9 insertions, 46 deletions
diff --git a/src/core/api/qwebenginescript.h b/src/core/api/qwebenginescript.h index 0c1849dac..9827c4879 100644 --- a/src/core/api/qwebenginescript.h +++ b/src/core/api/qwebenginescript.h @@ -1,49 +1,13 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine 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 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWEBENGINESCRIPT_H #define QWEBENGINESCRIPT_H #include <QtWebEngineCore/qtwebenginecoreglobal.h> -#include <QtCore/QUrl> -#include <QtCore/QObject> -#include <QtCore/QSharedDataPointer> +#include <QtCore/qurl.h> +#include <QtCore/qobject.h> +#include <QtCore/qshareddata.h> namespace QtWebEngineCore { class UserScript; @@ -51,7 +15,8 @@ class UserScript; QT_BEGIN_NAMESPACE -class Q_WEBENGINECORE_EXPORT QWebEngineScript { +class Q_WEBENGINECORE_EXPORT QWebEngineScript +{ Q_GADGET Q_PROPERTY(QString name READ name WRITE setName FINAL) @@ -106,18 +71,16 @@ public: bool operator==(const QWebEngineScript &other) const; inline bool operator!=(const QWebEngineScript &other) const { return !operator==(other); } - void swap(QWebEngineScript &other) { qSwap(d, other.d); } + void swap(QWebEngineScript &other) noexcept { d.swap(other.d); } private: - friend class QQuickWebEngineScriptCollectionPrivate; friend class QWebEngineScriptCollectionPrivate; - friend class QWebEngineScriptCollection; QWebEngineScript(const QtWebEngineCore::UserScript &); QSharedDataPointer<QtWebEngineCore::UserScript> d; }; -Q_DECLARE_TYPEINFO(QWebEngineScript, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QWebEngineScript, Q_RELOCATABLE_TYPE); #ifndef QT_NO_DEBUG_STREAM Q_WEBENGINECORE_EXPORT QDebug operator<<(QDebug, const QWebEngineScript &); |