diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:06:12 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 22:30:59 +0200 |
| commit | 0475460102411979ab51c365cb2bec2c05b69cb4 (patch) | |
| tree | 73b7dbe85249da2bd339cd19b0c584894d3901c7 /src/corelib/animation | |
| parent | e114e580e751b5deb19ab489a8b11f830ff6356f (diff) | |
Use QList instead of QVector in corelib
Applied to headers only. Source file to be changed separately.
Omitted statemachine for now to avoid conflicts.
Omitted qmetatype.h for now - to be handled later.
Task-number: QTBUG-84469
Change-Id: I317376037a62467c313467d92955ad0b7473aa97
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qsequentialanimationgroup_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/animation/qvariantanimation.h | 8 | ||||
| -rw-r--r-- | src/corelib/animation/qvariantanimation_p.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h index c082d6b524..b788771fe5 100644 --- a/src/corelib/animation/qsequentialanimationgroup_p.h +++ b/src/corelib/animation/qsequentialanimationgroup_p.h @@ -92,7 +92,7 @@ public: // this is the actual duration of uncontrolled animations // it helps seeking and even going forward - QVector<int> actualDuration; + QList<int> actualDuration; void restart(); int lastLoop; diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index e47fa14b1c..f1721b8a65 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -40,11 +40,11 @@ #ifndef QVARIANTANIMATION_H #define QVARIANTANIMATION_H -#include <QtCore/qeasingcurve.h> #include <QtCore/qabstractanimation.h> -#include <QtCore/qvector.h> -#include <QtCore/qvariant.h> +#include <QtCore/qeasingcurve.h> +#include <QtCore/qlist.h> #include <QtCore/qpair.h> +#include <QtCore/qvariant.h> QT_REQUIRE_CONFIG(animation); @@ -62,7 +62,7 @@ class Q_CORE_EXPORT QVariantAnimation : public QAbstractAnimation public: typedef QPair<qreal, QVariant> KeyValue; - typedef QVector<KeyValue> KeyValues; + typedef QList<KeyValue> KeyValues; QVariantAnimation(QObject *parent = nullptr); ~QVariantAnimation(); diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h index 57b59cf876..3425777ba5 100644 --- a/src/corelib/animation/qvariantanimation_p.h +++ b/src/corelib/animation/qvariantanimation_p.h @@ -54,7 +54,6 @@ #include "qvariantanimation.h" #include <QtCore/qeasingcurve.h> #include <QtCore/qmetaobject.h> -#include <QtCore/qvector.h> #include "private/qabstractanimation_p.h" |