summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Bugge Monsen <mmonsen@trolltech.com>2009-08-20 14:41:09 +0200
committerMarius Bugge Monsen <mmonsen@trolltech.com>2009-08-20 14:41:09 +0200
commit28ac676c6665ebae08d31d21f0469d23069ed49d (patch)
tree08c94050f8cf806576b0949834533456173028a3
parenta71653d1494c89c6545275d8fb0d7410bb9b7620 (diff)
Update the photoBrowser ViewTransition to compile with the updated Stantes and Transitions API in Qt mainline.
-rw-r--r--examples/photoAlbum/main.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/examples/photoAlbum/main.cpp b/examples/photoAlbum/main.cpp
index 47d53db..02a1abb 100644
--- a/examples/photoAlbum/main.cpp
+++ b/examples/photoAlbum/main.cpp
@@ -106,7 +106,7 @@ class ViewTransition : public QSignalTransition
public:
ViewTransition(QtKineticListController *sender,
const char *signalName,
- const QList<QAbstractState*> &targets,
+ QState *targetState,
QState *sourceState = 0);
~ViewTransition();
@@ -124,11 +124,12 @@ private:
ViewTransition::ViewTransition(QtKineticListController *sender,
const char *signalName,
- const QList<QAbstractState*> &targets,
+ QState *targetState,
QState *sourceState)
- : QSignalTransition(sender, signalName, targets, sourceState),
+ : QSignalTransition(sender, signalName, sourceState),
m_from(0), m_to(0), m_animation(new QPropertyAnimation(0, "geometry", this))
{
+ setTargetState(targetState);
m_animation->setEasingCurve(QEasingCurve::OutElastic);
m_animation->setDuration(750);
addAnimation(m_animation);
@@ -245,8 +246,8 @@ int main(int argc, char *argv[])
ViewState *listState = new ViewState(listView);
ViewState *gridState = new ViewState(gridView);
- ViewTransition *listToGridTransition = new ViewTransition(listController, SIGNAL(itemClicked(int,Qt::MouseButton)), QList<QAbstractState*>() << gridState);
- ViewTransition *gridToListTransition = new ViewTransition(gridController, SIGNAL(itemClicked(int,Qt::MouseButton)), QList<QAbstractState*>() << listState);
+ ViewTransition *listToGridTransition = new ViewTransition(listController, SIGNAL(itemClicked(int,Qt::MouseButton)), gridState);
+ ViewTransition *gridToListTransition = new ViewTransition(gridController, SIGNAL(itemClicked(int,Qt::MouseButton)), listState);
listToGridTransition->setFromView(listView);
listToGridTransition->setToView(gridView);