diff options
Diffstat (limited to 'src/qml/qml/qqmlvaluetype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvaluetype_p.h | 314 |
1 files changed, 187 insertions, 127 deletions
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h index 0601237c4b..e6728e0706 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,10 +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> @@ -65,96 +30,176 @@ QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlValueType : public QObject, public QAbstractDynamicMetaObject +class Q_QML_EXPORT QQmlValueType : public QDynamicMetaObjectData { public: - QQmlValueType(); - QQmlValueType(int userType, const QMetaObject *metaObject); - ~QQmlValueType() override; - void read(QObject *, int); - void write(QObject *, int, QQmlPropertyData::WriteFlags flags); - QVariant value(); - void setValue(const QVariant &); + QQmlValueType() = default; + QQmlValueType(QMetaType type, const QMetaObject *staticMetaObject) + : m_metaType(type), m_staticMetaObject(staticMetaObject) + {} + ~QQmlValueType(); + + void *create() const { return m_metaType.create(); } + void destroy(void *gadgetPtr) const { m_metaType.destroy(gadgetPtr); } + + void construct(void *gadgetPtr, const void *copy) const { m_metaType.construct(gadgetPtr, copy); } + void destruct(void *gadgetPtr) const { m_metaType.destruct(gadgetPtr); } + + 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; // ---- private: - const QMetaObject *_metaObject; - void *gadgetPtr; - -public: - QMetaType metaType; + QMetaType m_metaType; + const QMetaObject *m_staticMetaObject = nullptr; + QMetaObject *m_dynamicMetaObject = nullptr; }; -class Q_QML_PRIVATE_EXPORT QQmlValueTypeFactory +class Q_QML_EXPORT QQmlGadgetPtrWrapper : public QObject { + Q_OBJECT public: - static bool isValueType(int idx); - static QQmlValueType *valueType(int idx); - static const QMetaObject *metaObjectForMetaType(int type); + static QQmlGadgetPtrWrapper *instance(QQmlEngine *engine, QMetaType type); + + QQmlGadgetPtrWrapper(QQmlValueType *valueType, QObject *parent = nullptr); + ~QQmlGadgetPtrWrapper(); + + void read(QObject *obj, int idx); + void write(QObject *obj, int idx, QQmlPropertyData::WriteFlags flags, + int internalIndex = QV4::ReferenceObject::AllProperties) const; + QVariant value() const; + void setValue(const QVariant &value); + + QMetaType metaType() const { return valueType()->metaType(); } + int metaCall(QMetaObject::Call type, int id, void **argv); + + 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); + } - static void registerValueTypes(const char *uri, int versionMajor, int versionMinor); + void writeOnGadget(const QMetaProperty &property, QVariant &&value) + { + property.writeOnGadget(m_gadgetPtr, std::move(value)); + } + +private: + const QQmlValueType *valueType() const; + void *m_gadgetPtr = nullptr; }; -struct QQmlPointFValueType +struct Q_QML_EXPORT QQmlPointFValueType { QPointF v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) Q_PROPERTY(qreal y READ y WRITE setY FINAL) Q_GADGET + QML_VALUE_TYPE(point) + QML_FOREIGN(QPointF) + QML_ADDED_IN_VERSION(2, 0) + QML_EXTENDED(QQmlPointFValueType) + QML_STRUCTURED_VALUE + public: + Q_INVOKABLE 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 QQmlPointValueType +struct Q_QML_EXPORT QQmlPointValueType { QPoint v; Q_PROPERTY(int x READ x WRITE setX FINAL) Q_PROPERTY(int y READ y WRITE setY FINAL) Q_GADGET + QML_ANONYMOUS + 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 QQmlSizeFValueType +struct Q_QML_EXPORT QQmlSizeFValueType { QSizeF v; Q_PROPERTY(qreal width READ width WRITE setWidth FINAL) Q_PROPERTY(qreal height READ height WRITE setHeight FINAL) Q_GADGET + QML_VALUE_TYPE(size) + QML_FOREIGN(QSizeF) + QML_ADDED_IN_VERSION(2, 0) + QML_EXTENDED(QQmlSizeFValueType) + QML_STRUCTURED_VALUE + public: + Q_INVOKABLE 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 QQmlSizeValueType +struct Q_QML_EXPORT QQmlSizeValueType { QSize v; Q_PROPERTY(int width READ width WRITE setWidth FINAL) Q_PROPERTY(int height READ height WRITE setHeight FINAL) Q_GADGET + QML_ANONYMOUS + 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 QQmlRectFValueType +struct Q_QML_EXPORT QQmlRectFValueType { QRectF v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -166,7 +211,15 @@ struct QQmlRectFValueType Q_PROPERTY(qreal top READ top DESIGNABLE false FINAL) Q_PROPERTY(qreal bottom READ bottom DESIGNABLE false FINAL) Q_GADGET + QML_VALUE_TYPE(rect) + QML_FOREIGN(QRectF) + QML_ADDED_IN_VERSION(2, 0) + QML_EXTENDED(QQmlRectFValueType) + QML_STRUCTURED_VALUE + public: + Q_INVOKABLE QQmlRectFValueType() = default; + Q_INVOKABLE QQmlRectFValueType(const QRect &rect) : v(rect) {} Q_INVOKABLE QString toString() const; qreal x() const; qreal y() const; @@ -182,9 +235,11 @@ public: qreal right() const; qreal top() const; qreal bottom() const; + + operator QRectF() const { return v; } }; -struct QQmlRectValueType +struct Q_QML_EXPORT QQmlRectValueType { QRect v; Q_PROPERTY(int x READ x WRITE setX FINAL) @@ -196,7 +251,16 @@ struct QQmlRectValueType Q_PROPERTY(int top READ top DESIGNABLE false FINAL) Q_PROPERTY(int bottom READ bottom DESIGNABLE false FINAL) Q_GADGET + QML_ANONYMOUS + 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; void setX(int); @@ -211,91 +275,87 @@ public: int right() const; int top() const; int bottom() const; + + operator QRect() const { return v; } }; #if QT_CONFIG(easingcurve) -struct QQmlEasingValueType +namespace QQmlEasingEnums +{ +Q_NAMESPACE_EXPORT(Q_QML_EXPORT) +QML_NAMED_ELEMENT(Easing) +QML_ADDED_IN_VERSION(2, 0) + +enum Type { + Linear = QEasingCurve::Linear, + InQuad = QEasingCurve::InQuad, OutQuad = QEasingCurve::OutQuad, + InOutQuad = QEasingCurve::InOutQuad, OutInQuad = QEasingCurve::OutInQuad, + InCubic = QEasingCurve::InCubic, OutCubic = QEasingCurve::OutCubic, + InOutCubic = QEasingCurve::InOutCubic, OutInCubic = QEasingCurve::OutInCubic, + InQuart = QEasingCurve::InQuart, OutQuart = QEasingCurve::OutQuart, + InOutQuart = QEasingCurve::InOutQuart, OutInQuart = QEasingCurve::OutInQuart, + InQuint = QEasingCurve::InQuint, OutQuint = QEasingCurve::OutQuint, + InOutQuint = QEasingCurve::InOutQuint, OutInQuint = QEasingCurve::OutInQuint, + InSine = QEasingCurve::InSine, OutSine = QEasingCurve::OutSine, + InOutSine = QEasingCurve::InOutSine, OutInSine = QEasingCurve::OutInSine, + InExpo = QEasingCurve::InExpo, OutExpo = QEasingCurve::OutExpo, + InOutExpo = QEasingCurve::InOutExpo, OutInExpo = QEasingCurve::OutInExpo, + InCirc = QEasingCurve::InCirc, OutCirc = QEasingCurve::OutCirc, + InOutCirc = QEasingCurve::InOutCirc, OutInCirc = QEasingCurve::OutInCirc, + InElastic = QEasingCurve::InElastic, OutElastic = QEasingCurve::OutElastic, + InOutElastic = QEasingCurve::InOutElastic, OutInElastic = QEasingCurve::OutInElastic, + InBack = QEasingCurve::InBack, OutBack = QEasingCurve::OutBack, + InOutBack = QEasingCurve::InOutBack, OutInBack = QEasingCurve::OutInBack, + InBounce = QEasingCurve::InBounce, OutBounce = QEasingCurve::OutBounce, + InOutBounce = QEasingCurve::InOutBounce, OutInBounce = QEasingCurve::OutInBounce, + InCurve = QEasingCurve::InCurve, OutCurve = QEasingCurve::OutCurve, + SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve, + BezierSpline = QEasingCurve::BezierSpline, + + Bezier = BezierSpline // Evil! Don't use this! +}; +Q_ENUM_NS(Type) +}; + +struct Q_QML_EXPORT QQmlEasingValueType { QEasingCurve v; Q_GADGET - QML_NAMED_ELEMENT(Easing) - QML_UNCREATABLE("Use the Type enum.") + QML_ANONYMOUS + QML_FOREIGN(QEasingCurve) + QML_ADDED_IN_VERSION(2, 0) + QML_EXTENDED(QQmlEasingValueType) + QML_STRUCTURED_VALUE - Q_PROPERTY(QQmlEasingValueType::Type type READ type WRITE setType FINAL) + Q_PROPERTY(QQmlEasingEnums::Type type READ type WRITE setType FINAL) Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude FINAL) Q_PROPERTY(qreal overshoot READ overshoot WRITE setOvershoot FINAL) Q_PROPERTY(qreal period READ period WRITE setPeriod FINAL) Q_PROPERTY(QVariantList bezierCurve READ bezierCurve WRITE setBezierCurve FINAL) + public: - enum Type { - Linear = QEasingCurve::Linear, - InQuad = QEasingCurve::InQuad, OutQuad = QEasingCurve::OutQuad, - InOutQuad = QEasingCurve::InOutQuad, OutInQuad = QEasingCurve::OutInQuad, - InCubic = QEasingCurve::InCubic, OutCubic = QEasingCurve::OutCubic, - InOutCubic = QEasingCurve::InOutCubic, OutInCubic = QEasingCurve::OutInCubic, - InQuart = QEasingCurve::InQuart, OutQuart = QEasingCurve::OutQuart, - InOutQuart = QEasingCurve::InOutQuart, OutInQuart = QEasingCurve::OutInQuart, - InQuint = QEasingCurve::InQuint, OutQuint = QEasingCurve::OutQuint, - InOutQuint = QEasingCurve::InOutQuint, OutInQuint = QEasingCurve::OutInQuint, - InSine = QEasingCurve::InSine, OutSine = QEasingCurve::OutSine, - InOutSine = QEasingCurve::InOutSine, OutInSine = QEasingCurve::OutInSine, - InExpo = QEasingCurve::InExpo, OutExpo = QEasingCurve::OutExpo, - InOutExpo = QEasingCurve::InOutExpo, OutInExpo = QEasingCurve::OutInExpo, - InCirc = QEasingCurve::InCirc, OutCirc = QEasingCurve::OutCirc, - InOutCirc = QEasingCurve::InOutCirc, OutInCirc = QEasingCurve::OutInCirc, - InElastic = QEasingCurve::InElastic, OutElastic = QEasingCurve::OutElastic, - InOutElastic = QEasingCurve::InOutElastic, OutInElastic = QEasingCurve::OutInElastic, - InBack = QEasingCurve::InBack, OutBack = QEasingCurve::OutBack, - InOutBack = QEasingCurve::InOutBack, OutInBack = QEasingCurve::OutInBack, - InBounce = QEasingCurve::InBounce, OutBounce = QEasingCurve::OutBounce, - InOutBounce = QEasingCurve::InOutBounce, OutInBounce = QEasingCurve::OutInBounce, - InCurve = QEasingCurve::InCurve, OutCurve = QEasingCurve::OutCurve, - SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve, - Bezier = QEasingCurve::BezierSpline - }; - Q_ENUM(Type) - - Type type() const; + QQmlEasingEnums::Type type() const; qreal amplitude() const; qreal overshoot() const; qreal period() const; - void setType(Type); + void setType(QQmlEasingEnums::Type); void setAmplitude(qreal); void setOvershoot(qreal); void setPeriod(qreal); void setBezierCurve(const QVariantList &); QVariantList bezierCurve() const; + + operator QEasingCurve() const { return v; } }; #endif -template<typename T> -int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMinor, const char *qmlName) +struct QQmlV4ExecutionEnginePtrForeign { - QByteArray name(T::staticMetaObject.className()); - - QByteArray pointerName(name + '*'); - - QQmlPrivate::RegisterType type = { - 0, - - qRegisterNormalizedMetaType<T *>(pointerName.constData()), 0, 0, nullptr, - - QString(), - - uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject, - - nullptr, nullptr, - - 0, 0, 0, - - nullptr, nullptr, - - nullptr, - 0 - }; - - return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); -} + Q_GADGET + QML_ANONYMOUS + QML_FOREIGN(QQmlV4ExecutionEnginePtr) + QML_EXTENDED(QQmlV4ExecutionEnginePtrForeign) +}; QT_END_NAMESPACE |