Fix compile error on Solaris

QTBUG-8267.  Remove templating from QmlTimeLineEvent class (and rename
it to QmlTimeLineCallback to more represent what it is).

5 files changed, 27 insertions, 14 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
index 6825f89..bfee8d4 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
@@ -132,8 +132,6 @@ QmlGraphicsFlickablePrivate::QmlGraphicsFlickablePrivate()
     , horizontalVelocity(this), verticalVelocity(this), vTime(0), visibleArea(0)
     , flickDirection(QmlGraphicsFlickable::AutoFlickDirection)
 {
-    fixupXEvent = QmlTimeLineEvent::timeLineEvent<QmlGraphicsFlickablePrivate, &QmlGraphicsFlickablePrivate::fixupX>(&_moveX, this);
-    fixupYEvent = QmlTimeLineEvent::timeLineEvent<QmlGraphicsFlickablePrivate, &QmlGraphicsFlickablePrivate::fixupY>(&_moveY, this);
 }
 
 void QmlGraphicsFlickablePrivate::init()
@@ -176,7 +174,7 @@ void QmlGraphicsFlickablePrivate::flickX(qreal velocity)
         }
         timeline.reset(_moveX);
         timeline.accel(_moveX, v, deceleration, maxDistance);
-        timeline.execute(fixupXEvent);
+        timeline.callback(QmlTimeLineCallback(&_moveX, fixupX_callback, this));
         if (!flicked) {
             flicked = true;
             emit q->flickingChanged();
@@ -214,7 +212,7 @@ void QmlGraphicsFlickablePrivate::flickY(qreal velocity)
         }
         timeline.reset(_moveY);
         timeline.accel(_moveY, v, deceleration, maxDistance);
-        timeline.execute(fixupYEvent);
+        timeline.callback(QmlTimeLineCallback(&_moveY, fixupY_callback, this));
         if (!flicked) {
             flicked = true;
             emit q->flickingChanged();
@@ -255,6 +253,16 @@ void QmlGraphicsFlickablePrivate::fixupX()
     vTime = timeline.time();
 }
 
+void QmlGraphicsFlickablePrivate::fixupY_callback(void *data)
+{
+    ((QmlGraphicsFlickablePrivate *)data)->fixupY();
+}
+
+void QmlGraphicsFlickablePrivate::fixupX_callback(void *data)
+{
+    ((QmlGraphicsFlickablePrivate *)data)->fixupX();
+}
+
 void QmlGraphicsFlickablePrivate::fixupY()
 {
     Q_Q(QmlGraphicsFlickable);
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
index 0c98f7b..a76ee8a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
@@ -110,8 +110,6 @@ public:
     qreal velocityX;
     qreal velocityY;
     QTime pressTime;
-    QmlTimeLineEvent fixupXEvent;
-    QmlTimeLineEvent fixupYEvent;
     qreal deceleration;
     qreal maxVelocity;
     QTime velocityTime;
@@ -125,6 +123,9 @@ public:
     int pressDelay;
     int fixupDuration;
 
+    static void fixupY_callback(void *);
+    static void fixupX_callback(void *);
+
     void updateVelocity();
     struct Velocity : public QmlTimeLineValue
     {
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index c646d49..108ac75 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -1200,7 +1200,7 @@ void QmlGraphicsListViewPrivate::flickX(qreal velocity)
             }
             timeline.reset(_moveX);
             timeline.accel(_moveX, v, accel, maxDistance + overshootDist);
-            timeline.execute(fixupXEvent);
+            timeline.callback(QmlTimeLineCallback(&_moveX, fixupX_callback, this));
             flicked = true;
             emit q->flickingChanged();
             emit q->flickStarted();
@@ -1226,7 +1226,7 @@ void QmlGraphicsListViewPrivate::flickX(qreal velocity)
             }
             timeline.reset(_moveX);
             timeline.accelDistance(_moveX, v, -dist + (v < 0 ? -overshootDist : overshootDist));
-            timeline.execute(fixupXEvent);
+            timeline.callback(QmlTimeLineCallback(&_moveX, fixupX_callback, this));
         }
     } else {
         correctFlick = false;
@@ -1298,7 +1298,7 @@ void QmlGraphicsListViewPrivate::flickY(qreal velocity)
             }
             timeline.reset(_moveY);
             timeline.accel(_moveY, v, accel, maxDistance + overshootDist);
-            timeline.execute(fixupYEvent);
+            timeline.callback(QmlTimeLineCallback(&_moveY, fixupY_callback, this));
             flicked = true;
             emit q->flickingChanged();
             emit q->flickStarted();
@@ -1324,7 +1324,7 @@ void QmlGraphicsListViewPrivate::flickY(qreal velocity)
             }
             timeline.reset(_moveY);
             timeline.accelDistance(_moveY, v, -dist + (v < 0 ? -overshootDist : overshootDist));
-            timeline.execute(fixupYEvent);
+            timeline.callback(QmlTimeLineCallback(&_moveY, fixupY_callback, this));
         }
     } else {
         correctFlick = false;
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
index f862555..aba184d 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
@@ -524,7 +524,7 @@ void QmlGraphicsPathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
         qreal dist = qAbs(velocity/2 - qmlMod(velocity/2, qreal(100.0 / d->model->count()) - inc));
         d->moveOffset.setValue(d->_offset);
         d->tl.accel(d->moveOffset, velocity, 10, dist);
-        d->tl.execute(d->fixupOffsetEvent);
+        d->tl.callback(QmlTimeLineCallback(&d->moveOffset, d->fixOffsetCallback, d));
     } else {
         d->fixOffset();
     }
@@ -886,6 +886,11 @@ void QmlGraphicsPathViewPrivate::updateCurrent()
     }
 }
 
+void QmlGraphicsPathViewPrivate::fixOffsetCallback(void *d)
+{
+    ((QmlGraphicsPathViewPrivate *)d)->fixOffset();
+}
+
 void QmlGraphicsPathViewPrivate::fixOffset()
 {
     Q_Q(QmlGraphicsPathView);
@@ -938,7 +943,7 @@ void QmlGraphicsPathViewPrivate::snapToCurrent()
             rounds++;
         tl.move(moveOffset, targetOffset + 100.0*(-rounds), QEasingCurve(QEasingCurve::InOutQuad),
                 int(100*items.count()*qMax((qreal)(2.0/items.count()),(qreal)qAbs(rounds))));
-        tl.execute(fixupOffsetEvent);
+        tl.callback(QmlTimeLineCallback(&moveOffset, fixOffsetCallback, this));
         return;
     }
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
index 723d2d5..c635833 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
@@ -82,7 +82,6 @@ public:
         , firstIndex(0), pathItems(-1), pathOffset(0), requestedIndex(-1)
         , moveReason(Other)
     {
-        fixupOffsetEvent = QmlTimeLineEvent::timeLineEvent<QmlGraphicsPathViewPrivate, &QmlGraphicsPathViewPrivate::fixOffset>(&moveOffset, this);
     }
 
     void init()
@@ -104,6 +103,7 @@ public:
 
     int calcCurrentIndex();
     void updateCurrent();
+    static void fixOffsetCallback(void*);
     void fixOffset();
     void setOffset(qreal offset);
     void regenerate();
@@ -127,7 +127,6 @@ public:
     qreal dragMargin;
     QmlTimeLine tl;
     QmlTimeLineValueProxy<QmlGraphicsPathViewPrivate> moveOffset;
-    QmlTimeLineEvent fixupOffsetEvent;
     int firstIndex;
     int pathItems;
     int pathOffset;