diff options
Diffstat (limited to 'src/qml/qml/qqmlvaluetype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvaluetype_p.h | 169 |
1 files changed, 90 insertions, 79 deletions
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h index 632405f315..8815c914ce 100644 --- a/src/qml/qml/qqmlvaluetype_p.h +++ b/src/qml/qml/qqmlvaluetype_p.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 QQMLVALUETYPE_P_H #define QQMLVALUETYPE_P_H @@ -51,12 +15,11 @@ // We mean it. // -#include "qqml.h" -#include "qqmlproperty.h" -#include "qqmlproperty_p.h" +#include <QtQml/private/qqmlproperty_p.h> #include <private/qqmlnullablevalue_p.h> #include <private/qmetatype_p.h> +#include <private/qv4referenceobject_p.h> #include <QtCore/qobject.h> #include <QtCore/qrect.h> @@ -67,57 +30,80 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlValueType : public QAbstractDynamicMetaObject +class Q_QML_EXPORT QQmlValueType : public QDynamicMetaObjectData { public: - QQmlValueType() : metaType(QMetaType::UnknownType) {} - QQmlValueType(int userType, const QMetaObject *metaObject); + QQmlValueType() = default; + QQmlValueType(QMetaType type, const QMetaObject *staticMetaObject) + : m_metaType(type), m_staticMetaObject(staticMetaObject) + {} ~QQmlValueType(); - void *create() const { return metaType.create(); } - void destroy(void *gadgetPtr) const { metaType.destroy(gadgetPtr); } + void *create() const { return m_metaType.create(); } + void destroy(void *gadgetPtr) const { m_metaType.destroy(gadgetPtr); } - void construct(void *gadgetPtr, const void *copy) const { metaType.construct(gadgetPtr, copy); } - void destruct(void *gadgetPtr) const { metaType.destruct(gadgetPtr); } + void construct(void *gadgetPtr, const void *copy) const { m_metaType.construct(gadgetPtr, copy); } + void destruct(void *gadgetPtr) const { m_metaType.destruct(gadgetPtr); } - int metaTypeId() const { return metaType.id(); } + QMetaType metaType() const { return m_metaType; } + const QMetaObject *staticMetaObject() const { return m_staticMetaObject; } // ---- dynamic meta object data interface - QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override; + QMetaObject *toDynamicMetaObject(QObject *) override; void objectDestroyed(QObject *) override; int metaCall(QObject *obj, QMetaObject::Call type, int _id, void **argv) override; // ---- -public: - QMetaType metaType; - QMetaObject *dynamicMetaObject = nullptr; +private: + QMetaType m_metaType; + const QMetaObject *m_staticMetaObject = nullptr; + QMetaObject *m_dynamicMetaObject = nullptr; }; -class Q_QML_PRIVATE_EXPORT QQmlGadgetPtrWrapper : public QObject +class Q_QML_EXPORT QQmlGadgetPtrWrapper : public QObject { Q_OBJECT public: static QQmlGadgetPtrWrapper *instance(QQmlEngine *engine, QMetaType type); - QQmlGadgetPtrWrapper(QQmlValueType *valueType, QObject *parent); + QQmlGadgetPtrWrapper(QQmlValueType *valueType, QObject *parent = nullptr); ~QQmlGadgetPtrWrapper(); void read(QObject *obj, int idx); - void write(QObject *obj, int idx, QQmlPropertyData::WriteFlags flags); - QVariant value(); + void write(QObject *obj, int idx, QQmlPropertyData::WriteFlags flags, + int internalIndex = QV4::ReferenceObject::AllProperties) const; + QVariant value() const; void setValue(const QVariant &value); - int metaTypeId() const { return valueType()->metaTypeId(); } + QMetaType metaType() const { return valueType()->metaType(); } int metaCall(QMetaObject::Call type, int id, void **argv); - QMetaProperty property(int index) { return valueType()->property(index); } + + QMetaProperty property(int index) const + { + return valueType()->staticMetaObject()->property(index); + } + + QVariant readOnGadget(const QMetaProperty &property) const + { + return property.readOnGadget(m_gadgetPtr); + } + + void writeOnGadget(const QMetaProperty &property, const QVariant &value) + { + property.writeOnGadget(m_gadgetPtr, value); + } + + void writeOnGadget(const QMetaProperty &property, QVariant &&value) + { + property.writeOnGadget(m_gadgetPtr, std::move(value)); + } private: const QQmlValueType *valueType() const; - void *m_gadgetPtr = nullptr; }; -struct Q_QML_PRIVATE_EXPORT QQmlPointFValueType +struct Q_QML_EXPORT QQmlPointFValueType { QPointF v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -127,16 +113,21 @@ struct Q_QML_PRIVATE_EXPORT QQmlPointFValueType QML_FOREIGN(QPointF) QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlPointFValueType) + QML_STRUCTURED_VALUE public: + QQmlPointFValueType() = default; + Q_INVOKABLE QQmlPointFValueType(const QPoint &point) : v(point) {} Q_INVOKABLE QString toString() const; qreal x() const; qreal y() const; void setX(qreal); void setY(qreal); + + operator QPointF() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlPointValueType +struct Q_QML_EXPORT QQmlPointValueType { QPoint v; Q_PROPERTY(int x READ x WRITE setX FINAL) @@ -146,16 +137,21 @@ struct Q_QML_PRIVATE_EXPORT QQmlPointValueType QML_FOREIGN(QPoint) QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlPointValueType) + QML_STRUCTURED_VALUE public: + QQmlPointValueType() = default; + Q_INVOKABLE QQmlPointValueType(const QPointF &point) : v(point.toPoint()) {} Q_INVOKABLE QString toString() const; int x() const; int y() const; void setX(int); void setY(int); + + operator QPoint() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlSizeFValueType +struct Q_QML_EXPORT QQmlSizeFValueType { QSizeF v; Q_PROPERTY(qreal width READ width WRITE setWidth FINAL) @@ -165,16 +161,21 @@ struct Q_QML_PRIVATE_EXPORT QQmlSizeFValueType QML_FOREIGN(QSizeF) QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlSizeFValueType) + QML_STRUCTURED_VALUE public: + QQmlSizeFValueType() = default; + Q_INVOKABLE QQmlSizeFValueType(const QSize &size) : v(size) {} Q_INVOKABLE QString toString() const; qreal width() const; qreal height() const; void setWidth(qreal); void setHeight(qreal); + + operator QSizeF() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlSizeValueType +struct Q_QML_EXPORT QQmlSizeValueType { QSize v; Q_PROPERTY(int width READ width WRITE setWidth FINAL) @@ -184,16 +185,21 @@ struct Q_QML_PRIVATE_EXPORT QQmlSizeValueType QML_FOREIGN(QSize) QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlSizeValueType) + QML_STRUCTURED_VALUE public: + QQmlSizeValueType() = default; + Q_INVOKABLE QQmlSizeValueType(const QSizeF &size) : v(size.toSize()) {} Q_INVOKABLE QString toString() const; int width() const; int height() const; void setWidth(int); void setHeight(int); + + operator QSize() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlRectFValueType +struct Q_QML_EXPORT QQmlRectFValueType { QRectF v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -209,8 +215,11 @@ struct Q_QML_PRIVATE_EXPORT QQmlRectFValueType QML_FOREIGN(QRectF) QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlRectFValueType) + QML_STRUCTURED_VALUE public: + QQmlRectFValueType() = default; + Q_INVOKABLE QQmlRectFValueType(const QRect &rect) : v(rect) {} Q_INVOKABLE QString toString() const; qreal x() const; qreal y() const; @@ -226,9 +235,11 @@ public: qreal right() const; qreal top() const; qreal bottom() const; + + operator QRectF() const { return v; } }; -struct Q_QML_PRIVATE_EXPORT QQmlRectValueType +struct Q_QML_EXPORT QQmlRectValueType { QRect v; Q_PROPERTY(int x READ x WRITE setX FINAL) @@ -244,8 +255,11 @@ struct Q_QML_PRIVATE_EXPORT QQmlRectValueType QML_FOREIGN(QRect) QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlRectValueType) + QML_STRUCTURED_VALUE public: + QQmlRectValueType() = default; + Q_INVOKABLE QQmlRectValueType(const QRectF &rect) : v(rect.toRect()) {} Q_INVOKABLE QString toString() const; int x() const; int y() const; @@ -261,12 +275,14 @@ public: int right() const; int top() const; int bottom() const; + + operator QRect() const { return v; } }; #if QT_CONFIG(easingcurve) namespace QQmlEasingEnums { -Q_NAMESPACE +Q_NAMESPACE_EXPORT(Q_QML_EXPORT) QML_NAMED_ELEMENT(Easing) QML_ADDED_IN_VERSION(2, 0) @@ -301,7 +317,7 @@ enum Type { Q_ENUM_NS(Type) }; -struct Q_QML_PRIVATE_EXPORT QQmlEasingValueType +struct Q_QML_EXPORT QQmlEasingValueType { QEasingCurve v; Q_GADGET @@ -309,6 +325,7 @@ struct Q_QML_PRIVATE_EXPORT QQmlEasingValueType QML_FOREIGN(QEasingCurve) QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlEasingValueType) + QML_STRUCTURED_VALUE Q_PROPERTY(QQmlEasingEnums::Type type READ type WRITE setType FINAL) Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude FINAL) @@ -327,23 +344,17 @@ public: void setPeriod(qreal); void setBezierCurve(const QVariantList &); QVariantList bezierCurve() const; + + operator QEasingCurve() const { return v; } }; #endif -struct Q_QML_PRIVATE_EXPORT QQmlPropertyValueType +struct QQmlV4ExecutionEnginePtrForeign { - QQmlProperty v; - Q_PROPERTY(QObject *object READ object CONSTANT FINAL) - Q_PROPERTY(QString name READ name CONSTANT FINAL) Q_GADGET QML_ANONYMOUS - QML_FOREIGN(QQmlProperty) - QML_ADDED_IN_VERSION(2, 15) - QML_EXTENDED(QQmlPropertyValueType) - -public: - QObject *object() const; - QString name() const; + QML_FOREIGN(QQmlV4ExecutionEnginePtr) + QML_EXTENDED(QQmlV4ExecutionEnginePtrForeign) }; QT_END_NAMESPACE |