diff options
Diffstat (limited to 'src/quick/items/qquickanimatedimage_p_p.h')
| -rw-r--r-- | src/quick/items/qquickanimatedimage_p_p.h | 66 |
1 files changed, 13 insertions, 53 deletions
diff --git a/src/quick/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h index 1a74f67424..1bd5729b93 100644 --- a/src/quick/items/qquickanimatedimage_p_p.h +++ b/src/quick/items/qquickanimatedimage_p_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 QQUICKANIMATEDIMAGE_P_P_H #define QQUICKANIMATEDIMAGE_P_P_H @@ -70,30 +34,26 @@ class QQuickAnimatedImagePrivate : public QQuickImagePrivate public: QQuickAnimatedImagePrivate() - : playing(true), paused(false), oldPlaying(false), padding(0) - , presetCurrentFrame(0), speed(1.0), currentSourceSize(0, 0), movie(nullptr) -#if QT_CONFIG(qml_network) - , reply(nullptr), redirectCount(0) -#endif + : playing(true), paused(false), oldPlaying(false) { } QQuickPixmap *infoForCurrentFrame(QQmlEngine *engine); void setMovie(QMovie *movie); + void clearCache(); + + qreal speed = 1; + QMovie *movie = nullptr; + int presetCurrentFrame = 0; + QMap<int, QQuickPixmap *> frameMap; + +#if QT_CONFIG(qml_network) + QNetworkReply *reply = nullptr; +#endif bool playing : 1; bool paused : 1; bool oldPlaying : 1; - unsigned padding: 29; - int presetCurrentFrame; - qreal speed; - QSize currentSourceSize; - QMovie *movie; -#if QT_CONFIG(qml_network) - QNetworkReply *reply; - int redirectCount; -#endif - QMap<int, QQuickPixmap *> frameMap; }; QT_END_NAMESPACE |