diff options
Diffstat (limited to 'src/quick/items/context2d/qquickcanvasitem_p.h')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem_p.h | 56 |
1 files changed, 9 insertions, 47 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index 1972a9a507..300039743d 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_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 QtQuick 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 QQUICKCANVASITEM_P_H #define QQUICKCANVASITEM_P_H @@ -68,7 +32,7 @@ class QQuickCanvasContext; class QQuickCanvasItemPrivate; class QQuickPixmap; -class QQuickCanvasPixmap : public QQmlRefCount +class QQuickCanvasPixmap final : public QQmlRefCounted<QQuickCanvasPixmap> { public: QQuickCanvasPixmap(const QImage& image); @@ -145,17 +109,17 @@ 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()); - Q_INVOKABLE bool save(const QString &filename) const; + Q_INVOKABLE bool save(const QString &filename, const QSizeF &imageSize = QSizeF()) const; Q_INVOKABLE QString toDataURL(const QString& type = QLatin1String("image/png")) const; - QQmlRefPointer<QQuickCanvasPixmap> loadedPixmap(const QUrl& url); + QQmlRefPointer<QQuickCanvasPixmap> loadedPixmap(const QUrl& url, QSizeF sourceSize = QSizeF()); bool isTextureProvider() const override; QSGTextureProvider *textureProvider() const override; @@ -174,7 +138,7 @@ Q_SIGNALS: void imageLoaded(); public Q_SLOTS: - void loadImage(const QUrl& url); + void loadImage(const QUrl& url, QSizeF sourceSize = QSizeF()); void unloadImage(const QUrl& url); bool isImageLoaded(const QUrl& url) const; bool isImageLoading(const QUrl& url) const; @@ -221,6 +185,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCanvasItem) - #endif //QQUICKCANVASITEM_P_H |