aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2020-11-10 11:31:49 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2020-11-11 08:59:56 +0100
commit62f180f9589bdedc16bb5c019e4179aa707ad9b3 (patch)
tree6a45e71f8d7c1f0e1b6ea49bb51b19e32d0f6046 /src
parent77abbab225250c3709ab18b077edeb57b533244a (diff)
Adjust to QQmlListProperty using qsizetype
Fixes: QTBUG-88361 Change-Id: I02e5639074247a58a7f53bd135a736cbe6e7d6e4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/timeline/qquickkeyframe.cpp8
-rw-r--r--src/imports/timeline/qquicktimeline.cpp16
2 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp
index fddb082..7671c21 100644
--- a/src/imports/timeline/qquickkeyframe.cpp
+++ b/src/imports/timeline/qquickkeyframe.cpp
@@ -67,8 +67,8 @@ protected:
void loadKeyframes();
static void append_keyframe(QQmlListProperty<QQuickKeyframe> *list, QQuickKeyframe *a);
- static int keyframe_count(QQmlListProperty<QQuickKeyframe> *list);
- static QQuickKeyframe* keyframe_at(QQmlListProperty<QQuickKeyframe> *list, int pos);
+ static qsizetype keyframe_count(QQmlListProperty<QQuickKeyframe> *list);
+ static QQuickKeyframe* keyframe_at(QQmlListProperty<QQuickKeyframe> *list, qsizetype pos);
static void clear_keyframes(QQmlListProperty<QQuickKeyframe> *list);
QList<QQuickKeyframe *> keyframes;
@@ -149,13 +149,13 @@ void QQuickKeyframeGroupPrivate::append_keyframe(QQmlListProperty<QQuickKeyframe
q->reset();
}
-int QQuickKeyframeGroupPrivate::keyframe_count(QQmlListProperty<QQuickKeyframe> *list)
+qsizetype QQuickKeyframeGroupPrivate::keyframe_count(QQmlListProperty<QQuickKeyframe> *list)
{
auto q = static_cast<QQuickKeyframeGroup *>(list->object);
return q->d_func()->keyframes.count();
}
-QQuickKeyframe* QQuickKeyframeGroupPrivate::keyframe_at(QQmlListProperty<QQuickKeyframe> *list, int pos)
+QQuickKeyframe* QQuickKeyframeGroupPrivate::keyframe_at(QQmlListProperty<QQuickKeyframe> *list, qsizetype pos)
{
auto q = static_cast<QQuickKeyframeGroup *>(list->object);
return q->d_func()->keyframes.at(pos);
diff --git a/src/imports/timeline/qquicktimeline.cpp b/src/imports/timeline/qquicktimeline.cpp
index 4dc3091..527c800 100644
--- a/src/imports/timeline/qquicktimeline.cpp
+++ b/src/imports/timeline/qquicktimeline.cpp
@@ -55,13 +55,13 @@ protected:
void disable();
static void append_keyframe(QQmlListProperty<QQuickKeyframeGroup> *list, QQuickKeyframeGroup *a);
- static int keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list);
- static QQuickKeyframeGroup* keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, int pos);
+ static qsizetype keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list);
+ static QQuickKeyframeGroup* keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, qsizetype pos);
static void clear_keyframes(QQmlListProperty<QQuickKeyframeGroup> *list);
static void append_animation(QQmlListProperty<QQuickTimelineAnimation> *list, QQuickTimelineAnimation *a);
- static int animation_count(QQmlListProperty<QQuickTimelineAnimation> *list);
- static QQuickTimelineAnimation* animation_at(QQmlListProperty<QQuickTimelineAnimation> *list, int pos);
+ static qsizetype animation_count(QQmlListProperty<QQuickTimelineAnimation> *list);
+ static QQuickTimelineAnimation* animation_at(QQmlListProperty<QQuickTimelineAnimation> *list, qsizetype pos);
static void clear_animations(QQmlListProperty<QQuickTimelineAnimation> *list);
QList<QQuickKeyframeGroup *> keyframeGroups;
@@ -88,13 +88,13 @@ void QQuickTimelinePrivate::append_keyframe(QQmlListProperty<QQuickKeyframeGroup
q->d_func()->keyframeGroups.append(a);
}
-int QQuickTimelinePrivate::keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list)
+qsizetype QQuickTimelinePrivate::keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list)
{
auto q = static_cast<QQuickTimeline *>(list->object);
return q->d_func()->keyframeGroups.count();
}
-QQuickKeyframeGroup* QQuickTimelinePrivate::keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, int pos)
+QQuickKeyframeGroup* QQuickTimelinePrivate::keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, qsizetype pos)
{
auto q = static_cast<QQuickTimeline *>(list->object);
return q->d_func()->keyframeGroups.at(pos);
@@ -116,13 +116,13 @@ void QQuickTimelinePrivate::append_animation(QQmlListProperty<QQuickTimelineAnim
q->d_func()->animations.append(a);
}
-int QQuickTimelinePrivate::animation_count(QQmlListProperty<QQuickTimelineAnimation> *list)
+qsizetype QQuickTimelinePrivate::animation_count(QQmlListProperty<QQuickTimelineAnimation> *list)
{
auto q = static_cast<QQuickTimeline *>(list->object);
return q->d_func()->animations.count();
}
-QQuickTimelineAnimation* QQuickTimelinePrivate::animation_at(QQmlListProperty<QQuickTimelineAnimation> *list, int pos)
+QQuickTimelineAnimation* QQuickTimelinePrivate::animation_at(QQmlListProperty<QQuickTimelineAnimation> *list, qsizetype pos)
{
auto q = static_cast<QQuickTimeline *>(list->object);
return q->d_func()->animations.at(pos);