diff options
Diffstat (limited to 'src/qml/jsapi/qjsvalue.h')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.h | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/src/qml/jsapi/qjsvalue.h b/src/qml/jsapi/qjsvalue.h index 1844ed0989..065f73f666 100644 --- a/src/qml/jsapi/qjsvalue.h +++ b/src/qml/jsapi/qjsvalue.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml 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 QJSVALUE_H #define QJSVALUE_H @@ -58,7 +22,6 @@ class QJSPrimitiveValue; typedef QList<QJSValue> QJSValueList; namespace QV4 { struct ExecutionEngine; - struct Value; } class QJSPrimitiveValue; @@ -93,11 +56,9 @@ public: ~QJSValue(); QJSValue(const QJSValue &other); -#ifdef Q_COMPILER_RVALUE_REFS inline QJSValue(QJSValue && other) : d(other.d) { other.d = 0; } inline QJSValue &operator=(QJSValue &&other) - { qSwap(d, other.d); return *this; } -#endif + { std::swap(d, other.d); return *this; } QJSValue(bool value); QJSValue(int value); @@ -119,7 +80,10 @@ public: bool isNull() const; bool isString() const; bool isUndefined() const; +#if QT_DEPRECATED_SINCE(6, 9) + QT_DEPRECATED_VERSION_X_6_9("This might return unexpected results; consult documentation for more information") bool isVariant() const; +#endif bool isQObject() const; bool isQMetaObject() const; bool isObject() const; @@ -127,6 +91,7 @@ public: bool isRegExp() const; bool isArray() const; bool isError() const; + bool isUrl() const; QString toString() const; double toNumber() const; |