summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/declarative/fx/qfxflickable.cpp4
-rw-r--r--src/declarative/fx/qfxflickable_p.h4
-rw-r--r--src/declarative/fx/qfxpathview_p.h4
-rw-r--r--src/declarative/timeline/qmltimeline.cpp24
-rw-r--r--src/declarative/timeline/qmltimeline.h18
5 files changed, 27 insertions, 27 deletions
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp
index 4cd7e88..a04fe97 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qfxflickable.cpp
@@ -100,8 +100,8 @@ QFxFlickablePrivate::QFxFlickablePrivate()
, vTime(0), atXEnd(false), atXBeginning(true), pageXPosition(0.), pageWidth(0.)
, atYEnd(false), atYBeginning(true), pageYPosition(0.), pageHeight(0.)
{
- fixupXEvent = GfxEvent::gfxEvent<QFxFlickablePrivate, &QFxFlickablePrivate::fixupX>(&_moveX, this);
- fixupYEvent = GfxEvent::gfxEvent<QFxFlickablePrivate, &QFxFlickablePrivate::fixupY>(&_moveY, this);
+ fixupXEvent = QmlTimeLineEvent::timeLineEvent<QFxFlickablePrivate, &QFxFlickablePrivate::fixupX>(&_moveX, this);
+ fixupYEvent = QmlTimeLineEvent::timeLineEvent<QFxFlickablePrivate, &QFxFlickablePrivate::fixupY>(&_moveY, this);
}
void QFxFlickablePrivate::init()
diff --git a/src/declarative/fx/qfxflickable_p.h b/src/declarative/fx/qfxflickable_p.h
index 59450e0..ce880f9 100644
--- a/src/declarative/fx/qfxflickable_p.h
+++ b/src/declarative/fx/qfxflickable_p.h
@@ -116,8 +116,8 @@ public:
qreal velocityX;
qreal velocityY;
QTime pressTime;
- GfxEvent fixupXEvent;
- GfxEvent fixupYEvent;
+ QmlTimeLineEvent fixupXEvent;
+ QmlTimeLineEvent fixupYEvent;
int maxVelocity;
bool locked;
QFxFlickable::DragMode dragMode;
diff --git a/src/declarative/fx/qfxpathview_p.h b/src/declarative/fx/qfxpathview_p.h
index 31933c0..43f4ffa 100644
--- a/src/declarative/fx/qfxpathview_p.h
+++ b/src/declarative/fx/qfxpathview_p.h
@@ -79,7 +79,7 @@ public:
, firstIndex(0), pathItems(-1), pathOffset(0), model(0)
, moveReason(Other)
{
- fixupOffsetEvent = GfxEvent::gfxEvent<QFxPathViewPrivate, &QFxPathViewPrivate::fixOffset>(&moveOffset, this);
+ fixupOffsetEvent = QmlTimeLineEvent::timeLineEvent<QFxPathViewPrivate, &QFxPathViewPrivate::fixOffset>(&moveOffset, this);
}
void init()
@@ -116,7 +116,7 @@ public:
qreal dragMargin;
QmlTimeLine tl;
GfxValueProxy<QFxPathViewPrivate> moveOffset;
- GfxEvent fixupOffsetEvent;
+ QmlTimeLineEvent fixupOffsetEvent;
int firstIndex;
int pathItems;
int pathOffset;
diff --git a/src/declarative/timeline/qmltimeline.cpp b/src/declarative/timeline/qmltimeline.cpp
index 2006fd0..7cbb3ce 100644
--- a/src/declarative/timeline/qmltimeline.cpp
+++ b/src/declarative/timeline/qmltimeline.cpp
@@ -58,12 +58,12 @@ QT_BEGIN_NAMESPACE
struct Update {
Update(GfxValue *_g, qreal _v)
: g(_g), v(_v) {}
- Update(const GfxEvent &_e)
+ Update(const QmlTimeLineEvent &_e)
: g(0), v(0), e(_e) {}
GfxValue *g;
qreal v;
- GfxEvent e;
+ QmlTimeLineEvent e;
};
struct QmlTimeLinePrivate
@@ -82,7 +82,7 @@ struct QmlTimeLinePrivate
};
Op() {}
Op(Type t, int l, qreal v, qreal v2, int o,
- const GfxEvent &ev = GfxEvent(), const QEasingCurve &es = QEasingCurve())
+ const QmlTimeLineEvent &ev = QmlTimeLineEvent(), const QEasingCurve &es = QEasingCurve())
: type(t), length(l), value(v), value2(v2), order(o), event(ev),
easing(es) {}
Op(const Op &o)
@@ -101,7 +101,7 @@ struct QmlTimeLinePrivate
qreal value2;
int order;
- GfxEvent event;
+ QmlTimeLineEvent event;
QEasingCurve easing;
};
struct TimeLine
@@ -367,7 +367,7 @@ void QmlTimeLine::pause(QmlTimeLineObject &obj, int time)
/*!
Execute the \a event.
*/
-void QmlTimeLine::execute(const GfxEvent &event)
+void QmlTimeLine::execute(const QmlTimeLineEvent &event)
{
QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Execute, 0, 0, 0., d->order++, event);
d->add(*event.eventObject(), op);
@@ -469,7 +469,7 @@ void QmlTimeLine::move(GfxValue &gfxValue, qreal destination, int time)
void QmlTimeLine::move(GfxValue &gfxValue, qreal destination, const QEasingCurve &easing, int time)
{
if(time <= 0) return;
- QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, GfxEvent(), easing);
+ QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, QmlTimeLineEvent(), easing);
d->add(gfxValue, op);
}
@@ -491,7 +491,7 @@ void QmlTimeLine::moveBy(GfxValue &gfxValue, qreal change, int time)
void QmlTimeLine::moveBy(GfxValue &gfxValue, qreal change, const QEasingCurve &easing, int time)
{
if(time <= 0) return;
- QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, GfxEvent(), easing);
+ QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, QmlTimeLineEvent(), easing);
d->add(gfxValue, op);
}
@@ -912,17 +912,17 @@ QmlTimeLineObject::~QmlTimeLineObject()
}
}
-GfxEvent::GfxEvent()
+QmlTimeLineEvent::QmlTimeLineEvent()
: d0(0), d1(0), d2(0)
{
}
-GfxEvent::GfxEvent(const GfxEvent &o)
+QmlTimeLineEvent::QmlTimeLineEvent(const QmlTimeLineEvent &o)
: d0(o.d0), d1(o.d1), d2(o.d2)
{
}
-GfxEvent &GfxEvent::operator=(const GfxEvent &o)
+QmlTimeLineEvent &QmlTimeLineEvent::operator=(const QmlTimeLineEvent &o)
{
d0 = o.d0;
d1 = o.d1;
@@ -930,12 +930,12 @@ GfxEvent &GfxEvent::operator=(const GfxEvent &o)
return *this;
}
-void GfxEvent::execute() const
+void QmlTimeLineEvent::execute() const
{
d0(d1);
}
-QmlTimeLineObject *GfxEvent::eventObject() const
+QmlTimeLineObject *QmlTimeLineEvent::eventObject() const
{
return d2;
}
diff --git a/src/declarative/timeline/qmltimeline.h b/src/declarative/timeline/qmltimeline.h
index 77980fb..603669c 100644
--- a/src/declarative/timeline/qmltimeline.h
+++ b/src/declarative/timeline/qmltimeline.h
@@ -54,7 +54,7 @@ QT_MODULE(Declarative)
class QEasingCurve;
class GfxValue;
-class GfxEvent;
+class QmlTimeLineEvent;
struct QmlTimeLinePrivate;
class QmlTimeLineObject;
class Q_DECLARATIVE_EXPORT QmlTimeLine : public QAbstractAnimation
@@ -69,7 +69,7 @@ public:
void setSyncMode(SyncMode);
void pause(QmlTimeLineObject &, int);
- void execute(const GfxEvent &);
+ void execute(const QmlTimeLineEvent &);
void set(GfxValue &, qreal);
int accel(GfxValue &, qreal velocity, qreal accel);
@@ -141,14 +141,14 @@ private:
qreal _v;
};
-class Q_DECLARATIVE_EXPORT GfxEvent
+class Q_DECLARATIVE_EXPORT QmlTimeLineEvent
{
public:
- GfxEvent();
- GfxEvent(const GfxEvent &o);
+ QmlTimeLineEvent();
+ QmlTimeLineEvent(const QmlTimeLineEvent &o);
template<class T, void (T::*method)()>
- GfxEvent(QmlTimeLineObject *b, T *c)
+ QmlTimeLineEvent(QmlTimeLineObject *b, T *c)
{
d0 = &callFunc<T, method>;
d1 = (void *)c;
@@ -156,16 +156,16 @@ public:
}
template<class T, void (T::*method)()>
- static GfxEvent gfxEvent(QmlTimeLineObject *b, T *c)
+ static QmlTimeLineEvent timeLineEvent(QmlTimeLineObject *b, T *c)
{
- GfxEvent rv;
+ QmlTimeLineEvent rv;
rv.d0 = &callFunc<T, method>;
rv.d1 = (void *)c;
rv.d2 = b;
return rv;
}
- GfxEvent &operator=(const GfxEvent &o);
+ QmlTimeLineEvent &operator=(const QmlTimeLineEvent &o);
void execute() const;
QmlTimeLineObject *eventObject() const;
generated by cgit v0.12 at 2024-10-20 12:55:56 (GMT)