diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-27 01:06:47 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-27 01:06:47 (GMT) |
| commit | a5175813f9e5c291c57c68f91bcd54882c08795f (patch) | |
| tree | aa75eef2fcc9a46e6e6ef9a1cc4a80eae382029d /src/declarative/fx/qfxflickable.cpp | |
| parent | 0ef80e4c17595e04db3926be09b504acf1e02075 (diff) | |
| download | Qt-a5175813f9e5c291c57c68f91bcd54882c08795f.zip Qt-a5175813f9e5c291c57c68f91bcd54882c08795f.tar.gz Qt-a5175813f9e5c291c57c68f91bcd54882c08795f.tar.bz2 | |
Replace the use of the obsolete GfxEasing with QEasingCurve.
Diffstat (limited to 'src/declarative/fx/qfxflickable.cpp')
| -rw-r--r-- | src/declarative/fx/qfxflickable.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 5715116..4cd7e88 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -43,7 +43,6 @@ #include "qfxflickable_p.h" #include <QGraphicsSceneMouseEvent> -#include <gfxeasing.h> #include <QPointer> #include <QTimer> @@ -128,11 +127,11 @@ void QFxFlickablePrivate::fixupX() vTime = _tl.time(); if(_moveX.value() > q->minXExtent() || q->maxXExtent() > 0) { - _tl.move(_moveX, q->minXExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); flicked = false; //emit flickingChanged(); } else if(_moveX.value() < q->maxXExtent()) { - _tl.move(_moveX, q->maxXExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveX, q->maxXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); flicked = false; //emit flickingChanged(); } @@ -147,10 +146,10 @@ void QFxFlickablePrivate::fixupY() vTime = _tl.time(); if(_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) { - _tl.move(_moveY, q->minYExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); //emit flickingChanged(); } else if(_moveY.value() < q->maxYExtent()) { - _tl.move(_moveY, q->maxYExtent(), GfxEasing(GfxEasing::InOutQuad), 200); + _tl.move(_moveY, q->maxYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); //emit flickingChanged(); } else { flicked = false; |