diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2024-04-11 10:17:52 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2024-04-12 20:32:59 +0200 |
commit | 99c7fe45be00b694da4041c5a06e5484f2985dc6 (patch) | |
tree | 9e8a9d6cf436ae5f49a12249cf0ae0b160403ea3 /src/quick | |
parent | 235bbe8c644415a83e3f5103eff7c4ef4181164a (diff) |
QtQml: Add a wrapper builtin for QQmlV4Function*
This way qmltyperegistrar can recognize it and refrain from warning
about it.
Task-number: QTBUG-101143
Change-Id: I598140e7e90dbd3e27a78c26eff3d46f0fd3e989
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 6 | ||||
-rw-r--r-- | src/quick/items/context2d/qquickcanvasitem_p.h | 7 | ||||
-rw-r--r-- | src/quick/items/qquickdrag.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickdrag_p.h | 5 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 12 | ||||
-rw-r--r-- | src/quick/items/qquickitem.h | 9 | ||||
-rw-r--r-- | src/quick/items/qquickloader_p.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquickloader_p_p.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput_p.h | 2 |
10 files changed, 22 insertions, 27 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index bdc6bf0fb3..6ae5914970 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -810,7 +810,7 @@ QSGTextureProvider *QQuickCanvasItem::textureProvider() const */ -void QQuickCanvasItem::getContext(QQmlV4Function *args) +void QQuickCanvasItem::getContext(QQmlV4FunctionPtr args) { Q_D(QQuickCanvasItem); @@ -854,7 +854,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args) scene. */ -void QQuickCanvasItem::requestAnimationFrame(QQmlV4Function *args) +void QQuickCanvasItem::requestAnimationFrame(QQmlV4FunctionPtr args) { QV4::Scope scope(args->v4engine()); QV4::ScopedFunctionObject f(scope, (*args)[0]); @@ -883,7 +883,7 @@ void QQuickCanvasItem::requestAnimationFrame(QQmlV4Function *args) This function will cancel the animation callback referenced by \a handle. */ -void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV4Function *args) +void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV4FunctionPtr args) { QV4::Scope scope(args->v4engine()); QV4::ScopedValue v(scope, (*args)[0]); diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index d84f3e4030..300039743d 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -31,7 +31,6 @@ class QQuickCanvasContext; class QQuickCanvasItemPrivate; class QQuickPixmap; -class QQmlV4Function; class QQuickCanvasPixmap final : public QQmlRefCounted<QQuickCanvasPixmap> { @@ -110,10 +109,10 @@ public: QImage toImage(const QRectF& rect = QRectF()) const; - Q_INVOKABLE void getContext(QQmlV4Function *args); + Q_INVOKABLE void getContext(QQmlV4FunctionPtr args); - Q_INVOKABLE void requestAnimationFrame(QQmlV4Function *args); - Q_INVOKABLE void cancelRequestAnimationFrame(QQmlV4Function *args); + Q_INVOKABLE void requestAnimationFrame(QQmlV4FunctionPtr args); + Q_INVOKABLE void cancelRequestAnimationFrame(QQmlV4FunctionPtr args); Q_INVOKABLE void requestPaint(); Q_INVOKABLE void markDirty(const QRectF& dirtyRect = QRectF()); diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp index 1d7ae9b4ca..dbe443b2b3 100644 --- a/src/quick/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.cpp @@ -580,7 +580,7 @@ void QQuickDragAttachedPrivate::start(Qt::DropActions supportedActions) property for the started sequence. */ -void QQuickDragAttached::start(QQmlV4Function *args) +void QQuickDragAttached::start(QQmlV4FunctionPtr args) { Q_D(QQuickDragAttached); if (d->inEvent) { @@ -856,7 +856,7 @@ Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedAct property for the started sequence. */ -void QQuickDragAttached::startDrag(QQmlV4Function *args) +void QQuickDragAttached::startDrag(QQmlV4FunctionPtr args) { Q_D(QQuickDragAttached); diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h index cc08a03ccc..fa73e91485 100644 --- a/src/quick/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_p.h @@ -119,7 +119,6 @@ private: friend class QQuickDragAttachedPrivate; }; -class QQmlV4Function; class QQuickDragAttached; class Q_QUICK_EXPORT QQuickDrag : public QObject { @@ -274,8 +273,8 @@ public: bool event(QEvent *event) override; public Q_SLOTS: - void start(QQmlV4Function *); - void startDrag(QQmlV4Function *); + void start(QQmlV4FunctionPtr); + void startDrag(QQmlV4FunctionPtr); void cancel(); Q_SIGNALS: diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 5b74a3ddb3..5e92403dc2 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -4621,7 +4621,7 @@ void QQuickItem::ensurePolished() } #if QT_DEPRECATED_SINCE(6, 5) -static bool unwrapMapFromToFromItemArgs(QQmlV4Function *args, const QQuickItem *itemForWarning, const QString &functionNameForWarning, +static bool unwrapMapFromToFromItemArgs(QQmlV4FunctionPtr args, const QQuickItem *itemForWarning, const QString &functionNameForWarning, QQuickItem **itemObj, qreal *x, qreal *y, qreal *w, qreal *h, bool *isRect) { QV4::ExecutionEngine *v4 = args->v4engine(); @@ -4727,7 +4727,7 @@ static bool unwrapMapFromToFromItemArgs(QQmlV4Function *args, const QQuickItem * /*! \internal */ -void QQuickItem::mapFromItem(QQmlV4Function *args) const +void QQuickItem::mapFromItem(QQmlV4FunctionPtr args) const { QV4::ExecutionEngine *v4 = args->v4engine(); QV4::Scope scope(v4); @@ -4785,7 +4785,7 @@ QTransform QQuickItem::itemTransform(QQuickItem *other, bool *ok) const /*! \internal */ -void QQuickItem::mapToItem(QQmlV4Function *args) const +void QQuickItem::mapToItem(QQmlV4FunctionPtr args) const { QV4::ExecutionEngine *v4 = args->v4engine(); QV4::Scope scope(v4); @@ -4803,7 +4803,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const args->setReturnValue(rv.asReturnedValue()); } -static bool unwrapMapFromToFromGlobalArgs(QQmlV4Function *args, const QQuickItem *itemForWarning, const QString &functionNameForWarning, qreal *x, qreal *y) +static bool unwrapMapFromToFromGlobalArgs(QQmlV4FunctionPtr args, const QQuickItem *itemForWarning, const QString &functionNameForWarning, qreal *x, qreal *y) { QV4::ExecutionEngine *v4 = args->v4engine(); if (args->length() != 1 && args->length() != 2) { @@ -4861,7 +4861,7 @@ static bool unwrapMapFromToFromGlobalArgs(QQmlV4Function *args, const QQuickItem /*! \internal */ -void QQuickItem::mapFromGlobal(QQmlV4Function *args) const +void QQuickItem::mapFromGlobal(QQmlV4FunctionPtr args) const { QV4::ExecutionEngine *v4 = args->v4engine(); QV4::Scope scope(v4); @@ -4891,7 +4891,7 @@ void QQuickItem::mapFromGlobal(QQmlV4Function *args) const /*! \internal */ -void QQuickItem::mapToGlobal(QQmlV4Function *args) const +void QQuickItem::mapToGlobal(QQmlV4FunctionPtr args) const { QV4::ExecutionEngine *v4 = args->v4engine(); QV4::Scope scope(v4); diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 9cdbc4c397..fdf09d30b0 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -45,7 +45,6 @@ private: class QCursor; class QQuickItemLayer; -class QQmlV4Function; class QQuickState; class QQuickAnchorLine; class QQuickTransition; @@ -323,7 +322,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectFromItem") - void mapFromItem(QQmlV4Function*) const; + void mapFromItem(QQmlV4FunctionPtr) const; #endif Q_INVOKABLE QPointF mapFromItem(const QQuickItem *item, const QPointF &point) const; // overloads mainly exist for QML @@ -333,7 +332,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectToItem") - void mapToItem(QQmlV4Function*) const; + void mapToItem(QQmlV4FunctionPtr) const; #endif Q_INVOKABLE QPointF mapToItem(const QQuickItem *item, const QPointF &point) const; // overloads mainly exist for QML @@ -343,7 +342,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use the typed overload") - Q_REVISION(2, 7) void mapFromGlobal(QQmlV4Function*) const; + Q_REVISION(2, 7) void mapFromGlobal(QQmlV4FunctionPtr) const; #endif Q_REVISION(2, 7) Q_INVOKABLE QPointF mapFromGlobal(qreal x, qreal y) const; // overload mainly exists for QML @@ -351,7 +350,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use the typed overload") - Q_REVISION(2, 7) void mapToGlobal(QQmlV4Function*) const; + Q_REVISION(2, 7) void mapToGlobal(QQmlV4FunctionPtr) const; #endif Q_REVISION(2, 7) Q_INVOKABLE QPointF mapToGlobal(qreal x, qreal y) const; // overload only exist for QML diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h index 3dcbb244eb..c3d2015aed 100644 --- a/src/quick/items/qquickloader_p.h +++ b/src/quick/items/qquickloader_p.h @@ -20,7 +20,6 @@ QT_BEGIN_NAMESPACE class QQuickLoaderPrivate; -class QQmlV4Function; class Q_QUICK_EXPORT QQuickLoader : public QQuickImplicitSizeItem { Q_OBJECT diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h index 43257e0c84..39011f1162 100644 --- a/src/quick/items/qquickloader_p_p.h +++ b/src/quick/items/qquickloader_p_p.h @@ -27,7 +27,6 @@ QT_BEGIN_NAMESPACE class QQuickLoaderPrivate; -class QQmlV4Function; class QQuickLoaderIncubator : public QQmlIncubator { public: diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 3edfb6aa1b..ef00451788 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1434,7 +1434,7 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const Returns the position before the character that is nearest x. */ -void QQuickTextInput::positionAt(QQmlV4Function *args) const +void QQuickTextInput::positionAt(QQmlV4FunctionPtr args) const { Q_D(const QQuickTextInput); diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 8380652231..5212e6117e 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -144,7 +144,7 @@ public: Q_ENUM(RenderType) //Auxilliary functions needed to control the TextInput from QML - Q_INVOKABLE void positionAt(QQmlV4Function *args) const; + Q_INVOKABLE void positionAt(QQmlV4FunctionPtr args) const; Q_INVOKABLE QRectF positionToRectangle(int pos) const; Q_INVOKABLE void moveCursorSelection(int pos); Q_INVOKABLE void moveCursorSelection(int pos, SelectionMode mode); |