Merge commit 'qt/master' into kinetic-graphicseffect

Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/auto.pro
author: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> 2009-08-07 12:31:58 (GMT)
committer: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> 2009-08-07 12:31:58 (GMT)
commit: 103334ced3b0cb6e69a1ed3075d9b81e591f37e9 (patch)
tree: c7e36b012a042ce864556f9851cb1220d9f385c5 /examples
parent: a4391dfd2aef38e3a3d37bee07900296ced2521c (diff)
parent: 490f135caa35831646dac7e00f1c9422cb09aca9 (diff)
download: Qt-103334ced3b0cb6e69a1ed3075d9b81e591f37e9.zip
Qt-103334ced3b0cb6e69a1ed3075d9b81e591f37e9.tar.gz
Qt-103334ced3b0cb6e69a1ed3075d9b81e591f37e9.tar.bz2
134 files changed, 2251 insertions, 8386 deletions
diff --git a/examples/animation/animation.pro b/examples/animation/animation.pro
index 9a2874b..c72c532 100644
--- a/examples/animation/animation.pro
+++ b/examples/animation/animation.pro
@@ -7,7 +7,6 @@ SUBDIRS          += \
                  moveblocks \
                  states \
                  stickman \
-                 sub-attaq
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/animation
diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp
index c761d87..700916d 100644
--- a/examples/animation/stickman/lifecycle.cpp
+++ b/examples/animation/stickman/lifecycle.cpp
@@ -56,8 +56,9 @@ public:
     {
     }
     KeyPressTransition(GraphicsView *receiver, Qt::Key key, QAbstractState *target)
-        : QSignalTransition(receiver, SIGNAL(keyPressed(int)), QList<QAbstractState*>() << target), m_key(key)
+        : QSignalTransition(receiver, SIGNAL(keyPressed(int))), m_key(key)
     {
+        setTargetState(target);
     }
 
     virtual bool eventTest(QEvent *e)
@@ -78,8 +79,9 @@ class LightningStrikesTransition: public QEventTransition
 {
 public:
     LightningStrikesTransition(QAbstractState *target)
-        : QEventTransition(this, QEvent::Timer, QList<QAbstractState*>() << target)
+        : QEventTransition(this, QEvent::Timer)
     {
+        setTargetState(target);
         qsrand((uint)QDateTime::currentDateTime().toTime_t());
         startTimer(1000);
     }
diff --git a/examples/animation/sub-attaq/animationmanager.cpp b/examples/animation/sub-attaq/animationmanager.cpp
deleted file mode 100644
index 13266f9..0000000
--- a/examples/animation/sub-attaq/animationmanager.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "animationmanager.h"
-
-//Qt
-#include <QtCore/QAbstractAnimation>
-#include <QtCore/QDebug>
-
-// the universe's only animation manager
-AnimationManager *AnimationManager::instance = 0;
-
-AnimationManager::AnimationManager()
-{
-}
-
-AnimationManager *AnimationManager::self()
-{
-    if (!instance)
-        instance = new AnimationManager;
-    return instance;
-}
-
-void AnimationManager::registerAnimation(QAbstractAnimation *anim)
-{
-    animations.append(anim);
-}
-
-void AnimationManager::unregisterAnimation(QAbstractAnimation *anim)
-{
-    animations.removeAll(anim);
-}
-
-void AnimationManager::unregisterAllAnimations()
-{
-    animations.clear();
-}
-
-void AnimationManager::pauseAll()
-{
-    foreach (QAbstractAnimation* animation, animations)
-    {
-        if (animation->state() == QAbstractAnimation::Running)
-            animation->pause();
-    }
-}
-void AnimationManager::resumeAll()
-{
-    foreach (QAbstractAnimation* animation, animations)
-    {
-        if (animation->state() == QAbstractAnimation::Paused)
-            animation->resume();
-    }
-}
diff --git a/examples/animation/sub-attaq/animationmanager.h b/examples/animation/sub-attaq/animationmanager.h
deleted file mode 100644
index 63ecae6..0000000
--- a/examples/animation/sub-attaq/animationmanager.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ANIMATIONMANAGER_H
-#define ANIMATIONMANAGER_H
-
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-class QAbstractAnimation;
-QT_END_NAMESPACE
-
-class AnimationManager : public QObject
-{
-Q_OBJECT
-public:
-    AnimationManager();
-    void registerAnimation(QAbstractAnimation *anim);
-    void unregisterAnimation(QAbstractAnimation *anim);
-    void unregisterAllAnimations();
-    static AnimationManager *self();
-
-public slots:
-    void pauseAll();
-    void resumeAll();
-
-private:
-    static AnimationManager *instance;
-    QList<QAbstractAnimation *> animations;
-};
-
-#endif // ANIMATIONMANAGER_H
diff --git a/examples/animation/sub-attaq/boat.cpp b/examples/animation/sub-attaq/boat.cpp
deleted file mode 100644
index 68e646e..0000000
--- a/examples/animation/sub-attaq/boat.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "boat.h"
-#include "boat_p.h"
-#include "bomb.h"
-#include "pixmapitem.h"
-#include "graphicsscene.h"
-#include "animationmanager.h"
-#include "custompropertyanimation.h"
-#include "qanimationstate.h"
-
-//Qt
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QStateMachine>
-#include <QtCore/QHistoryState>
-#include <QtCore/QFinalState>
-#include <QtCore/QState>
-#include <QtCore/QSequentialAnimationGroup>
-
-static QAbstractAnimation *setupDestroyAnimation(Boat *boat)
-{
-    QSequentialAnimationGroup *group = new QSequentialAnimationGroup(boat);
-#if QT_VERSION >=0x040500
-    PixmapItem *step1 = new PixmapItem(QString("explosion/boat/step1"),GraphicsScene::Big, boat);
-    step1->setZValue(6);
-    PixmapItem *step2 = new PixmapItem(QString("explosion/boat/step2"),GraphicsScene::Big, boat);
-    step2->setZValue(6);
-    PixmapItem *step3 = new PixmapItem(QString("explosion/boat/step3"),GraphicsScene::Big, boat);
-    step3->setZValue(6);
-    PixmapItem *step4 = new PixmapItem(QString("explosion/boat/step4"),GraphicsScene::Big, boat);
-    step4->setZValue(6);
-    step1->setOpacity(0);
-    step2->setOpacity(0);
-    step3->setOpacity(0);
-    step4->setOpacity(0);
-    CustomPropertyAnimation *anim1 = new CustomPropertyAnimation(boat);
-    anim1->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim1->setDuration(100);
-    anim1->setEndValue(1);
-    CustomPropertyAnimation *anim2 = new CustomPropertyAnimation(boat);
-    anim2->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim2->setDuration(100);
-    anim2->setEndValue(1);
-    CustomPropertyAnimation *anim3 = new CustomPropertyAnimation(boat);
-    anim3->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim3->setDuration(100);
-    anim3->setEndValue(1);
-    CustomPropertyAnimation *anim4 = new CustomPropertyAnimation(boat);
-    anim4->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim4->setDuration(100);
-    anim4->setEndValue(1);
-    CustomPropertyAnimation *anim5 = new CustomPropertyAnimation(boat);
-    anim5->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim5->setDuration(100);
-    anim5->setEndValue(0);
-    CustomPropertyAnimation *anim6 = new CustomPropertyAnimation(boat);
-    anim6->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim6->setDuration(100);
-    anim6->setEndValue(0);
-    CustomPropertyAnimation *anim7 = new CustomPropertyAnimation(boat);
-    anim7->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim7->setDuration(100);
-    anim7->setEndValue(0);
-    CustomPropertyAnimation *anim8 = new CustomPropertyAnimation(boat);
-    anim8->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim8->setDuration(100);
-    anim8->setEndValue(0);
-    group->addAnimation(anim1);
-    group->addAnimation(anim2);
-    group->addAnimation(anim3);
-    group->addAnimation(anim4);
-    group->addAnimation(anim5);
-    group->addAnimation(anim6);
-    group->addAnimation(anim7);
-    group->addAnimation(anim8);
-#else
-    // work around for a bug where we don't transition if the duration is zero.
-    QtPauseAnimation *anim = new QtPauseAnimation(group);
-    anim->setDuration(1);
-    group->addAnimation(anim);
-#endif
-    AnimationManager::self()->registerAnimation(group);
-    return group;
-}
-
-
-
-Boat::Boat(QGraphicsItem * parent, Qt::WindowFlags wFlags)
-    : QGraphicsWidget(parent,wFlags), speed(0), bombsAlreadyLaunched(0), direction(Boat::None), movementAnimation(0)
-{
-    pixmapItem = new PixmapItem(QString("boat"),GraphicsScene::Big, this);
-    setZValue(4);
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    setFlags(QGraphicsItem::ItemIsMovable |  QGraphicsItem::ItemIsFocusable);
-    resize(pixmapItem->boundingRect().size());
-
-    //The movement animation used to animate the boat
-    movementAnimation = new QPropertyAnimation(this, "pos");
-
-    //The movement animation used to animate the boat
-    destroyAnimation = setupDestroyAnimation(this);
-
-    //We setup the state machien of the boat
-    machine = new QStateMachine(this);
-    QState *moving = new QState(machine);
-    StopState *stopState = new StopState(this, moving);
-    machine->setInitialState(moving);
-    moving->setInitialState(stopState);
-    MoveStateRight *moveStateRight = new MoveStateRight(this, moving);
-    MoveStateLeft *moveStateLeft = new MoveStateLeft(this, moving);
-    LaunchStateRight *launchStateRight = new LaunchStateRight(this, machine);
-    LaunchStateLeft *launchStateLeft = new LaunchStateLeft(this, machine);
-
-    //then setup the transitions for the rightMove state
-    KeyStopTransition *leftStopRight = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Left);
-    leftStopRight->setTargetState(stopState);
-    KeyMoveTransition *leftMoveRight = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Left);
-    leftMoveRight->setTargetState(moveStateRight);
-    KeyMoveTransition *rightMoveRight = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right);
-    rightMoveRight->setTargetState(moveStateRight);
-    KeyMoveTransition *rightMoveStop = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right);
-    rightMoveStop->setTargetState(moveStateRight);
-
-    //then setup the transitions for the leftMove state
-    KeyStopTransition *rightStopLeft = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Right);
-    rightStopLeft->setTargetState(stopState);
-    KeyMoveTransition *rightMoveLeft = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right);
-    rightMoveLeft->setTargetState(moveStateLeft);
-    KeyMoveTransition *leftMoveLeft = new KeyMoveTransition(this, QEvent::KeyPress,Qt::Key_Left);
-    leftMoveLeft->setTargetState(moveStateLeft);
-    KeyMoveTransition *leftMoveStop = new KeyMoveTransition(this, QEvent::KeyPress,Qt::Key_Left);
-    leftMoveStop->setTargetState(moveStateLeft);
-
-    //We set up the right move state
-    moveStateRight->addTransition(leftStopRight);
-    moveStateRight->addTransition(leftMoveRight);
-    moveStateRight->addTransition(rightMoveRight);
-    stopState->addTransition(rightMoveStop);
-
-    //We set up the left move state
-    moveStateLeft->addTransition(rightStopLeft);
-    moveStateLeft->addTransition(leftMoveLeft);
-    moveStateLeft->addTransition(rightMoveLeft);
-    stopState->addTransition(leftMoveStop);
-
-    //The animation is finished, it means we reached the border of the screen, the boat is stopped so we move to the stop state
-    moveStateLeft->addTransition(movementAnimation, SIGNAL(finished()), stopState);
-    moveStateRight->addTransition(movementAnimation, SIGNAL(finished()), stopState);
-
-    //We set up the keys for dropping bombs
-    KeyLaunchTransition *upFireLeft = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up);
-    upFireLeft->setTargetState(launchStateRight);
-    KeyLaunchTransition *upFireRight = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up);
-    upFireRight->setTargetState(launchStateRight);
-    KeyLaunchTransition *upFireStop = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up);
-    upFireStop->setTargetState(launchStateRight);
-    KeyLaunchTransition *downFireLeft = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down);
-    downFireLeft->setTargetState(launchStateLeft);
-    KeyLaunchTransition *downFireRight = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down);
-    downFireRight->setTargetState(launchStateLeft);
-    KeyLaunchTransition *downFireMove = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down);
-    downFireMove->setTargetState(launchStateLeft);
-
-    //We set up transitions for fire up
-    moveStateRight->addTransition(upFireRight);
-    moveStateLeft->addTransition(upFireLeft);
-    stopState->addTransition(upFireStop);
-
-    //We set up transitions for fire down
-    moveStateRight->addTransition(downFireRight);
-    moveStateLeft->addTransition(downFireLeft);
-    stopState->addTransition(downFireMove);
-
-    //Finally the launch state should come back to its original state
-    QHistoryState *historyState = new QHistoryState(moving);
-    launchStateLeft->addTransition(historyState);
-    launchStateRight->addTransition(historyState);
-
-    QFinalState *final = new QFinalState(machine);
-
-    //This state play the destroyed animation
-    QAnimationState *destroyedState = new QAnimationState(machine);
-    destroyedState->setAnimation(destroyAnimation);
-
-    //Play a nice animation when the boat is destroyed
-    moving->addTransition(this, SIGNAL(boatDestroyed()),destroyedState);
-
-    //Transition to final state when the destroyed animation is finished
-    destroyedState->addTransition(destroyedState, SIGNAL(animationFinished()), final);
-
-    //The machine has finished to be executed, then the boat is dead
-    connect(machine,SIGNAL(finished()),this, SIGNAL(boatExecutionFinished()));
-
-}
-
-void Boat::run()
-{
-    //We register animations
-    AnimationManager::self()->registerAnimation(movementAnimation);
-    AnimationManager::self()->registerAnimation(destroyAnimation);
-    machine->start();
-}
-
-void Boat::stop()
-{
-    movementAnimation->stop();
-    machine->stop();
-}
-
-void Boat::updateBoatMovement()
-{
-    if (speed == 0 || direction == Boat::None) {
-        movementAnimation->stop();
-        return;
-    }
-
-    movementAnimation->stop();
-    movementAnimation->setStartValue(pos());
-
-    if (direction == Boat::Left) {
-        movementAnimation->setEndValue(QPointF(0,y()));
-        movementAnimation->setDuration(x()/speed*15);
-    }
-    else /*if (direction == Boat::Right)*/ {
-        movementAnimation->setEndValue(QPointF(scene()->width()-size().width(),y()));
-        movementAnimation->setDuration((scene()->width()-size().width()-x())/speed*15);
-    }
-    movementAnimation->start();
-}
-
-void Boat::destroy()
-{
-    movementAnimation->stop();
-    emit boatDestroyed();
-}
-
-int Boat::bombsLaunched() const
-{
-    return bombsAlreadyLaunched;
-}
-
-void Boat::setBombsLaunched(int number)
-{
-    if (number > MAX_BOMB) {
-        qWarning("Boat::setBombsLaunched : It impossible to launch that number of bombs");
-        return;
-    }
-    bombsAlreadyLaunched = number;
-}
-
-int Boat::currentSpeed() const
-{
-    return speed;
-}
-
-void Boat::setCurrentSpeed(int speed)
-{
-    if (speed > 3 || speed < 0) {
-        qWarning("Boat::setCurrentSpeed: The boat can't run on that speed");
-        return;
-    }
-    this->speed = speed;
-}
-
-enum Boat::Movement Boat::currentDirection() const
-{
-    return direction;
-}
-
-void Boat::setCurrentDirection(Movement direction)
-{
-    this->direction = direction;
-}
-
-int Boat::type() const
-{
-    return Type;
-}
diff --git a/examples/animation/sub-attaq/boat.h b/examples/animation/sub-attaq/boat.h
deleted file mode 100644
index f6b1a90..0000000
--- a/examples/animation/sub-attaq/boat.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __BOAT__H__
-#define __BOAT__H__
-
-//Qt
-#include <QtCore/QObject>
-#include <QtGui/QKeyEvent>
-
-#include <QtGui/QGraphicsWidget>
-
-class PixmapItem;
-class Bomb;
-QT_BEGIN_NAMESPACE
-class QVariantAnimation;
-class QAbstractAnimation;
-class QStateMachine;
-QT_END_NAMESPACE
-
-class Boat : public QGraphicsWidget
-{
-Q_OBJECT
-public:
-    enum Movement {
-       None = 0,
-       Left,
-       Right
-    };
-    enum { Type = UserType + 2 };
-    Boat(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
-    void destroy();
-    void run();
-    void stop();
-
-    int bombsLaunched() const;
-    void setBombsLaunched(int number);
-
-    int currentSpeed() const;
-    void setCurrentSpeed(int speed);
-
-    enum Movement currentDirection() const;
-    void setCurrentDirection(Movement direction);
-
-    void updateBoatMovement();
-
-    virtual int type() const;
-
-signals:
-    void boatDestroyed();
-    void boatExecutionFinished();
-
-private:
-    int speed;
-    int bombsAlreadyLaunched;
-    Movement direction;
-    QVariantAnimation *movementAnimation;
-    QAbstractAnimation *destroyAnimation;
-    QStateMachine *machine;
-    PixmapItem *pixmapItem;
-};
-
-#endif //__BOAT__H__
diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h
deleted file mode 100644
index 4e962fc..0000000
--- a/examples/animation/sub-attaq/boat_p.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef BOAT_P_H
-#define BOAT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-//Own
-#include "bomb.h"
-#include "graphicsscene.h"
-
-// Qt
-#include <QtGui/QKeyEventTransition>
-
-static const int MAX_BOMB = 5;
-
-
-//These transtion test if we have to stop the boat (i.e current speed is 1)
-class KeyStopTransition : public QKeyEventTransition
-{
-public:
-    KeyStopTransition(Boat *boat, QEvent::Type type, int key)
-    : QKeyEventTransition(boat, type, key)
-    {
-        this->boat = boat;
-        this->key = key;
-    }
-protected:
-    virtual bool eventTest(QEvent *event)
-    {
-        Q_UNUSED(event);
-        if (!QKeyEventTransition::eventTest(event))
-            return false;
-        if (boat->currentSpeed() == 1)
-            return true;
-        else
-            return false;
-    }
-private:
-    Boat * boat;
-    int key;
-};
-
-//These transtion test if we have to move the boat (i.e current speed was 0 or another value)
- class KeyMoveTransition : public QKeyEventTransition
-{
-public:
-    KeyMoveTransition(Boat *boat, QEvent::Type type, int key)
-    : QKeyEventTransition(boat, type, key)
-    {
-        this->boat = boat;
-        this->key = key;
-    }
-protected:
-    virtual bool eventTest(QEvent *event)
-    {
-        Q_UNUSED(event);
-        if (!QKeyEventTransition::eventTest(event))
-            return false;
-        if (boat->currentSpeed() >= 0)
-            return true;
-        else
-            return false;
-
-    }
-    void onTransition(QEvent *)
-    {
-        //We decrease the speed if needed
-        if (key == Qt::Key_Left && boat->currentDirection() == Boat::Right)
-            boat->setCurrentSpeed(boat->currentSpeed() - 1);
-        else if (key == Qt::Key_Right && boat->currentDirection() == Boat::Left)
-            boat->setCurrentSpeed(boat->currentSpeed() - 1);
-        else if (boat->currentSpeed() < 3)
-            boat->setCurrentSpeed(boat->currentSpeed() + 1);
-        boat->updateBoatMovement();
-    }
-private:
-    Boat * boat;
-    int key;
-};
-
-//This transition trigger the bombs launch
- class KeyLaunchTransition : public QKeyEventTransition
-{
-public:
-    KeyLaunchTransition(Boat *boat, QEvent::Type type, int key)
-    : QKeyEventTransition(boat, type, key)
-    {
-        this->boat = boat;
-        this->key = key;
-    }
-protected:
-    virtual bool eventTest(QEvent *event)
-    {
-        Q_UNUSED(event);
-        if (!QKeyEventTransition::eventTest(event))
-            return false;
-        //We have enough bomb?
-        if (boat->bombsLaunched() < MAX_BOMB)
-            return true;
-        else
-            return false;
-    }
-private:
-    Boat * boat;
-    int key;
-};
-
-//This state is describing when the boat is moving right
-class MoveStateRight : public QState
-{
-public:
-    MoveStateRight(Boat *boat,QState *parent = 0) : QState(parent)
-    {
-        this->boat = boat;
-    }
-protected:
-    void onEntry(QEvent *)
-    {
-        boat->setCurrentDirection(Boat::Right);
-        boat->updateBoatMovement();
-    }
-private:
-    Boat * boat;
-};
-
- //This state is describing when the boat is moving left
-class MoveStateLeft : public QState
-{
-public:
-    MoveStateLeft(Boat *boat,QState *parent = 0) : QState(parent)
-    {
-        this->boat = boat;
-    }
-protected:
-    void onEntry(QEvent *)
-    {
-        boat->setCurrentDirection(Boat::Left);
-        boat->updateBoatMovement();
-    }
-private:
-    Boat * boat;
-};
-
-//This state is describing when the boat is in a stand by position
-class StopState : public QState
-{
-public:
-    StopState(Boat *boat,QState *parent = 0) : QState(parent)
-    {
-        this->boat = boat;
-    }
-protected:
-    void onEntry(QEvent *)
-    {
-        boat->setCurrentSpeed(0);
-        boat->setCurrentDirection(Boat::None);
-        boat->updateBoatMovement();
-    }
-private:
-    Boat * boat;
-};
-
-//This state is describing the launch of the torpedo on the right
-class LaunchStateRight : public QState
-{
-public:
-    LaunchStateRight(Boat *boat,QState *parent = 0) : QState(parent)
-    {
-        this->boat = boat;
-    }
-protected:
-    void onEntry(QEvent *)
-    {
-        Bomb *b = new Bomb();
-        b->setPos(boat->x()+boat->size().width(),boat->y());
-        GraphicsScene *scene = static_cast<GraphicsScene *>(boat->scene());
-        scene->addItem(b);
-        b->launch(Bomb::Right);
-        boat->setBombsLaunched(boat->bombsLaunched() + 1);
-    }
-private:
-    Boat * boat;
-};
-
-//This state is describing the launch of the torpedo on the left
-class LaunchStateLeft : public QState
-{
-public:
-    LaunchStateLeft(Boat *boat,QState *parent = 0) : QState(parent)
-    {
-        this->boat = boat;
-    }
-protected:
-    void onEntry(QEvent *)
-    {
-        Bomb *b = new Bomb();
-        b->setPos(boat->x() - b->size().width(), boat->y());
-        GraphicsScene *scene = static_cast<GraphicsScene *>(boat->scene());
-        scene->addItem(b);
-        b->launch(Bomb::Left);
-        boat->setBombsLaunched(boat->bombsLaunched() + 1);
-    }
-private:
-    Boat * boat;
-};
-
-#endif // BOAT_P_H
diff --git a/examples/animation/sub-attaq/bomb.cpp b/examples/animation/sub-attaq/bomb.cpp
deleted file mode 100644
index e92a723..0000000
--- a/examples/animation/sub-attaq/bomb.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "bomb.h"
-#include "submarine.h"
-#include "pixmapitem.h"
-#include "animationmanager.h"
-#include "qanimationstate.h"
-
-//Qt
-#include <QtCore/QSequentialAnimationGroup>
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QStateMachine>
-#include <QtCore/QFinalState>
-
-Bomb::Bomb(QGraphicsItem * parent, Qt::WindowFlags wFlags)
-    : QGraphicsWidget(parent,wFlags), launchAnimation(0)
-{
-    pixmapItem = new PixmapItem(QString("bomb"),GraphicsScene::Big, this);
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    setFlags(QGraphicsItem::ItemIsMovable);
-    setZValue(2);
-    resize(pixmapItem->boundingRect().size());
-}
-
-void Bomb::launch(Bomb::Direction direction)
-{
-    launchAnimation = new QSequentialAnimationGroup();
-    AnimationManager::self()->registerAnimation(launchAnimation);
-    qreal delta = direction == Right ? 20 : - 20;
-    QPropertyAnimation *anim = new QPropertyAnimation(this, "pos");
-    anim->setEndValue(QPointF(x() + delta,y() - 20));
-    anim->setDuration(150);
-    launchAnimation->addAnimation(anim);
-    anim = new QPropertyAnimation(this, "pos");
-    anim->setEndValue(QPointF(x() + delta*2, y() ));
-    anim->setDuration(150);
-    launchAnimation->addAnimation(anim);
-    anim = new QPropertyAnimation(this, "pos");
-    anim->setEndValue(QPointF(x() + delta*2,scene()->height()));
-    anim->setDuration(y()/2*60);
-    launchAnimation->addAnimation(anim);
-    connect(anim,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationLaunchValueChanged(const QVariant &)));
-
-    //We setup the state machine of the bomb
-    QStateMachine *machine = new QStateMachine(this);
-
-    //This state is when the launch animation is playing
-    QAnimationState *launched = new QAnimationState(machine);
-    launched->setAnimation(launchAnimation);
-
-    //End
-    QFinalState *final = new QFinalState(machine);
-
-    machine->setInitialState(launched);
-
-    //### Add a nice animation when the bomb is destroyed
-    launched->addTransition(this, SIGNAL(bombExplosed()),final);
-
-    //If the animation is finished, then we move to the final state
-    launched->addTransition(launched, SIGNAL(animationFinished()), final);
-
-    //The machine has finished to be executed, then the boat is dead
-    connect(machine,SIGNAL(finished()),this, SIGNAL(bombExecutionFinished()));
-
-    machine->start();
-
-}
-
-void Bomb::onAnimationLaunchValueChanged(const QVariant &)
-{
-    foreach (QGraphicsItem * item , collidingItems(Qt::IntersectsItemBoundingRect)) {
-        if (item->type() == SubMarine::Type) {
-            SubMarine *s = static_cast<SubMarine *>(item);
-            destroy();
-            s->destroy();
-        }
-    }
-}
-
-void Bomb::destroy()
-{
-    launchAnimation->stop();
-    emit bombExplosed();
-}
diff --git a/examples/animation/sub-attaq/bomb.h b/examples/animation/sub-attaq/bomb.h
deleted file mode 100644
index ed6b0f5..0000000
--- a/examples/animation/sub-attaq/bomb.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __BOMB__H__
-#define __BOMB__H__
-
-//Qt
-#include <QtGui/QGraphicsWidget>
-#include <QtCore/QAnimationGroup>
-
-class PixmapItem;
-
-class Bomb : public QGraphicsWidget
-{
-Q_OBJECT
-public:
-    enum Direction {
-        Left =  0,
-        Right
-    };
-    Bomb(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0);
-    void launch(Direction direction);
-    void destroy();
-
-signals:
-    void bombExplosed();
-    void bombExecutionFinished();
-
-private slots:
-    void onAnimationLaunchValueChanged(const QVariant &);
-
-private:
-    QAnimationGroup *launchAnimation;
-    PixmapItem *pixmapItem;
-};
-
-#endif //__BOMB__H__
diff --git a/examples/animation/sub-attaq/custompropertyanimation.cpp b/examples/animation/sub-attaq/custompropertyanimation.cpp
deleted file mode 100644
index 9282f42..0000000
--- a/examples/animation/sub-attaq/custompropertyanimation.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "custompropertyanimation.h"
-
-// Qt
-#include <QtCore/qdebug.h>
-
-CustomPropertyAnimation::CustomPropertyAnimation(QObject *parent) :
-    QVariantAnimation(parent), animProp(0)
-{
-}
-
-CustomPropertyAnimation::~CustomPropertyAnimation()
-{
-}
-
-void CustomPropertyAnimation::setProperty(AbstractProperty *_animProp)
-{
-    if (animProp == _animProp)
-        return;
-    delete animProp;
-    animProp = _animProp;
-}
-
-/*!
-    \reimp
- */
-void CustomPropertyAnimation::updateCurrentValue(const QVariant &value)
-{
-    if (!animProp || state() == QAbstractAnimation::Stopped)
-        return;
-
-    animProp->write(value);
-}
-
-
-/*!
-    \reimp
-*/
-void CustomPropertyAnimation::updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState)
-{
-    // Initialize start value
-    if (oldState == QAbstractAnimation::Stopped) {
-        if (!animProp)
-            return;
-        QVariant def = animProp->read();
-        if (def.isValid()) {
-            const int t = def.userType();
-            KeyValues values = keyValues();
-            //this ensures that all the keyValues are of type t
-            for (int i = 0; i < values.count(); ++i) {
-                QVariantAnimation::KeyValue &pair = values[i];
-                if (pair.second.userType() != t)
-                    pair.second.convert(static_cast<QVariant::Type>(t));
-            }
-            //let's now update the key values
-            setKeyValues(values);
-        }
-
-        if (animProp && !startValue().isValid() && currentTime() == 0
-            || (currentTime() == duration() && currentLoop() == (loopCount() - 1))) {
-                setStartValue(def);
-        }
-    }
-
-    QVariantAnimation::updateState(oldState, newState);
-}
-
-#include "moc_custompropertyanimation.cpp"
diff --git a/examples/animation/sub-attaq/custompropertyanimation.h b/examples/animation/sub-attaq/custompropertyanimation.h
deleted file mode 100644
index a984163..0000000
--- a/examples/animation/sub-attaq/custompropertyanimation.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CUSTOMPROPERTYANIMATION_H
-#define CUSTOMPROPERTYANIMATION_H
-
-#include <QtCore/qvariantanimation.h>
-
-QT_BEGIN_NAMESPACE
-class QGraphicsItem;
-QT_END_NAMESPACE
-
-struct AbstractProperty
-{
-    virtual QVariant read() const = 0;
-    virtual void write(const QVariant &value) = 0;
-};
-
-
-class CustomPropertyAnimation : public QVariantAnimation
-{
-    Q_OBJECT
-
-    template <typename Target, typename T, typename T2 = T>
-    class MemberFunctionProperty : public AbstractProperty
-    {
-    public:
-        typedef T (Target::*Getter)(void) const;
-        typedef void (Target::*Setter)(T2);
-
-        MemberFunctionProperty(Target* target, Getter getter, Setter setter)
-            : m_target(target), m_getter(getter), m_setter(setter) {}
-
-        virtual void write(const QVariant &value)
-        {
-            if (m_setter) (m_target->*m_setter)(qVariantValue<T>(value));
-        }
-
-        virtual QVariant read() const
-        {
-            if (m_getter) return qVariantFromValue<T>((m_target->*m_getter)());
-            return QVariant();
-        }
-
-    private:
-        Target *m_target;
-        Getter m_getter;
-        Setter m_setter;
-    };
-
-public:
-    CustomPropertyAnimation(QObject *parent = 0);
-    ~CustomPropertyAnimation();
-
-    template<class Target, typename T>
-    void setMemberFunctions(Target* target, T (Target::*getter)() const, void (Target::*setter)(const T& ))
-    {
-        setProperty(new MemberFunctionProperty<Target, T, const T&>(target, getter, setter));
-    }
-
-    template<class Target, typename T>
-    void setMemberFunctions(Target* target, T (Target::*getter)() const, void (Target::*setter)(T))
-    {
-        setProperty(new MemberFunctionProperty<Target, T>(target, getter, setter));
-    }
-
-    void updateCurrentValue(const QVariant &value);
-    void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState);
-    void setProperty(AbstractProperty *animProp);
-
-private:
-    Q_DISABLE_COPY(CustomPropertyAnimation);
-    AbstractProperty *animProp;
-};
-
-#endif // CUSTOMPROPERTYANIMATION_H
diff --git a/examples/animation/sub-attaq/data.xml b/examples/animation/sub-attaq/data.xml
deleted file mode 100644
index 41d4754..0000000
--- a/examples/animation/sub-attaq/data.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<subattaq>
-    <submarines>
-        <submarine type="0" points="10" name="Q1" />
-        <submarine type="1" points="20" name="Q2" />
-    </submarines>
-    <levels>
-        <level id="0" name="Seaman recruit">
-            <subinstance type="0" nb="2"/>
-        </level>
-        <level id="1" name="Seaman apprentice">
-            <subinstance type="0" nb="4"/>
-        </level>
-    </levels>
-</subattaq>
diff --git a/examples/animation/sub-attaq/graphicsscene.cpp b/examples/animation/sub-attaq/graphicsscene.cpp
deleted file mode 100644
index fcbc1b3..0000000
--- a/examples/animation/sub-attaq/graphicsscene.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "graphicsscene.h"
-#include "states.h"
-#include "boat.h"
-#include "submarine.h"
-#include "torpedo.h"
-#include "bomb.h"
-#include "pixmapitem.h"
-#include "custompropertyanimation.h"
-#include "animationmanager.h"
-#include "qanimationstate.h"
-#include "progressitem.h"
-
-//Qt
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
-#include <QtCore/QParallelAnimationGroup>
-#include <QtCore/QStateMachine>
-#include <QtCore/QFinalState>
-#include <QtCore/QPauseAnimation>
-#include <QtGui/QAction>
-#include <QtCore/QDir>
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsSceneMouseEvent>
-#include <QtCore/QXmlStreamReader>
-
-//helper function that creates an animation for position and inserts it into group
-static CustomPropertyAnimation *addGraphicsItemPosAnimation(QSequentialAnimationGroup *group,
-                                                              QGraphicsItem *item, const QPointF &endPos)
-{
-    CustomPropertyAnimation *ret = new CustomPropertyAnimation(group);
-    ret->setMemberFunctions(item, &QGraphicsItem::pos, &QGraphicsItem::setPos);
-    ret->setEndValue(endPos);
-    ret->setDuration(200);
-    ret->setEasingCurve(QEasingCurve::OutElastic);
-    group->addPause(50);
-    return ret;
-}
-
-//helper function that creates an animation for opacity and inserts it into group
-static void addGraphicsItemFadeoutAnimation(QAnimationGroup *group, QGraphicsItem *item)
-{
-#if QT_VERSION >=0x040500
-    CustomPropertyAnimation *anim = new CustomPropertyAnimation(group);
-    anim->setMemberFunctions(item, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim->setDuration(800);
-    anim->setEndValue(0);
-    anim->setEasingCurve(QEasingCurve::OutQuad);
-#else
-    // work around for a bug where we don't transition if the duration is zero.
-    QtPauseAnimation *anim = new QtPauseAnimation(group);
-    anim->setDuration(1);
-#endif
-}
-
-GraphicsScene::GraphicsScene(int x, int y, int width, int height, Mode mode)
-    : QGraphicsScene(x,y,width,height), mode(mode), newAction(0), quitAction(0), boat(0)
-{
-    backgroundItem = new PixmapItem(QString("background"),mode);
-    backgroundItem->setZValue(1);
-    backgroundItem->setPos(0,0);
-    addItem(backgroundItem);
-
-    PixmapItem *surfaceItem = new PixmapItem(QString("surface"),mode);
-    surfaceItem->setZValue(3);
-    surfaceItem->setPos(0,sealLevel() - surfaceItem->boundingRect().height()/2);
-    addItem(surfaceItem);
-
-    //The item that display score and level
-    progressItem = new ProgressItem(backgroundItem);
-
-    //We create the boat
-    boat = new Boat();
-    addItem(boat);
-    boat->setPos(this->width()/2, sealLevel() - boat->size().height());
-    boat->hide();
-
-    //parse the xml that contain all data of the game
-    QXmlStreamReader reader;
-    QFile file(":data.xml");
-    file.open(QIODevice::ReadOnly);
-    reader.setDevice(&file);
-    LevelDescription currentLevel;
-    while (!reader.atEnd()) {
-         reader.readNext();
-         if (reader.tokenType() == QXmlStreamReader::StartElement) {
-             if (reader.name() == "submarine")
-             {
-                 SubmarineDescription desc;
-                 desc.name = reader.attributes().value("name").toString();
-                 desc.points = reader.attributes().value("points").toString().toInt();
-                 desc.type = reader.attributes().value("type").toString().toInt();
-                 submarinesData.append(desc);
-             }
-             if (reader.name() == "level")
-             {
-                 currentLevel.id = reader.attributes().value("id").toString().toInt();
-                 currentLevel.name = reader.attributes().value("name").toString();
-             }
-             if (reader.name() == "subinstance")
-             {
-                 currentLevel.submarines.append(qMakePair(reader.attributes().value("type").toString().toInt(),reader.attributes().value("nb").toString().toInt()));
-             }
-         }
-         if (reader.tokenType() == QXmlStreamReader::EndElement) {
-            if (reader.name() == "level")
-            {
-                levelsData.insert(currentLevel.id,currentLevel);
-                currentLevel.submarines.clear();
-            }
-         }
-   }
-}
-
-qreal GraphicsScene::sealLevel() const
-{
-     if (mode == Big)
-        return 220;
-     else
-        return 160;
-}
-
-void GraphicsScene::setupScene(const QList<QAction *> &actions)
-{
-    newAction = actions.at(0);
-    quitAction = actions.at(1);
-
-    QGraphicsItem *logo_s = addWelcomeItem(QPixmap(":/logo-s"));
-    QGraphicsItem *logo_u = addWelcomeItem(QPixmap(":/logo-u"));
-    QGraphicsItem *logo_b = addWelcomeItem(QPixmap(":/logo-b"));
-    QGraphicsItem *logo_dash = addWelcomeItem(QPixmap(":/logo-dash"));
-    QGraphicsItem *logo_a = addWelcomeItem(QPixmap(":/logo-a"));
-    QGraphicsItem *logo_t = addWelcomeItem(QPixmap(":/logo-t"));
-    QGraphicsItem *logo_t2 = addWelcomeItem(QPixmap(":/logo-t2"));
-    QGraphicsItem *logo_a2 = addWelcomeItem(QPixmap(":/logo-a2"));
-    QGraphicsItem *logo_q = addWelcomeItem(QPixmap(":/logo-q"));
-    QGraphicsItem *logo_excl = addWelcomeItem(QPixmap(":/logo-excl"));
-    logo_s->setZValue(3);
-    logo_u->setZValue(4);
-    logo_b->setZValue(5);
-    logo_dash->setZValue(6);
-    logo_a->setZValue(7);
-    logo_t->setZValue(8);
-    logo_t2->setZValue(9);
-    logo_a2->setZValue(10);
-    logo_q->setZValue(11);
-    logo_excl->setZValue(12);
-    logo_s->setPos(QPointF(-1000, -1000));
-    logo_u->setPos(QPointF(-800, -1000));
-    logo_b->setPos(QPointF(-600, -1000));
-    logo_dash->setPos(QPointF(-400, -1000));
-    logo_a->setPos(QPointF(1000, 2000));
-    logo_t->setPos(QPointF(800, 2000));
-    logo_t2->setPos(QPointF(600, 2000));
-    logo_a2->setPos(QPointF(400, 2000));
-    logo_q->setPos(QPointF(200, 2000));
-    logo_excl->setPos(QPointF(0, 2000));
-
-    QSequentialAnimationGroup * lettersGroupMoving = new QSequentialAnimationGroup(this);
-    QParallelAnimationGroup * lettersGroupFading = new QParallelAnimationGroup(this);
-
-    //creation of the animations for moving letters
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_s, QPointF(300, 150));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_u, QPointF(350, 150));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_b, QPointF(400, 120));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_dash, QPointF(460, 150));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_a, QPointF(350, 250));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_t, QPointF(400, 250));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_t2, QPointF(430, 250));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_a2, QPointF(465, 250));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_q, QPointF(510, 250));
-    addGraphicsItemPosAnimation(lettersGroupMoving, logo_excl, QPointF(570, 220));
-
-    //creation of the animations for fading out the letters
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_s);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_u);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_b);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_dash);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_a);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_t);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_t2);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_a2);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_q);
-    addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_excl);
-    connect(lettersGroupFading, SIGNAL(finished()), this, SLOT(onIntroAnimationFinished()));
-
-    QStateMachine *machine = new QStateMachine(this);
-
-    //This state is when the player is playing
-    PlayState *gameState = new PlayState(this,machine);
-
-    //Final state
-    QFinalState *final = new QFinalState(machine);
-
-    //Animation when the player enter in the game
-    QAnimationState *lettersMovingState = new QAnimationState(machine);
-    lettersMovingState->setAnimation(lettersGroupMoving);
-
-    //Animation when the welcome screen disappear
-    QAnimationState *lettersFadingState = new QAnimationState(machine);
-    lettersFadingState->setAnimation(lettersGroupFading);
-
-    //if new game then we fade out the welcome screen and start playing
-    lettersMovingState->addTransition(newAction, SIGNAL(triggered()),lettersFadingState);
-    lettersFadingState->addTransition(lettersFadingState, SIGNAL(animationFinished()),gameState);
-
-    //New Game is triggered then player start playing
-    gameState->addTransition(newAction, SIGNAL(triggered()),gameState);
-
-    //Wanna quit, then connect to CTRL+Q
-    gameState->addTransition(quitAction, SIGNAL(triggered()),final);
-    lettersMovingState->addTransition(quitAction, SIGNAL(triggered()),final);
-
-    //Welcome screen is the initial state
-    machine->setInitialState(lettersMovingState);
-
-    machine->start();
-
-    //We reach the final state, then we quit
-    connect(machine,SIGNAL(finished()),this, SLOT(onQuitGameTriggered()));
-}
-
-void GraphicsScene::addItem(Bomb *bomb)
-{
-    bombs.insert(bomb);
-    connect(bomb,SIGNAL(bombExecutionFinished()),this, SLOT(onBombExecutionFinished()));
-    QGraphicsScene::addItem(bomb);
-}
-
-void GraphicsScene::addItem(Torpedo *torpedo)
-{
-    torpedos.insert(torpedo);
-    connect(torpedo,SIGNAL(torpedoExecutionFinished()),this, SLOT(onTorpedoExecutionFinished()));
-    QGraphicsScene::addItem(torpedo);
-}
-
-void GraphicsScene::addItem(SubMarine *submarine)
-{
-    submarines.insert(submarine);
-    connect(submarine,SIGNAL(subMarineExecutionFinished()),this, SLOT(onSubMarineExecutionFinished()));
-    QGraphicsScene::addItem(submarine);
-}
-
-void GraphicsScene::addItem(QGraphicsItem *item)
-{
-    QGraphicsScene::addItem(item);
-}
-
-void GraphicsScene::mousePressEvent (QGraphicsSceneMouseEvent * event)
-{
-    event->ignore();
-}
-
-void GraphicsScene::onQuitGameTriggered()
-{
-    qApp->closeAllWindows();
-}
-
-void GraphicsScene::onBombExecutionFinished()
-{
-    Bomb *bomb = qobject_cast<Bomb *>(sender());
-    bombs.remove(bomb);
-    bomb->deleteLater();
-    if (boat)
-        boat->setBombsLaunched(boat->bombsLaunched() - 1);
-}
-
-void GraphicsScene::onTorpedoExecutionFinished()
-{
-    Torpedo *torpedo = qobject_cast<Torpedo *>(sender());
-    torpedos.remove(torpedo);
-    torpedo->deleteLater();
-}
-
-void GraphicsScene::onSubMarineExecutionFinished()
-{
-    SubMarine *submarine = qobject_cast<SubMarine *>(sender());
-    submarines.remove(submarine);
-    if (submarines.count() == 0) {
-        emit allSubMarineDestroyed(submarine->points());
-    } else {
-        emit subMarineDestroyed(submarine->points());
-    }
-    submarine->deleteLater();
-}
-
-int GraphicsScene::remainingSubMarines() const
-{
-    return submarines.count();
-}
-
-void GraphicsScene::clearScene()
-{
-    foreach (SubMarine *sub,submarines) {
-        sub->destroy();
-        sub->deleteLater();
-    }
-
-    foreach (Torpedo *torpedo,torpedos) {
-        torpedo->destroy();
-        torpedo->deleteLater();
-    }
-
-    foreach (Bomb *bomb,bombs) {
-        bomb->destroy();
-        bomb->deleteLater();
-    }
-
-    submarines.clear();
-    bombs.clear();
-    torpedos.clear();
-
-    AnimationManager::self()->unregisterAllAnimations();
-
-    boat->stop();
-    boat->hide();
-}
-
-QGraphicsPixmapItem *GraphicsScene::addWelcomeItem(const QPixmap &pm)
-{
-    QGraphicsPixmapItem *item = addPixmap(pm);
-    welcomeItems << item;
-    return item;
-}
-
-void GraphicsScene::onIntroAnimationFinished()
-{
-    qDeleteAll(welcomeItems);
-    welcomeItems.clear();
-}
-
diff --git a/examples/animation/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h
deleted file mode 100644
index 068ee97..0000000
--- a/examples/animation/sub-attaq/graphicsscene.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __GRAPHICSSCENE__H__
-#define __GRAPHICSSCENE__H__
-
-//Qt
-#include <QtGui/QGraphicsScene>
-#include <QtCore/QSet>
-#include <QtCore/QState>
-
-
-class Boat;
-class SubMarine;
-class Torpedo;
-class Bomb;
-class PixmapItem;
-class ProgressItem;
-QT_BEGIN_NAMESPACE
-class QAction;
-QT_END_NAMESPACE
-
-class GraphicsScene : public QGraphicsScene
-{
-Q_OBJECT
-public:
-    enum Mode {
-        Big = 0,
-        Small
-    };
-
-    struct SubmarineDescription {
-        int type;
-        int points;
-        QString name;
-    };
-
-    struct LevelDescription {
-        int id;
-        QString name;
-        QList<QPair<int,int> > submarines;
-    };
-
-    GraphicsScene(int x, int y, int width, int height, Mode mode = Big);
-    qreal sealLevel() const;
-    void setupScene(const QList<QAction *> &actions);
-    void addItem(Bomb *bomb);
-    void addItem(Torpedo *torpedo);
-    void addItem(SubMarine *submarine);
-    void addItem(QGraphicsItem *item);
-    int remainingSubMarines() const;
-    void clearScene();
-    QGraphicsPixmapItem *addWelcomeItem(const QPixmap &pm);
-
-signals:
-    void subMarineDestroyed(int);
-    void allSubMarineDestroyed(int);
-
-protected:
-    void mousePressEvent (QGraphicsSceneMouseEvent * event);
-
-private slots:
-    void onQuitGameTriggered();
-    void onBombExecutionFinished();
-    void onTorpedoExecutionFinished();
-    void onSubMarineExecutionFinished();
-    void onIntroAnimationFinished();
-
-private:
-    Mode mode;
-    PixmapItem *backgroundItem;
-    ProgressItem *progressItem;
-    QAction * newAction;
-    QAction * quitAction;
-    Boat *boat;
-    QSet<SubMarine *> submarines;
-    QSet<Bomb *> bombs;
-    QSet<Torpedo *> torpedos;
-    QVector<QGraphicsPixmapItem *> welcomeItems;
-    QVector<SubmarineDescription> submarinesData;
-    QHash<int, LevelDescription> levelsData;
-
-    friend class PauseState;
-    friend class PlayState;
-    friend class LevelState;
-    friend class LostState;
-    friend class WinState;
-    friend class WinTransition;
-    friend class UpdateScoreTransition;
-};
-
-#endif //__GRAPHICSSCENE__H__
-
diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp
deleted file mode 100644
index bcccd34..0000000
--- a/examples/animation/sub-attaq/mainwindow.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "mainwindow.h"
-#include "graphicsscene.h"
-
-//Qt
-#include <QGraphicsView>
-
-#ifdef QT_NO_OPENGL
-    #include <QtGui/QMenuBar>
-    #include <QtGui/QLayout>
-    #include <QtGui/QApplication>
-#else
-    #include <QtOpenGL/QtOpenGL>
-#endif
-
-MainWindow::MainWindow() : QMainWindow(0)
-{
-    QMenuBar *menuBar = new QMenuBar;
-    QMenu *file = new QMenu(tr("&File"),menuBar);
-
-    QAction *newAction = new QAction(tr("New Game"),file);
-    newAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_N));
-    file->addAction(newAction);
-    QAction *quitAction = new QAction(tr("Quit"),file);
-    quitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q));
-    file->addAction(quitAction);
-
-    menuBar->addMenu(file);
-    setMenuBar(menuBar);
-
-    QStringList list = QApplication::arguments();
-    if (list.contains("-fullscreen")) {
-        scene = new GraphicsScene(0, 0, 750, 400,GraphicsScene::Small);
-        setWindowState(Qt::WindowFullScreen);
-    } else {
-        scene = new GraphicsScene(0, 0, 880, 630);
-        layout()->setSizeConstraint(QLayout::SetFixedSize);
-    }
-
-    view = new QGraphicsView(scene,this);
-    view->setAlignment(Qt::AlignLeft | Qt::AlignTop);
-    QList<QAction *> actions;
-    actions << newAction << quitAction;
-    scene->setupScene(actions);
-#ifndef QT_NO_OPENGL
-        view->setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
-#endif
-
-    setCentralWidget(view);
-
-}
-
-MainWindow::~MainWindow()
-{
-}
-
diff --git a/examples/animation/sub-attaq/pics/big/background.png b/examples/animation/sub-attaq/pics/big/background.png
deleted file mode 100644
index 9f58157..0000000
--- a/examples/animation/sub-attaq/pics/big/background.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/boat.png b/examples/animation/sub-attaq/pics/big/boat.png
deleted file mode 100644
index be82dff..0000000
--- a/examples/animation/sub-attaq/pics/big/boat.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/bomb.png b/examples/animation/sub-attaq/pics/big/bomb.png
deleted file mode 100644
index 3af5f2f..0000000
--- a/examples/animation/sub-attaq/pics/big/bomb.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png
deleted file mode 100644
index c9fd8b0..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png
deleted file mode 100644
index 7528f2d..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png
deleted file mode 100644
index aae9c9c..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png
deleted file mode 100644
index d697c1b..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png
deleted file mode 100644
index 88ca514..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png
deleted file mode 100644
index 524f589..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png
deleted file mode 100644
index 2cca1e8..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png
deleted file mode 100644
index 82100a8..0000000
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/submarine.png b/examples/animation/sub-attaq/pics/big/submarine.png
deleted file mode 100644
index df435dc..0000000
--- a/examples/animation/sub-attaq/pics/big/submarine.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/surface.png b/examples/animation/sub-attaq/pics/big/surface.png
deleted file mode 100644
index 4eba29e..0000000
--- a/examples/animation/sub-attaq/pics/big/surface.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/big/torpedo.png b/examples/animation/sub-attaq/pics/big/torpedo.png
deleted file mode 100644
index f9c2687..0000000
--- a/examples/animation/sub-attaq/pics/big/torpedo.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/scalable/background-n810.svg b/examples/animation/sub-attaq/pics/scalable/background-n810.svg
deleted file mode 100644
index ece9f7a..0000000
--- a/examples/animation/sub-attaq/pics/scalable/background-n810.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2588"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="background-n810.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata28">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1141"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="1.2399902"
-     inkscape:cx="375"
-     inkscape:cy="461.074"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2590">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective30" />
-    <linearGradient
-       id="linearGradient3746">
-      <stop
-         id="stop3748"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3750"
-         style="stop-color:#0074b7;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="82.966125"
-       cy="-178.42453"
-       r="526.79456"
-       fx="82.966125"
-       fy="-178.42453"
-       id="radialGradient3880"
-       xlink:href="#linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4952094,0.2388475,-0.1040669,0.3734391,-208.61982,418.216)" />
-    <linearGradient
-       id="linearGradient3624">
-      <stop
-         id="stop3626"
-         style="stop-color:#3a8daf;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3636"
-         style="stop-color:#252525;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="552.98486"
-       y1="390.56842"
-       x2="549.39465"
-       y2="702.3479"
-       id="linearGradient3630"
-       xlink:href="#linearGradient3624"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3373776,0,0,1.186038,-986.88716,67.776416)" />
-    <linearGradient
-       id="linearGradient3816">
-      <stop
-         id="stop3818"
-         style="stop-color:#ad8b00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3820"
-         style="stop-color:#ad8b00;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="573"
-       y1="755.46222"
-       x2="573"
-       y2="700.13464"
-       id="linearGradient3826"
-       xlink:href="#linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2561681,-151.5,-34.518664)" />
-    <linearGradient
-       id="linearGradient5097">
-      <stop
-         id="stop5099"
-         style="stop-color:#19a2db;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop5109"
-         style="stop-color:#1379a7;stop-opacity:0.49803922"
-         offset="0.30000001" />
-      <stop
-         id="stop5101"
-         style="stop-color:#0e5173;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="590.84674"
-       y1="274.57559"
-       x2="590.84674"
-       y2="334.01376"
-       id="linearGradient5103"
-       xlink:href="#linearGradient5097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-151.5,156.75229)"
-       spreadMethod="pad" />
-  </defs>
-  <g
-     id="layer1">
-    <rect
-       width="1053.5891"
-       height="206.64989"
-       x="-151.79456"
-       y="330.16019"
-       id="rect3638"
-       style="opacity:1;fill:url(#radialGradient3880);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.1880002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       width="1054.4708"
-       height="364.81519"
-       x="-152.23541"
-       y="533.48895"
-       id="rect3622"
-       style="opacity:1;fill:url(#linearGradient3630);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.13464069;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M -152.5,877.11847 C 120.5,865.81296 -202.86309,769.3663 109.5,871.29717 C 172.96247,892.00636 243.5,872.55334 297.5,871.29717 C 351.5,870.041 311.5,859.80335 358.5,876.13354 C 405.5,892.46372 553.5,861.09903 598.5,854.8182 C 643.5,848.53736 756.5,841.79698 795.5,853.10249 C 834.5,864.408 904.5,866.2725 904.5,866.2725 L 901.5,903.95754 L -154.5,902.70137 L -152.5,877.11847 z"
-       id="path3814"
-       style="fill:url(#linearGradient3826);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 902.20121,894.16261 C 632.01828,889.43035 756.73005,860.2801 614.20403,894.1311 C 596.58819,898.315 408.23621,883.21212 400.43291,894.1311 C 376.86263,927.11261 75.265447,868.1243 34.250926,886.79082 C 31.281885,888.14209 12.514878,884.22134 -12.264082,889.72008 C -48.555335,897.77353 -64.717178,885.62471 -103.31472,890.35697 C -141.91229,895.08922 -145.87102,891.93439 -145.87102,891.93439 L -152.79879,903.10131 L 892.3044,902.5755 L 902.20121,894.16261 z"
-       id="path3828"
-       style="fill:#ad8b00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/background.svg b/examples/animation/sub-attaq/pics/scalable/background.svg
deleted file mode 100644
index 0be2680..0000000
--- a/examples/animation/sub-attaq/pics/scalable/background.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2588"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="background.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata28">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1141"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="0.93884027"
-     inkscape:cx="473.72605"
-     inkscape:cy="538.63678"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2590">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective30" />
-    <linearGradient
-       id="linearGradient3746">
-      <stop
-         id="stop3748"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3750"
-         style="stop-color:#0074b7;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="82.966125"
-       cy="-178.42453"
-       r="526.79456"
-       fx="82.966125"
-       fy="-178.42453"
-       id="radialGradient3880"
-       xlink:href="#linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4952094,0.3367191,-0.1040669,0.5264617,-208.61982,282.52272)" />
-    <linearGradient
-       id="linearGradient3624">
-      <stop
-         id="stop3626"
-         style="stop-color:#3a8daf;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3636"
-         style="stop-color:#252525;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="552.98486"
-       y1="390.56842"
-       x2="549.39465"
-       y2="702.3479"
-       id="linearGradient3630"
-       xlink:href="#linearGradient3624"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3373776,0,0,1.5004634,-986.88716,-154.07447)" />
-    <linearGradient
-       id="linearGradient3816">
-      <stop
-         id="stop3818"
-         style="stop-color:#ad8b00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3820"
-         style="stop-color:#ad8b00;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="573"
-       y1="755.46222"
-       x2="573"
-       y2="700.13464"
-       id="linearGradient3826"
-       xlink:href="#linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.6033628,-151.5,-294.0167)" />
-    <linearGradient
-       id="linearGradient5097">
-      <stop
-         id="stop5099"
-         style="stop-color:#19a2db;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop5109"
-         style="stop-color:#1379a7;stop-opacity:0.49803922"
-         offset="0.30000001" />
-      <stop
-         id="stop5101"
-         style="stop-color:#0e5173;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="590.84674"
-       y1="274.57559"
-       x2="590.84674"
-       y2="334.01376"
-       id="linearGradient5103"
-       xlink:href="#linearGradient5097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-151.5,156.75229)"
-       spreadMethod="pad" />
-  </defs>
-  <g
-     id="layer1">
-    <rect
-       width="1053.5891"
-       height="291.32797"
-       x="-151.79456"
-       y="158.38464"
-       id="rect3638"
-       style="opacity:1;fill:url(#radialGradient3880);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.1880002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       width="1054.4708"
-       height="461.52972"
-       x="-152.23541"
-       y="435.10107"
-       id="rect3622"
-       style="opacity:1;fill:url(#linearGradient3630);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.13464069;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M -152.5,869.5896 C 120.5,855.15934 -202.86309,732.0556 109.5,862.15934 C 172.96247,888.59238 243.5,863.7627 297.5,862.15934 C 351.5,860.55598 311.5,847.48872 358.5,868.33244 C 405.5,889.17615 553.5,849.14252 598.5,841.12571 C 643.5,833.1089 756.5,824.50553 795.5,838.9358 C 834.5,853.36606 904.5,855.74589 904.5,855.74589 L 901.5,903.84677 L -154.5,902.24341 L -152.5,869.5896 z"
-       id="path3814"
-       style="fill:url(#linearGradient3826);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 902.20121,891.3446 C 632.01828,885.30439 756.73005,848.09724 614.20403,891.30439 C 596.58819,896.64468 408.23621,877.36748 400.43291,891.30439 C 376.86263,933.40172 75.265447,858.10952 34.250926,881.93531 C 31.281885,883.66006 12.514878,878.65564 -12.264082,885.67419 C -48.555335,895.95355 -64.717178,880.4469 -103.31472,886.48711 C -141.91229,892.52732 -145.87102,888.50052 -145.87102,888.50052 L -152.79879,902.75389 L 892.3044,902.08275 L 902.20121,891.3446 z"
-       id="path3828"
-       style="fill:#ad8b00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/boat.svg b/examples/animation/sub-attaq/pics/scalable/boat.svg
deleted file mode 100644
index 5298821b..0000000
--- a/examples/animation/sub-attaq/pics/scalable/boat.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2584">
-  <defs
-     id="defs2666">
-    <linearGradient
-       x1="542.5"
-       y1="222.59448"
-       x2="559"
-       y2="222.59448"
-       id="linearGradient3387"
-       xlink:href="#linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-110.6791,190.19124)" />
-    <linearGradient
-       id="linearGradient3167">
-      <stop
-         id="stop3169"
-         style="stop-color:#464646;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:#848788;stop-opacity:1"
-         offset="0.44021741" />
-      <stop
-         id="stop3347"
-         style="stop-color:#9ca0a2;stop-opacity:1"
-         offset="0.56799388" />
-      <stop
-         id="stop3171"
-         style="stop-color:#b5babd;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="474.23065"
-       y1="229.92336"
-       x2="474.1944"
-       y2="218.27365"
-       id="linearGradient3416"
-       xlink:href="#linearGradient3167"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-125.98032,185.95625)" />
-    <linearGradient
-       id="linearGradient3692">
-      <stop
-         id="stop3694"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3696"
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="573.5"
-       y1="244.2056"
-       x2="578.25"
-       y2="216.9556"
-       id="linearGradient3972"
-       xlink:href="#linearGradient3692"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-126.5541,188.56624)" />
-    <linearGradient
-       id="linearGradient3438">
-      <stop
-         id="stop3440"
-         style="stop-color:#939393;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3444"
-         style="stop-color:#d6d6d6;stop-opacity:1"
-         offset="0.12354442" />
-      <stop
-         id="stop3446"
-         style="stop-color:#dadada;stop-opacity:1"
-         offset="0.74055624" />
-      <stop
-         id="stop3442"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="660.29303"
-       y1="256.53284"
-       x2="444.79303"
-       y2="255.62085"
-       id="linearGradient3948"
-       xlink:href="#linearGradient3438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-126.5541,185.56624)" />
-    <linearGradient
-       x1="542.5"
-       y1="222.59448"
-       x2="559"
-       y2="222.59448"
-       id="linearGradient3990"
-       xlink:href="#linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-132.8041,190.19124)" />
-    <linearGradient
-       id="linearGradient3746">
-      <stop
-         id="stop3748"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3750"
-         style="stop-color:#0074b7;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="542.5"
-       y1="222.59448"
-       x2="559"
-       y2="222.59448"
-       id="linearGradient3994"
-       xlink:href="#linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-88.054101,190.19124)" />
-    <linearGradient
-       id="linearGradient3428">
-      <stop
-         id="stop3430"
-         style="stop-color:#464646;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3432"
-         style="stop-color:#848788;stop-opacity:1"
-         offset="0.18306103" />
-      <stop
-         id="stop3434"
-         style="stop-color:#9ca0a2;stop-opacity:1"
-         offset="0.66368055" />
-      <stop
-         id="stop3436"
-         style="stop-color:#b5babd;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="592.92798"
-       y1="199.43727"
-       x2="557.05743"
-       y2="196.5448"
-       id="linearGradient3426"
-       xlink:href="#linearGradient3428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-102.5217,149.09845)" />
-  </defs>
-  <g
-     id="layer1">
-    <g
-       id="boat">
-      <path
-         d="M 296.669,434.15623 C 376.12538,436.50959 448.282,436.46711 542.42304,434.15623 C 542.42304,434.15623 544.22253,425.03531 542.42304,422.57953 C 432.90655,403.86953 296.669,418.12547 296.669,422.57953 L 296.669,434.15623 z"
-         id="path3469"
-         style="fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:3.4975698;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
-      <rect
-         width="3.4280596"
-         height="29.611124"
-         x="647.59613"
-         y="173.91156"
-         transform="matrix(0.9327494,0.3605254,-0.3633626,0.9316478,0,0)"
-         id="rect3408"
-         style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         width="48.499989"
-         height="8.5"
-         x="318.48221"
-         y="405.82172"
-         transform="matrix(0.9999952,3.0887777e-3,-3.0887777e-3,0.9999952,0,0)"
-         id="rect3376"
-         style="opacity:1;fill:url(#linearGradient3416);fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:2.99999928;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 382.4459,430.66072 C 382.4459,430.66072 420.85999,388.74829 397.4459,385.66072 L 488.4459,397.66072 L 488.4459,432.66072 L 382.4459,430.66072 z"
-         id="path3952"
-         style="fill:url(#linearGradient3972);fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 301.4459,429.66072 C 301.4459,429.66072 330.46329,468.66072 343.4459,468.66072 C 355.42851,471.91072 507.57644,473.70653 525.4459,465.91072 C 534.58031,461.59104 537.90602,455.58662 539.4459,429.66072 C 473.70193,439.43306 371.2651,439.78219 301.4459,429.66072 z"
-         id="path3938"
-         style="fill:url(#linearGradient3948);fill-opacity:1;fill-rule:evenodd;stroke:#545454;stroke-width:3.0999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 339.44863,416.12222 L 357.69854,416.17859 L 368.1622,427.96097 L 339.41234,427.87217 L 339.44863,416.12222 z"
-         id="rect3378"
-         style="fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
-      <rect
-         width="13.5"
-         height="17"
-         x="411.19589"
-         y="404.28574"
-         id="rect3974"
-         style="opacity:1;fill:url(#linearGradient3990);fill-opacity:1;fill-rule:nonzero;stroke:#323232;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         width="13.5"
-         height="17"
-         x="455.94589"
-         y="404.28574"
-         id="rect3992"
-         style="opacity:1;fill:url(#linearGradient3994);fill-opacity:1;fill-rule:nonzero;stroke:#323232;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 295.6959,421.91072 C 360.77923,430.41072 446.61257,432.91072 541.9459,421.91072 C 541.9459,421.91072 543.74902,428.6076 541.9459,430.41072 C 432.20839,444.14823 295.6959,433.68104 295.6959,430.41072 L 295.6959,421.91072 z"
-         id="rect2558"
-         style="fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
-      <rect
-         width="94.427879"
-         height="7.236649"
-         x="437.10614"
-         y="342.2645"
-         transform="matrix(0.9947793,0.1020501,-0.1079723,0.9941539,0,0)"
-         id="rect2569"
-         style="opacity:1;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:3.0365274;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         width="13.5"
-         height="17"
-         x="433.32089"
-         y="404.28574"
-         id="rect3385"
-         style="opacity:1;fill:url(#linearGradient3387);fill-opacity:1;fill-rule:nonzero;stroke:#323232;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 402.86916,380.21847 L 489.80407,388.85485 L 491.52271,394.54919 L 397.58781,384.91281 L 402.86916,380.21847 z"
-         id="rect3466"
-         style="fill:#dcdcdc;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:3.03650045;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
-      <rect
-         width="34.5"
-         height="14.5"
-         x="456.4783"
-         y="336.94293"
-         transform="matrix(0.997157,7.5351915e-2,-7.5351915e-2,0.997157,0,0)"
-         id="rect3418"
-         style="opacity:1;fill:url(#linearGradient3426);fill-opacity:1;fill-rule:nonzero;stroke:#494949;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         transform="matrix(0.9246214,0.3808874,-0.3808874,0.9246214,-13.252851,-40.129692)"
-         id="flag">
-        <rect
-           width="19.75"
-           height="27.75"
-           x="193.34448"
-           y="-709"
-           transform="matrix(0,1,-1,0,0,0)"
-           id="rect3389"
-           style="opacity:1;fill:#b20000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           width="27.25"
-           height="5.75"
-           x="681.5"
-           y="200.59448"
-           id="rect3393"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           width="5.75"
-           height="19.5"
-           x="691.25"
-           y="193.59448"
-           id="rect3395"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           width="27.75"
-           height="2.5"
-           x="681.5"
-           y="202.34448"
-           id="rect3397"
-           style="opacity:1;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           width="3"
-           height="19.25"
-           x="692.5"
-           y="193.59448"
-           id="rect3399"
-           style="opacity:1;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/bomb.svg b/examples/animation/sub-attaq/pics/scalable/bomb.svg
deleted file mode 100644
index 294771a..0000000
--- a/examples/animation/sub-attaq/pics/scalable/bomb.svg
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg3121">
-  <defs
-     id="defs3123">
-    <radialGradient
-       cx="-135.625"
-       cy="148.71948"
-       r="7.625"
-       fx="-135.625"
-       fy="148.71948"
-       id="radialGradient3439"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-132.85063"
-       y1="173.6969"
-       x2="-145.3662"
-       y2="177.59828"
-       id="linearGradient3418"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.2134297,-0.5943658,0.6658882,-0.2391126,-274.53441,123.00067)" />
-    <linearGradient
-       x1="-141.85466"
-       y1="181.49153"
-       x2="-144.95044"
-       y2="175.90179"
-       id="linearGradient3414"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2134297,-0.5943658,-0.6658882,-0.2391126,-15.893355,122.67824)" />
-    <linearGradient
-       x1="-149.5"
-       y1="177.59448"
-       x2="-145.7928"
-       y2="180.05936"
-       id="linearGradient3410"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6315243,0,0,0.7075182,-227.03781,54.321514)" />
-    <linearGradient
-       x1="-140.46242"
-       y1="177.40488"
-       x2="-147.04802"
-       y2="172.66473"
-       id="linearGradient3406"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6315243,0,0,-0.7075182,-226.40365,274.91611)" />
-    <linearGradient
-       x1="-147.2406"
-       y1="180.95567"
-       x2="-140.01878"
-       y2="175.57777"
-       id="linearGradient3402"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6315243,0,0,-0.7075182,-64.045217,275.07466)" />
-    <linearGradient
-       x1="-146.98956"
-       y1="174.00922"
-       x2="-142.60332"
-       y2="179.38712"
-       id="linearGradient3398"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6315243,0,0,0.7075182,-62.683611,54.187362)" />
-    <linearGradient
-       id="linearGradient3366">
-      <stop
-         id="stop3368"
-         style="stop-color:#bcbcbc;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3370"
-         style="stop-color:#191b1c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="-208.95004"
-       cy="173.10576"
-       r="31.667252"
-       fx="-208.95004"
-       fy="173.10576"
-       id="radialGradient3364"
-       xlink:href="#linearGradient3366"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="layer1">
-    <g
-       transform="translate(419.4996,488.13454)"
-       id="mine">
-      <path
-         d="M -167.5843,186.54079 A 31.466251,31.466251 0 1 1 -230.5168,186.54079 A 31.466251,31.466251 0 1 1 -167.5843,186.54079 z"
-         transform="matrix(0.6341613,0,0,0.6341613,-18.521242,45.718192)"
-         id="path2586"
-         style="opacity:1;fill:url(#radialGradient3364);fill-opacity:1;stroke:#131313;stroke-width:3.54799318;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M -155.20193,175.4167 C -157.60085,176.6451 -156.78074,184.26068 -156.78074,184.26068 C -156.78074,184.26068 -148.33787,181.58301 -148.57092,178.60053 C -148.74283,176.40051 -153.23774,174.41092 -155.20193,175.4167 z"
-         id="path3382"
-         style="fill:url(#linearGradient3398);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M -156.56354,153.84532 C -158.96246,152.61693 -158.14235,145.00135 -158.14235,145.00135 C -158.14235,145.00135 -149.69948,147.67902 -149.93253,150.66149 C -150.10444,152.86151 -154.59935,154.85111 -156.56354,153.84532 z"
-         id="path3400"
-         style="fill:url(#linearGradient3402);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M -133.88532,153.68678 C -131.48641,152.45838 -132.30652,144.8428 -132.30652,144.8428 C -132.30652,144.8428 -140.74938,147.52047 -140.51633,150.50295 C -140.34442,152.70297 -135.84951,154.69256 -133.88532,153.68678 z"
-         id="path3404"
-         style="fill:url(#linearGradient3406);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M -134.51948,175.55085 C -132.12057,176.77925 -132.94068,184.39483 -132.94068,184.39483 C -132.94068,184.39483 -141.38355,181.71716 -141.15049,178.73469 C -140.97858,176.53467 -136.48367,174.54507 -134.51948,175.55085 z"
-         id="path3408"
-         style="fill:url(#linearGradient3410);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M -161.25709,168.78221 C -163.22395,170.62484 -170.11427,165.85236 -170.11427,165.85236 C -170.11427,165.85236 -164.7408,160.23808 -162.01257,161.46538 C -160.00011,162.37068 -159.64667,167.27352 -161.25709,168.78221 z"
-         id="path3412"
-         style="fill:url(#linearGradient3414);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M -129.17068,169.10464 C -127.20382,170.94727 -120.3135,166.17478 -120.3135,166.17478 C -120.3135,166.17478 -125.68697,160.5605 -128.41519,161.7878 C -130.42766,162.69311 -130.7811,167.59595 -129.17068,169.10464 z"
-         id="path3416"
-         style="fill:url(#linearGradient3418);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M -126,151.21948 A 6.625,6.625 0 1 1 -139.25,151.21948 A 6.625,6.625 0 1 1 -126,151.21948 z"
-         transform="matrix(0.6341613,0,0,0.6341613,-61.039517,68.324922)"
-         id="path3426"
-         style="opacity:1;fill:url(#radialGradient3439);fill-opacity:1;stroke:#131313;stroke-width:3.54799318;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/sand.svg b/examples/animation/sub-attaq/pics/scalable/sand.svg
deleted file mode 100644
index 8af11b7..0000000
--- a/examples/animation/sub-attaq/pics/scalable/sand.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2596">
-  <defs
-     id="defs2598">
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         id="stop3710"
-         style="stop-color:#202020;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3712"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="518.26996"
-       y1="497.31476"
-       x2="533.02924"
-       y2="497.31476"
-       id="linearGradient3794"
-       xlink:href="#linearGradient3708"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3718">
-      <stop
-         id="stop3720"
-         style="stop-color:#bcbcbc;stop-opacity:0.28169015"
-         offset="0" />
-      <stop
-         id="stop3722"
-         style="stop-color:#bcbcbc;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="516.89508"
-       y1="503.50137"
-       x2="516.89508"
-       y2="543.80646"
-       id="linearGradient3792"
-       xlink:href="#linearGradient3718"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9947644,0,0,1.3346457,2.7877039,-166.60153)" />
-    <linearGradient
-       id="linearGradient3692">
-      <stop
-         id="stop3694"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3696"
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="506.95975"
-       y1="469.73706"
-       x2="525.41608"
-       y2="469.73706"
-       id="linearGradient3790"
-       xlink:href="#linearGradient3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3816">
-      <stop
-         id="stop3818"
-         style="stop-color:#ad8b00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3820"
-         style="stop-color:#ad8b00;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="573"
-       y1="755.46222"
-       x2="573"
-       y2="700.13464"
-       id="linearGradient3826"
-       xlink:href="#linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.6033628,-150.63569,-350.3846)" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="M -151.63569,813.2217 C 121.3643,798.79144 -201.99878,675.6877 110.3643,805.79144 C 173.82677,832.22448 244.3643,807.3948 298.3643,805.79144 C 352.3643,804.18808 312.3643,791.12082 359.3643,811.96454 C 406.3643,832.80825 554.3643,792.77462 599.3643,784.75781 C 644.3643,776.741 757.36426,768.13763 796.36426,782.5679 C 835.36426,796.99816 905.36426,799.37799 905.36426,799.37799 L 902.36426,847.47887 L -153.63569,845.87551 L -151.63569,813.2217 z"
-       id="path3814"
-       style="fill:url(#linearGradient3826);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 908.86426,836.95812 C 635.8643,830.91791 761.87636,793.71076 617.8643,836.91791 C 600.0648,842.2582 409.74894,822.981 401.8643,836.91791 C 378.04825,879.01524 73.306465,803.72304 31.864305,827.54883 C 28.864305,829.27358 9.9016246,824.26916 -15.135695,831.28771 C -51.805335,841.56707 -68.135695,826.06042 -107.1357,832.10063 C -146.1357,838.14084 -150.13569,834.11404 -150.13569,834.11404 L -157.13569,848.36741 L 898.86426,847.69627 L 908.86426,836.95812 z"
-       id="path3828"
-       style="fill:#ad8b00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/see.svg b/examples/animation/sub-attaq/pics/scalable/see.svg
deleted file mode 100644
index 0666691..0000000
--- a/examples/animation/sub-attaq/pics/scalable/see.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2650">
-  <defs
-     id="defs2652">
-    <linearGradient
-       id="linearGradient3624">
-      <stop
-         id="stop3626"
-         style="stop-color:#3a8daf;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3636"
-         style="stop-color:#252525;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="552.98486"
-       y1="390.56842"
-       x2="549.39465"
-       y2="702.3479"
-       id="linearGradient3630"
-       xlink:href="#linearGradient3624"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3373776,0,0,1.5004634,-996.17287,-279.00679)" />
-  </defs>
-  <g
-     id="layer1">
-    <rect
-       width="1054.4708"
-       height="461.52972"
-       x="-161.52115"
-       y="310.16876"
-       id="rect3622"
-       style="opacity:1;fill:url(#linearGradient3630);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.13464069;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/sky.svg b/examples/animation/sub-attaq/pics/scalable/sky.svg
deleted file mode 100644
index 1546c08..0000000
--- a/examples/animation/sub-attaq/pics/scalable/sky.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2721">
-  <defs
-     id="defs2723">
-    <linearGradient
-       id="linearGradient3746">
-      <stop
-         id="stop3748"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3750"
-         style="stop-color:#0074b7;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="82.966125"
-       cy="-178.42453"
-       r="526.79456"
-       fx="82.966125"
-       fy="-178.42453"
-       id="radialGradient3880"
-       xlink:href="#linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4952094,0.3367191,-0.1040669,0.5264617,-235.04839,425.12197)" />
-  </defs>
-  <g
-     id="layer1">
-    <rect
-       width="1053.5891"
-       height="291.32797"
-       x="-178.22313"
-       y="300.98392"
-       id="rect3638"
-       style="opacity:1;fill:url(#radialGradient3880);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.1880002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg b/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg
deleted file mode 100644
index b075179..0000000
--- a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg
+++ /dev/null
@@ -1,1473 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="sub-attaq.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="radialGradient3439"
-       cx="-135.625"
-       cy="148.71948"
-       fx="-135.625"
-       fy="148.71948"
-       r="7.625"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="linearGradient3418"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.2134297,-0.5943658,0.6658882,-0.2391126,-274.53441,123.00067)"
-       x1="-132.85063"
-       y1="173.6969"
-       x2="-145.3662"
-       y2="177.59828" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="linearGradient3414"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2134297,-0.5943658,-0.6658882,-0.2391126,-15.893355,122.67824)"
-       x1="-141.85466"
-       y1="181.49153"
-       x2="-144.95044"
-       y2="175.90179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="linearGradient3410"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6315243,0,0,0.7075182,-227.03781,54.321514)"
-       x1="-149.5"
-       y1="177.59448"
-       x2="-145.7928"
-       y2="180.05936" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="linearGradient3406"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6315243,0,0,-0.7075182,-226.40365,274.91611)"
-       x1="-140.46242"
-       y1="177.40488"
-       x2="-147.04802"
-       y2="172.66473" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="linearGradient3402"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6315243,0,0,-0.7075182,-64.045217,275.07466)"
-       x1="-147.2406"
-       y1="180.95567"
-       x2="-140.01878"
-       y2="175.57777" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="linearGradient3398"
-       x1="-146.98956"
-       y1="174.00922"
-       x2="-142.60332"
-       y2="179.38712"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6315243,0,0,0.7075182,-62.683611,54.187362)" />
-    <linearGradient
-       id="linearGradient3366">
-      <stop
-         id="stop3368"
-         offset="0"
-         style="stop-color:#bcbcbc;stop-opacity:1;" />
-      <stop
-         id="stop3370"
-         offset="1"
-         style="stop-color:#191b1c;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3366"
-       id="radialGradient3364"
-       cx="-208.95004"
-       cy="173.10576"
-       fx="-208.95004"
-       fy="173.10576"
-       r="31.667252"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5097">
-      <stop
-         style="stop-color:#19a2db;stop-opacity:0;"
-         offset="0"
-         id="stop5099" />
-      <stop
-         id="stop5109"
-         offset="0.30000001"
-         style="stop-color:#1379a7;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#0e5173;stop-opacity:1;"
-         offset="1"
-         id="stop5101" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3523"
-       inkscape:collect="always">
-      <stop
-         id="stop3525"
-         offset="0"
-         style="stop-color:#b9b9b9;stop-opacity:1" />
-      <stop
-         id="stop3527"
-         offset="1"
-         style="stop-color:#444444;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3438">
-      <stop
-         style="stop-color:#939393;stop-opacity:1;"
-         offset="0"
-         id="stop3440" />
-      <stop
-         id="stop3444"
-         offset="0.12354442"
-         style="stop-color:#d6d6d6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dadada;stop-opacity:1;"
-         offset="0.74055624"
-         id="stop3446" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3442" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3428">
-      <stop
-         id="stop3430"
-         offset="0"
-         style="stop-color:#464646;stop-opacity:1;" />
-      <stop
-         style="stop-color:#848788;stop-opacity:1;"
-         offset="0.18306103"
-         id="stop3432" />
-      <stop
-         id="stop3434"
-         offset="0.66368055"
-         style="stop-color:#9ca0a2;stop-opacity:1;" />
-      <stop
-         id="stop3436"
-         offset="1"
-         style="stop-color:#b5babd;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4034">
-      <stop
-         id="stop4036"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.49803922;"
-         offset="0.5"
-         id="stop4038" />
-      <stop
-         id="stop4040"
-         offset="0.63705367"
-         style="stop-color:#ffffff;stop-opacity:0.24705882;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.12156863;"
-         offset="0.79425853"
-         id="stop4042" />
-      <stop
-         id="stop4044"
-         offset="1"
-         style="stop-color:#a0a0a0;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4016">
-      <stop
-         style="stop-color:#283e6a;stop-opacity:1;"
-         offset="0"
-         id="stop4018" />
-      <stop
-         style="stop-color:#283e6a;stop-opacity:0;"
-         offset="1"
-         id="stop4020" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4004">
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0"
-         id="stop4010" />
-      <stop
-         style="stop-color:#c4c9cb;stop-opacity:1;"
-         offset="1"
-         id="stop4012" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3998">
-      <stop
-         id="stop4000"
-         offset="0"
-         style="stop-color:#adadad;stop-opacity:1;" />
-      <stop
-         id="stop4002"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3864">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3866" />
-      <stop
-         id="stop4028"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.24705882;"
-         offset="0.75"
-         id="stop4030" />
-      <stop
-         id="stop4032"
-         offset="0.875"
-         style="stop-color:#ffffff;stop-opacity:0.12156863;" />
-      <stop
-         style="stop-color:#a0a0a0;stop-opacity:1;"
-         offset="1"
-         id="stop3868" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3816">
-      <stop
-         style="stop-color:#ad8b00;stop-opacity:1;"
-         offset="0"
-         id="stop3818" />
-      <stop
-         style="stop-color:#ad8b00;stop-opacity:0;"
-         offset="1"
-         id="stop3820" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3746">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3748" />
-      <stop
-         style="stop-color:#0074b7;stop-opacity:1;"
-         offset="1"
-         id="stop3750" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3718">
-      <stop
-         style="stop-color:#bcbcbc;stop-opacity:0.28169015;"
-         offset="0"
-         id="stop3720" />
-      <stop
-         style="stop-color:#bcbcbc;stop-opacity:0;"
-         offset="1"
-         id="stop3722" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         style="stop-color:#202020;stop-opacity:1;"
-         offset="0"
-         id="stop3710" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3712" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3692">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3694" />
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:1;"
-         offset="1"
-         id="stop3696" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3656">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3658" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3660" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3624">
-      <stop
-         style="stop-color:#3a8daf;stop-opacity:1;"
-         offset="0"
-         id="stop3626" />
-      <stop
-         id="stop3636"
-         offset="1"
-         style="stop-color:#252525;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3532">
-      <stop
-         id="stop3534"
-         offset="0"
-         style="stop-color:#545454;stop-opacity:1;" />
-      <stop
-         style="stop-color:#848788;stop-opacity:1;"
-         offset="0.44021741"
-         id="stop3536" />
-      <stop
-         id="stop3538"
-         offset="0.56799388"
-         style="stop-color:#9ca0a2;stop-opacity:1;" />
-      <stop
-         id="stop3540"
-         offset="1"
-         style="stop-color:#565d60;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3348"
-         offset="0"
-         style="stop-color:#898989;stop-opacity:1;" />
-      <stop
-         style="stop-color:#9ea1a2;stop-opacity:1;"
-         offset="0.44021741"
-         id="stop3350" />
-      <stop
-         id="stop3352"
-         offset="0.56799388"
-         style="stop-color:#bbbdbf;stop-opacity:1;" />
-      <stop
-         id="stop3354"
-         offset="1"
-         style="stop-color:#f0f1f2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3227">
-      <stop
-         style="stop-color:#444444;stop-opacity:1;"
-         offset="0"
-         id="stop3229" />
-      <stop
-         style="stop-color:#b0b0b0;stop-opacity:1;"
-         offset="1"
-         id="stop3232" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3435">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3437" />
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:0;"
-         offset="1"
-         id="stop3439" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3421">
-      <stop
-         style="stop-color:#444444;stop-opacity:1;"
-         offset="0"
-         id="stop3423" />
-      <stop
-         style="stop-color:#444444;stop-opacity:0;"
-         offset="1"
-         id="stop3425" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3293">
-      <stop
-         style="stop-color:#c4b434;stop-opacity:1;"
-         offset="0"
-         id="stop3295" />
-      <stop
-         style="stop-color:#9b5500;stop-opacity:1;"
-         offset="1"
-         id="stop3297" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3229">
-      <stop
-         style="stop-color:#125a7a;stop-opacity:1;"
-         offset="0"
-         id="stop3231" />
-      <stop
-         style="stop-color:#308fc0;stop-opacity:1;"
-         offset="1"
-         id="stop3233" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3219">
-      <stop
-         id="stop3221"
-         offset="0"
-         style="stop-color:#a55b00;stop-opacity:1;" />
-      <stop
-         id="stop3223"
-         offset="1"
-         style="stop-color:#f4e45e;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3189">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3191" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3193" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3167">
-      <stop
-         style="stop-color:#464646;stop-opacity:1;"
-         offset="0"
-         id="stop3169" />
-      <stop
-         id="stop3345"
-         offset="0.44021741"
-         style="stop-color:#848788;stop-opacity:1;" />
-      <stop
-         style="stop-color:#9ca0a2;stop-opacity:1;"
-         offset="0.56799388"
-         id="stop3347" />
-      <stop
-         style="stop-color:#b5babd;stop-opacity:1;"
-         offset="1"
-         id="stop3171" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3167"
-       id="linearGradient3175"
-       x1="443.95602"
-       y1="315.31854"
-       x2="443.95602"
-       y2="247.85609"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4908502,0,0,0.4579593,350.98557,542.12189)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3219"
-       id="linearGradient3253"
-       gradientUnits="userSpaceOnUse"
-       x1="325.57214"
-       y1="280.13632"
-       x2="312.84424"
-       y2="257.60013" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3229"
-       id="linearGradient3255"
-       gradientUnits="userSpaceOnUse"
-       x1="310.01578"
-       y1="255.47881"
-       x2="325.92572"
-       y2="280.13632" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3219"
-       id="linearGradient3321"
-       gradientUnits="userSpaceOnUse"
-       x1="325.57214"
-       y1="280.13632"
-       x2="312.84424"
-       y2="257.60013" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3229"
-       id="linearGradient3323"
-       gradientUnits="userSpaceOnUse"
-       x1="310.01578"
-       y1="255.47881"
-       x2="325.92572"
-       y2="280.13632" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3219"
-       id="linearGradient3331"
-       gradientUnits="userSpaceOnUse"
-       x1="325.57214"
-       y1="280.13632"
-       x2="312.84424"
-       y2="257.60013" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3229"
-       id="linearGradient3333"
-       gradientUnits="userSpaceOnUse"
-       x1="310.01578"
-       y1="255.47881"
-       x2="325.92572"
-       y2="280.13632" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient3343"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3292883,0,0,1.10796,1.5038593,-24.232315)"
-       x1="359.5589"
-       y1="258.84247"
-       x2="370.88239"
-       y2="258.84247" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3219"
-       id="linearGradient3365"
-       gradientUnits="userSpaceOnUse"
-       x1="325.57214"
-       y1="280.13632"
-       x2="312.84424"
-       y2="257.60013" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3229"
-       id="linearGradient3367"
-       gradientUnits="userSpaceOnUse"
-       x1="310.01578"
-       y1="255.47881"
-       x2="325.92572"
-       y2="280.13632" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3219"
-       id="linearGradient3369"
-       gradientUnits="userSpaceOnUse"
-       x1="325.57214"
-       y1="280.13632"
-       x2="312.84424"
-       y2="257.60013" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3229"
-       id="linearGradient3371"
-       gradientUnits="userSpaceOnUse"
-       x1="310.01578"
-       y1="255.47881"
-       x2="325.92572"
-       y2="280.13632" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3219"
-       id="linearGradient3379"
-       gradientUnits="userSpaceOnUse"
-       x1="325.57214"
-       y1="280.13632"
-       x2="312.84424"
-       y2="257.60013" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3229"
-       id="linearGradient3381"
-       gradientUnits="userSpaceOnUse"
-       x1="310.01578"
-       y1="255.47881"
-       x2="325.92572"
-       y2="280.13632" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient3385"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3267302,0,0,1.1332782,-1.5786343,-29.194748)"
-       x1="371.79858"
-       y1="258.84247"
-       x2="364.49646"
-       y2="258.84247" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient3401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.9807835,0,0,1.1280701,-361.45126,-28.553769)"
-       x1="371.79858"
-       y1="258.84247"
-       x2="364.49646"
-       y2="258.84247" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3421"
-       id="radialGradient3431"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1862613,0,0,0.3638703,-186.86143,179.02055)"
-       cx="432.3343"
-       cy="233.80295"
-       fx="432.3343"
-       fy="233.80295"
-       r="59.056834" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3435"
-       id="radialGradient3441"
-       cx="290.5"
-       cy="244.34448"
-       fx="290.5"
-       fy="244.34448"
-       r="37.5"
-       gradientTransform="matrix(0.8202102,0.8202102,-0.7960458,0.7960458,246.73838,-189.686)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3345"
-       id="linearGradient3311"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.466978,0,0,0.4500435,352.00841,540.25044)"
-       x1="510.99884"
-       y1="161.99408"
-       x2="396.48914"
-       y2="161.99408" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3421"
-       id="radialGradient3339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4181493,0,0,0.1282619,386.09461,620.15777)"
-       cx="432.3343"
-       cy="233.80295"
-       fx="432.3343"
-       fy="233.80295"
-       r="59.056834" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3219"
-       id="linearGradient3434"
-       gradientUnits="userSpaceOnUse"
-       x1="325.57214"
-       y1="280.13632"
-       x2="312.84424"
-       y2="257.60013" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3229"
-       id="linearGradient3436"
-       gradientUnits="userSpaceOnUse"
-       x1="310.01578"
-       y1="255.47881"
-       x2="325.92572"
-       y2="280.13632" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3532"
-       id="linearGradient3520"
-       x1="525"
-       y1="371.09448"
-       x2="525"
-       y2="395.09448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5865192,0,0,0.2518015,339.73218,572.99479)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3624"
-       id="linearGradient3630"
-       x1="552.98486"
-       y1="390.56842"
-       x2="549.39465"
-       y2="702.3479"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.3373776,0,0,1.5004634,-835.38716,-310.82676)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3656"
-       id="radialGradient3662"
-       cx="656.19507"
-       cy="534.45917"
-       fx="656.19507"
-       fy="534.45917"
-       r="13.227922"
-       gradientTransform="matrix(1,0,0,1.2672781,0,-144.63884)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3656"
-       id="radialGradient3668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2672781,0,-144.63884)"
-       cx="656.19507"
-       cy="534.45917"
-       fx="656.19507"
-       fy="534.45917"
-       r="13.227922" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3656"
-       id="radialGradient3672"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2672781,0,-144.63884)"
-       cx="656.19507"
-       cy="534.45917"
-       fx="656.19507"
-       fy="534.45917"
-       r="13.227922" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3656"
-       id="radialGradient3676"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2672781,0,-144.63884)"
-       cx="656.19507"
-       cy="534.45917"
-       fx="656.19507"
-       fy="534.45917"
-       r="13.227922" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3692"
-       id="linearGradient3772"
-       gradientUnits="userSpaceOnUse"
-       x1="506.95975"
-       y1="469.73706"
-       x2="525.41608"
-       y2="469.73706" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3718"
-       id="linearGradient3774"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9947644,0,0,1.3346457,2.7877039,-166.60153)"
-       x1="516.89508"
-       y1="503.50137"
-       x2="516.89508"
-       y2="543.80646" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3708"
-       id="linearGradient3776"
-       gradientUnits="userSpaceOnUse"
-       x1="518.26993"
-       y1="497.31477"
-       x2="533.02923"
-       y2="497.31477" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3692"
-       id="linearGradient3790"
-       gradientUnits="userSpaceOnUse"
-       x1="506.95975"
-       y1="469.73706"
-       x2="525.41608"
-       y2="469.73706" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3718"
-       id="linearGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9947644,0,0,1.3346457,2.7877039,-166.60153)"
-       x1="516.89508"
-       y1="503.50137"
-       x2="516.89508"
-       y2="543.80646" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3708"
-       id="linearGradient3794"
-       gradientUnits="userSpaceOnUse"
-       x1="518.26993"
-       y1="497.31477"
-       x2="533.02923"
-       y2="497.31477" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3656"
-       id="radialGradient3804"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2672781,0,-144.63884)"
-       cx="656.19507"
-       cy="534.45917"
-       fx="656.19507"
-       fy="534.45917"
-       r="13.227922" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3656"
-       id="radialGradient3808"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2672781,0,-144.63884)"
-       cx="656.19507"
-       cy="534.45917"
-       fx="656.19507"
-       fy="534.45917"
-       r="13.227922" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3227"
-       id="linearGradient3812"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1223608,0,0,0.3849769,-17.516054,565.40983)"
-       x1="543.5"
-       y1="205.19257"
-       x2="587.52001"
-       y2="205.19257" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3816"
-       id="linearGradient3826"
-       x1="573"
-       y1="755.46222"
-       x2="573"
-       y2="700.13464"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.6033628,0,-450.76899)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient3874"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.9674693,0.8647541,-0.8726553,1.0212484,-15.308759,-74.232772)"
-       cx="94.273849"
-       cy="89.893486"
-       fx="94.273849"
-       fy="89.893486"
-       r="74.397521" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3746"
-       id="radialGradient3880"
-       cx="82.966125"
-       cy="-178.42453"
-       fx="82.966125"
-       fy="-178.42453"
-       r="526.79456"
-       gradientTransform="matrix(1.4952094,0.3367191,-0.1040669,0.5264617,-57.119818,125.77043)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3438"
-       id="linearGradient3948"
-       x1="660.29303"
-       y1="256.53284"
-       x2="444.79303"
-       y2="255.62085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,32.526912)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3692"
-       id="linearGradient3972"
-       x1="573.5"
-       y1="244.2056"
-       x2="578.25"
-       y2="216.9556"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,35.526912)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3746"
-       id="linearGradient3990"
-       x1="542.5"
-       y1="222.59448"
-       x2="559"
-       y2="222.59448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6.25,37.151912)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3746"
-       id="linearGradient3994"
-       gradientUnits="userSpaceOnUse"
-       x1="542.5"
-       y1="222.59448"
-       x2="559"
-       y2="222.59448"
-       gradientTransform="translate(38.5,37.151912)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4016"
-       id="linearGradient4022"
-       x1="639"
-       y1="262.09448"
-       x2="667"
-       y2="262.09448"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective2578"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3746"
-       id="linearGradient3387"
-       gradientUnits="userSpaceOnUse"
-       x1="542.5"
-       y1="222.59448"
-       x2="559"
-       y2="222.59448"
-       gradientTransform="translate(15.875,37.151912)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3167"
-       id="linearGradient3416"
-       x1="474.23065"
-       y1="229.92336"
-       x2="474.1944"
-       y2="218.27365"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.1004684,32.526757)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3428"
-       id="linearGradient3426"
-       x1="592.92798"
-       y1="199.43727"
-       x2="557.05743"
-       y2="196.5448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(12.140805,-13.041887)" />
-    <filter
-       inkscape:collect="always"
-       id="filter3507">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.0523171"
-         id="feGaussianBlur3509" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3523"
-       id="linearGradient3521"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-0.7291751,0,521.83983)"
-       x1="562.55634"
-       y1="285.89896"
-       x2="562.55634"
-       y2="244.09448" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5097"
-       id="linearGradient5103"
-       x1="590.84674"
-       y1="274.57559"
-       x2="590.84674"
-       y2="334.01376"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient5107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.9674693,0.8647541,-0.8726553,1.0212484,-15.308759,-74.232772)"
-       cx="94.273849"
-       cy="89.893486"
-       fx="94.273849"
-       fy="89.893486"
-       r="74.397521" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.70710678"
-     inkscape:cx="532.91407"
-     inkscape:cy="457.84365"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1674"
-     inkscape:window-height="1000"
-     inkscape:window-x="2"
-     inkscape:window-y="14"
-     showguides="false" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:url(#radialGradient3880);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.1880002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3638"
-       width="1053.5891"
-       height="291.32797"
-       x="-0.29455566"
-       y="1.6323624" />
-    <path
-       style="fill:url(#radialGradient3874);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3507)"
-       d="M 158.37853,75.817898 C 130.95894,49.483192 82.14552,74.615971 85.85382,95.15981 C 49.691853,94.8009 50.214842,139.36083 83.29101,132.16343 C 144.66465,163.16454 159.26268,129.80212 164.6863,136.51386 C 225.60448,157.97672 246.34362,130.65438 265.24417,127.0714 C 294.43981,137.91859 337.16986,121.78798 297.03636,102.77604 C 331.73096,64.597047 277.96882,60.229366 253.07028,70.400868 C 191.09597,33.610112 168.89234,63.292037 158.37853,75.817898 z"
-       id="path3872"
-       sodipodi:nodetypes="cccccccc"
-       transform="matrix(1.5062893,0,0,1.1720951,618.04001,132.36768)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3630);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.13464069;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3622"
-       width="1054.4708"
-       height="461.52972"
-       x="-0.7354126"
-       y="278.34879" />
-    <path
-       style="fill:url(#linearGradient3826);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M -0.99999999,712.83731 C 272,698.40705 -51.363087,575.30331 261,705.40705 C 324.46247,731.84009 395,707.01041 449,705.40705 C 503,703.80369 463,690.73643 510,711.58015 C 557,732.42386 705,692.39023 750,684.37342 C 795,676.35661 908,667.75324 947,682.18351 C 986,696.61377 1056,698.9936 1056,698.9936 L 1053,747.09448 L -3,745.49112 L -0.99999999,712.83731 z"
-       id="path3814"
-       sodipodi:nodetypes="cssssscccc" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3520);fill-opacity:1;fill-rule:nonzero;stroke:#1b1e1f;stroke-width:0.56879884;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3512"
-       width="10.557344"
-       height="6.0432386"
-       x="642.3761"
-       y="666.43695" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path2455"
-       id="use3258"
-       transform="matrix(0.869168,0,0,-0.869168,81.98751,1246.5374)"
-       width="1052.3622"
-       height="744.09448" />
-    <path
-       style="fill:url(#linearGradient3812);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.77744257;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 593.04822,651.68104 C 593.04822,651.68104 653.65569,615.49321 639.065,637.05192 C 624.47431,658.61061 624.47431,658.61061 624.47431,658.61061 L 593.04822,651.68104 z"
-       id="path2455" />
-    <path
-       style="fill:url(#linearGradient3175);fill-opacity:1;fill-rule:evenodd;stroke:#393939;stroke-width:1.90693891;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 485.26939,643.71814 C 443.15507,651.66437 458.5319,680.53556 502.21486,686.27814 C 551.68229,692.78115 568.45042,691.0115 605.34827,686.27814 C 657.60843,679.57406 657.68143,651.78445 605.34827,643.25553 C 553.98131,634.88408 516.10913,637.89923 485.26939,643.71814 z"
-       id="path2385"
-       sodipodi:nodetypes="cssss" />
-    <path
-       style="fill:url(#radialGradient3339);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 542.18031,648.1112 C 548.56327,665.42741 608.42397,656.72745 586.93551,642.57104 C 586.93551,642.57104 543.33293,648.61096 542.18031,648.1112 z"
-       id="path3403"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:url(#linearGradient3311);fill-opacity:1;fill-rule:evenodd;stroke:#2d2d2d;stroke-width:2.07042313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 537.39402,641.90906 C 537.39402,656.7605 583.62247,656.30589 583.62247,641.45445 L 583.62247,636.06071 C 583.62247,621.21003 537.39402,613.87461 537.39402,628.72529 L 537.39402,641.90906 z"
-       id="path3291"
-       sodipodi:nodetypes="cssss" />
-    <g
-       id="g3235"
-       transform="matrix(1.4016868,0,0,1.1319742,112.22001,-99.678822)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3441);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.227;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3433"
-       sodipodi:cx="303.5"
-       sodipodi:cy="263.09448"
-       sodipodi:rx="37.5"
-       sodipodi:ry="40"
-       d="M 341,263.09448 A 37.5,40 0 1 1 266,263.09448 A 37.5,40 0 1 1 341,263.09448 z"
-       transform="matrix(0.692163,0,1.4106583e-2,0.289185,275.31394,582.37251)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.06500006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3458"
-       sodipodi:cx="369.5"
-       sodipodi:cy="316.09448"
-       sodipodi:rx="27.5"
-       sodipodi:ry="7"
-       d="M 397,316.09448 A 27.5,7 0 1 1 342,316.09448 A 27.5,7 0 1 1 397,316.09448 z"
-       transform="matrix(0.5642633,0,0,0.5642633,348.03095,450.47113)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:#1b1e1f;stroke-width:4.23126984;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3510"
-       sodipodi:cx="369.5"
-       sodipodi:cy="316.09448"
-       sodipodi:rx="27.5"
-       sodipodi:ry="7"
-       d="M 397,316.09448 A 27.5,7 0 1 1 342,316.09448 A 27.5,7 0 1 1 397,316.09448 z"
-       transform="matrix(0,0.30778,-0.5642633,0,828.66499,563.5944)" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3510"
-       id="use3544"
-       transform="translate(0.5000005,-17.23511)"
-       width="1052.3622"
-       height="744.09448" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#787878;fill-opacity:1;fill-rule:nonzero;stroke:#1b1e1f;stroke-width:2.38492584;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3584"
-       sodipodi:cx="237.5"
-       sodipodi:cy="366.09448"
-       sodipodi:rx="8.5"
-       sodipodi:ry="8"
-       d="M 246,366.09448 A 8.5,8 0 1 1 229,366.09448 A 8.5,8 0 1 1 246,366.09448 z"
-       transform="matrix(1.7798114,-4.2997512e-2,1.3318941e-2,0.5513151,196.65666,476.1443)" />
-    <path
-       style="fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:3.49756980000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 423.2231,281.1169 C 502.67948,283.47026 574.8361,283.42778 668.97714,281.1169 C 668.97714,281.1169 670.77663,271.99598 668.97714,269.5402 C 559.46065,250.8302 423.2231,265.08614 423.2231,269.5402 L 423.2231,281.1169 z"
-       id="path3469"
-       sodipodi:nodetypes="cccsc" />
-    <rect
-       style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3408"
-       width="3.4280596"
-       height="29.611124"
-       x="709.89148"
-       y="-14.462622"
-       transform="matrix(0.9327494,0.3605254,-0.3633626,0.9316478,0,0)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3416);fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:2.99999928;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3376"
-       width="48.499989"
-       height="8.5"
-       x="444.56302"
-       y="252.39224"
-       transform="matrix(0.9999952,3.0887776e-3,-3.0887776e-3,0.9999952,0,0)" />
-    <path
-       style="fill:url(#linearGradient3972);fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 509,277.62139 C 509,277.62139 547.41409,235.70896 524,232.62139 L 615,244.62139 L 615,279.62139 L 509,277.62139 z"
-       id="path3952"
-       sodipodi:nodetypes="csccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3662);fill-opacity:1;fill-rule:nonzero;stroke:#41526b;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3654"
-       sodipodi:cx="656.19507"
-       sodipodi:cy="541.15485"
-       sodipodi:rx="12.727922"
-       sodipodi:ry="16.263456"
-       d="M 668.92299,541.15485 A 12.727922,16.263456 0 1 1 643.46715,541.15485 A 12.727922,16.263456 0 1 1 668.92299,541.15485 z"
-       transform="matrix(0.5187874,0,0,0.3968421,374.8524,387.30025)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3668);fill-opacity:1;fill-rule:nonzero;stroke:#41526b;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3666"
-       sodipodi:cx="656.19507"
-       sodipodi:cy="541.15485"
-       sodipodi:rx="12.727922"
-       sodipodi:ry="16.263456"
-       d="M 668.92299,541.15485 A 12.727922,16.263456 0 1 1 643.46715,541.15485 A 12.727922,16.263456 0 1 1 668.92299,541.15485 z"
-       transform="matrix(0.5734968,0,0,0.4386917,316.52295,315.62837)" />
-    <path
-       transform="matrix(0.8598866,0,0,0.5637407,192.52282,220.77351)"
-       d="M 668.92299,541.15485 A 12.727922,16.263456 0 1 1 643.46715,541.15485 A 12.727922,16.263456 0 1 1 668.92299,541.15485 z"
-       sodipodi:ry="16.263456"
-       sodipodi:rx="12.727922"
-       sodipodi:cy="541.15485"
-       sodipodi:cx="656.19507"
-       id="path3670"
-       style="opacity:1;fill:url(#radialGradient3672);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.90000010000000020;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3676);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.90000010000000020;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3674"
-       sodipodi:cx="656.19507"
-       sodipodi:cy="541.15485"
-       sodipodi:rx="12.727922"
-       sodipodi:ry="16.263456"
-       d="M 668.92299,541.15485 A 12.727922,16.263456 0 1 1 643.46715,541.15485 A 12.727922,16.263456 0 1 1 668.92299,541.15485 z"
-       transform="matrix(0.7435991,0,0,0.6264519,225.8301,127.83701)" />
-    <g
-       id="g3759"
-       transform="matrix(0.8830571,0,0,0.8830571,104.83144,103.2985)">
-      <path
-         d="M 523.9661,469.73706 A 7.7781744,34.648232 0 1 1 508.40975,469.73706 A 7.7781744,34.648232 0 1 1 523.9661,469.73706 z"
-         sodipodi:ry="34.648232"
-         sodipodi:rx="7.7781744"
-         sodipodi:cy="469.73706"
-         sodipodi:cx="516.18793"
-         id="path3682"
-         style="opacity:1;fill:url(#linearGradient3772);fill-opacity:1;fill-rule:nonzero;stroke:#272727;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <g
-         id="g3754">
-        <rect
-           style="opacity:1;fill:url(#linearGradient3774);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect3716"
-           width="33.58757"
-           height="59.927299"
-           x="498.86386"
-           y="497.84454" />
-        <path
-           style="fill:url(#linearGradient3776);fill-opacity:1;fill-rule:evenodd;stroke:#1f1f1f;stroke-width:1.99788344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 523.35045,482.89424 C 523.35045,482.89424 532.31256,488.20203 532.02344,500.14638 C 531.73431,512.09072 531.73431,511.73417 531.73431,511.73417 C 531.73431,511.73417 520.70627,493.83104 519.26887,499.77636 L 523.35045,482.89424 z"
-           id="path3704"
-           sodipodi:nodetypes="cscsc" />
-        <path
-           sodipodi:nodetypes="cscsc"
-           id="path3706"
-           d="M 508.50327,482.89424 C 508.50327,482.89424 499.54116,488.20203 499.83028,500.14638 C 500.11941,512.09072 500.11941,511.73417 500.11941,511.73417 C 500.11941,511.73417 511.14745,493.83104 512.58485,499.77636 L 508.50327,482.89424 z"
-           style="fill:#bcbcbc;fill-opacity:1;fill-rule:evenodd;stroke:#1f1f1f;stroke-width:1.99788344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.8830571,0,0,0.8830571,192.45885,-66.370546)"
-       id="g3778">
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient3790);fill-opacity:1;fill-rule:nonzero;stroke:#272727;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path3780"
-         sodipodi:cx="516.18793"
-         sodipodi:cy="469.73706"
-         sodipodi:rx="7.7781744"
-         sodipodi:ry="34.648232"
-         d="M 523.9661,469.73706 A 7.7781744,34.648232 0 1 1 508.40975,469.73706 A 7.7781744,34.648232 0 1 1 523.9661,469.73706 z" />
-      <g
-         id="g3782">
-        <rect
-           y="497.84454"
-           x="498.86386"
-           height="59.927299"
-           width="33.58757"
-           id="rect3784"
-           style="opacity:1;fill:url(#linearGradient3792);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="cscsc"
-           id="path3786"
-           d="M 523.35045,482.89424 C 523.35045,482.89424 532.31256,488.20203 532.02344,500.14638 C 531.73431,512.09072 531.73431,511.73417 531.73431,511.73417 C 531.73431,511.73417 520.70627,493.83104 519.26887,499.77636 L 523.35045,482.89424 z"
-           style="fill:url(#linearGradient3794);fill-opacity:1;fill-rule:evenodd;stroke:#1f1f1f;stroke-width:1.99788344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           style="fill:#bcbcbc;fill-opacity:1;fill-rule:evenodd;stroke:#1f1f1f;stroke-width:1.99788344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 508.50327,482.89424 C 508.50327,482.89424 499.54116,488.20203 499.83028,500.14638 C 500.11941,512.09072 500.11941,511.73417 500.11941,511.73417 C 500.11941,511.73417 511.14745,493.83104 512.58485,499.77636 L 508.50327,482.89424 z"
-           id="path3788"
-           sodipodi:nodetypes="cscsc" />
-      </g>
-    </g>
-    <path
-       transform="matrix(0.4292897,0,0,0.3283816,384.32775,481.20689)"
-       d="M 668.92299,541.15485 A 12.727922,16.263456 0 1 1 643.46715,541.15485 A 12.727922,16.263456 0 1 1 668.92299,541.15485 z"
-       sodipodi:ry="16.263456"
-       sodipodi:rx="12.727922"
-       sodipodi:cy="541.15485"
-       sodipodi:cx="656.19507"
-       id="path3802"
-       style="opacity:1;fill:url(#radialGradient3804);fill-opacity:1;fill-rule:nonzero;stroke:#41526b;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient3808);fill-opacity:1;fill-rule:nonzero;stroke:#41526b;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3806"
-       sodipodi:cx="656.19507"
-       sodipodi:cy="541.15485"
-       sodipodi:rx="12.727922"
-       sodipodi:ry="16.263456"
-       d="M 668.92299,541.15485 A 12.727922,16.263456 0 1 1 643.46715,541.15485 A 12.727922,16.263456 0 1 1 668.92299,541.15485 z"
-       transform="matrix(0.5842998,0,0,0.4469553,299.7804,369.91514)" />
-    <path
-       style="fill:#ad8b00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 1059.5,736.57373 C 786.5,730.53352 912.51207,693.32637 768.5,736.53352 C 750.7005,741.87381 560.38464,722.59661 552.5,736.53352 C 528.68395,778.63085 223.94216,703.33865 182.5,727.16444 C 179.5,728.88919 160.53732,723.88477 135.5,730.90332 C 98.830356,741.18268 82.5,725.67603 43.5,731.71624 C 4.5,737.75645 0.5,733.72965 0.5,733.72965 L -6.5,747.98302 L 1049.5,747.31188 L 1059.5,736.57373 z"
-       id="path3828"
-       sodipodi:nodetypes="cssssscccc" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient5103);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3448"
-       width="1053.5891"
-       height="67.882248"
-       x="-0.29455566"
-       y="274.57559" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path3519"
-       d="M 428,343.85222 C 428,343.85222 457.01739,315.41439 470,315.41439 C 481.98261,313.04457 634.13054,311.73511 652,317.41962 C 661.13441,320.56943 664.46012,324.9477 666,343.85222 C 600.25603,336.72647 497.8192,336.4719 428,343.85222 z"
-       style="opacity:0.43933058;fill:url(#linearGradient3521);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.0999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:url(#linearGradient3948);fill-opacity:1;fill-rule:evenodd;stroke:#545454;stroke-width:3.0999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 428,276.62139 C 428,276.62139 457.01739,315.62139 470,315.62139 C 481.98261,318.87139 634.13054,320.6672 652,312.87139 C 661.13441,308.55171 664.46012,302.54729 666,276.62139 C 600.25603,286.39373 497.8192,286.74286 428,276.62139 z"
-       id="path3938"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 466.00273,263.08289 L 484.25264,263.13926 L 494.7163,274.92164 L 465.96644,274.83284 L 466.00273,263.08289 z"
-       id="rect3378"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3990);fill-opacity:1;fill-rule:nonzero;stroke:#323232;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3974"
-       width="13.5"
-       height="17"
-       x="537.75"
-       y="251.2464"
-       inkscape:transform-center-x="30" />
-    <rect
-       inkscape:transform-center-x="30"
-       y="251.2464"
-       x="582.5"
-       height="17"
-       width="13.5"
-       id="rect3992"
-       style="opacity:1;fill:url(#linearGradient3994);fill-opacity:1;fill-rule:nonzero;stroke:#323232;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:#484848;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 422.25,268.87139 C 487.33333,277.37139 573.16667,279.87139 668.5,268.87139 C 668.5,268.87139 670.30312,275.56827 668.5,277.37139 C 558.76249,291.1089 422.25,280.64171 422.25,277.37139 L 422.25,268.87139 z"
-       id="rect2558"
-       sodipodi:nodetypes="cccsc" />
-    <rect
-       style="opacity:1;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:3.0365274;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2569"
-       width="94.427879"
-       height="7.236649"
-       x="546.39832"
-       y="177.10637"
-       transform="matrix(0.9947793,0.1020501,-0.1079723,0.9941539,0,0)" />
-    <rect
-       inkscape:transform-center-x="30"
-       y="251.2464"
-       x="559.875"
-       height="17"
-       width="13.5"
-       id="rect3385"
-       style="opacity:1;fill:url(#linearGradient3387);fill-opacity:1;fill-rule:nonzero;stroke:#323232;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       id="g3401"
-       transform="matrix(0.9246214,0.3808874,-0.3808874,0.9246214,113.30125,-193.16902)"
-       inkscape:transform-center-x="17.590385"
-       inkscape:transform-center-y="-15.415449">
-      <rect
-         inkscape:transform-center-y="-43.888889"
-         transform="matrix(0,1,-1,0,0,0)"
-         style="opacity:1;fill:#b20000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3389"
-         width="19.75"
-         height="27.75"
-         x="193.34448"
-         y="-709" />
-      <rect
-         y="200.59448"
-         x="681.5"
-         height="5.75"
-         width="27.25"
-         id="rect3393"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="193.59448"
-         x="691.25"
-         height="19.5"
-         width="5.75"
-         id="rect3395"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="202.34448"
-         x="681.5"
-         height="2.5"
-         width="27.75"
-         id="rect3397"
-         style="opacity:1;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="193.59448"
-         x="692.5"
-         height="19.25"
-         width="3"
-         id="rect3399"
-         style="opacity:1;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:#dcdcdc;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:3.03650045;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 529.42326,227.17914 L 616.35817,235.81552 L 618.07681,241.50986 L 524.14191,231.87348 L 529.42326,227.17914 z"
-       id="rect3466"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3426);fill-opacity:1;fill-rule:nonzero;stroke:#494949;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3418"
-       width="34.5"
-       height="14.5"
-       x="571.14081"
-       y="174.8026"
-       transform="matrix(0.997157,7.5351915e-2,-7.5351915e-2,0.997157,0,0)"
-       inkscape:transform-center-x="-8"
-       inkscape:transform-center-y="2" />
-    <g
-       id="mine"
-       transform="translate(971.11461,237.62715)"
-       inkscape:label="#g3441">
-      <path
-         transform="matrix(0.6341613,0,0,0.6341613,-18.521242,45.718192)"
-         d="M -167.5843,186.54079 A 31.466251,31.466251 0 1 1 -230.5168,186.54079 A 31.466251,31.466251 0 1 1 -167.5843,186.54079 z"
-         sodipodi:ry="31.466251"
-         sodipodi:rx="31.466251"
-         sodipodi:cy="186.54079"
-         sodipodi:cx="-199.05055"
-         id="path2586"
-         style="opacity:1;fill:url(#radialGradient3364);fill-opacity:1;stroke:#131313;stroke-width:3.54799318;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccss"
-         id="path3382"
-         d="M -155.20193,175.4167 C -157.60085,176.6451 -156.78074,184.26068 -156.78074,184.26068 C -156.78074,184.26068 -148.33787,181.58301 -148.57092,178.60053 C -148.74283,176.40051 -153.23774,174.41092 -155.20193,175.4167 z"
-         style="fill:url(#linearGradient3398);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccss"
-         id="path3400"
-         d="M -156.56354,153.84532 C -158.96246,152.61693 -158.14235,145.00135 -158.14235,145.00135 C -158.14235,145.00135 -149.69948,147.67902 -149.93253,150.66149 C -150.10444,152.86151 -154.59935,154.85111 -156.56354,153.84532 z"
-         style="fill:url(#linearGradient3402);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccss"
-         id="path3404"
-         d="M -133.88532,153.68678 C -131.48641,152.45838 -132.30652,144.8428 -132.30652,144.8428 C -132.30652,144.8428 -140.74938,147.52047 -140.51633,150.50295 C -140.34442,152.70297 -135.84951,154.69256 -133.88532,153.68678 z"
-         style="fill:url(#linearGradient3406);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccss"
-         id="path3408"
-         d="M -134.51948,175.55085 C -132.12057,176.77925 -132.94068,184.39483 -132.94068,184.39483 C -132.94068,184.39483 -141.38355,181.71716 -141.15049,178.73469 C -140.97858,176.53467 -136.48367,174.54507 -134.51948,175.55085 z"
-         style="fill:url(#linearGradient3410);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccss"
-         id="path3412"
-         d="M -161.25709,168.78221 C -163.22395,170.62484 -170.11427,165.85236 -170.11427,165.85236 C -170.11427,165.85236 -164.7408,160.23808 -162.01257,161.46538 C -160.00011,162.37068 -159.64667,167.27352 -161.25709,168.78221 z"
-         style="fill:url(#linearGradient3414);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccss"
-         id="path3416"
-         d="M -129.17068,169.10464 C -127.20382,170.94727 -120.3135,166.17478 -120.3135,166.17478 C -120.3135,166.17478 -125.68697,160.5605 -128.41519,161.7878 C -130.42766,162.69311 -130.7811,167.59595 -129.17068,169.10464 z"
-         style="fill:url(#linearGradient3418);fill-opacity:1;fill-rule:evenodd;stroke:#131313;stroke-width:2.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         transform="matrix(0.6341613,0,0,0.6341613,-61.039517,68.324922)"
-         d="M -126,151.21948 A 6.625,6.625 0 1 1 -139.25,151.21948 A 6.625,6.625 0 1 1 -126,151.21948 z"
-         sodipodi:ry="6.625"
-         sodipodi:rx="6.625"
-         sodipodi:cy="151.21948"
-         sodipodi:cx="-132.625"
-         id="path3426"
-         style="opacity:1;fill:url(#radialGradient3439);fill-opacity:1;stroke:#131313;stroke-width:3.54799318;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/submarine.svg b/examples/animation/sub-attaq/pics/scalable/submarine.svg
deleted file mode 100644
index 8a0ffdd..0000000
--- a/examples/animation/sub-attaq/pics/scalable/submarine.svg
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2594">
-  <defs
-     id="defs2596">
-    <linearGradient
-       id="linearGradient3345">
-      <stop
-         id="stop3348"
-         style="stop-color:#898989;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3350"
-         style="stop-color:#9ea1a2;stop-opacity:1"
-         offset="0.44021741" />
-      <stop
-         id="stop3352"
-         style="stop-color:#bbbdbf;stop-opacity:1"
-         offset="0.56799388" />
-      <stop
-         id="stop3354"
-         style="stop-color:#f0f1f2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="510.99884"
-       y1="161.99408"
-       x2="396.48914"
-       y2="161.99408"
-       id="linearGradient3311"
-       xlink:href="#linearGradient3345"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.466978,0,0,0.4500435,231.58508,159.95135)" />
-    <linearGradient
-       id="linearGradient3532">
-      <stop
-         id="stop3534"
-         style="stop-color:#545454;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3536"
-         style="stop-color:#848788;stop-opacity:1"
-         offset="0.44021741" />
-      <stop
-         id="stop3538"
-         style="stop-color:#9ca0a2;stop-opacity:1"
-         offset="0.56799388" />
-      <stop
-         id="stop3540"
-         style="stop-color:#565d60;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="525"
-       y1="371.09448"
-       x2="525"
-       y2="395.09448"
-       id="linearGradient3520"
-       xlink:href="#linearGradient3532"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5865192,0,0,0.2518015,219.30885,192.6957)" />
-    <linearGradient
-       id="linearGradient3227">
-      <stop
-         id="stop3229"
-         style="stop-color:#444444;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3232"
-         style="stop-color:#b0b0b0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="543.5"
-       y1="205.19257"
-       x2="587.52002"
-       y2="205.19257"
-       id="linearGradient3812"
-       xlink:href="#linearGradient3227"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1223608,0,0,0.3849769,-137.93938,185.11074)" />
-    <linearGradient
-       id="linearGradient3167">
-      <stop
-         id="stop3169"
-         style="stop-color:#464646;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:#848788;stop-opacity:1"
-         offset="0.44021741" />
-      <stop
-         id="stop3347"
-         style="stop-color:#9ca0a2;stop-opacity:1"
-         offset="0.56799388" />
-      <stop
-         id="stop3171"
-         style="stop-color:#b5babd;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="443.95602"
-       y1="315.31854"
-       x2="443.95602"
-       y2="247.85609"
-       id="linearGradient3175"
-       xlink:href="#linearGradient3167"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4908502,0,0,0.4579593,230.56224,161.8228)" />
-    <linearGradient
-       id="linearGradient3421">
-      <stop
-         id="stop3423"
-         style="stop-color:#444444;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3425"
-         style="stop-color:#444444;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="432.33429"
-       cy="233.80295"
-       r="59.056835"
-       fx="432.33429"
-       fy="233.80295"
-       id="radialGradient3339"
-       xlink:href="#linearGradient3421"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4181493,0,0,0.1282619,265.67128,239.85868)" />
-    <linearGradient
-       id="linearGradient3435">
-      <stop
-         id="stop3437"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3439"
-         style="stop-color:#c0c0c0;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="290.5"
-       cy="244.34448"
-       r="37.5"
-       fx="290.5"
-       fy="244.34448"
-       id="radialGradient3441"
-       xlink:href="#linearGradient3435"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8202102,0.8202102,-0.7960458,0.7960458,246.73838,-189.686)" />
-  </defs>
-  <g
-     id="submarine">
-    <rect
-       width="10.557344"
-       height="6.0432386"
-       x="521.95276"
-       y="286.13785"
-       id="rect3512"
-       style="opacity:1;fill:url(#linearGradient3520);fill-opacity:1;fill-rule:nonzero;stroke:#1b1e1f;stroke-width:0.56879884;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 472.62489,271.38195 C 472.62489,271.38195 533.23236,235.19412 518.64167,256.75283 C 504.05098,278.31152 504.05098,278.31152 504.05098,278.31152 L 472.62489,271.38195 z"
-       id="path2455"
-       style="fill:url(#linearGradient3812);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.77744257;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 364.84606,263.41905 C 322.73174,271.36528 338.10857,300.23647 381.79153,305.97905 C 431.25896,312.48206 448.02709,310.71241 484.92494,305.97905 C 537.1851,299.27497 537.2581,271.48536 484.92494,262.95644 C 433.55798,254.58499 395.6858,257.60014 364.84606,263.41905 z"
-       id="path2385"
-       style="fill:url(#linearGradient3175);fill-opacity:1;fill-rule:evenodd;stroke:#393939;stroke-width:1.90693891;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 421.75698,267.81211 C 428.13994,285.12832 488.00064,276.42836 466.51218,262.27195 C 466.51218,262.27195 422.9096,268.31187 421.75698,267.81211 z"
-       id="path3403"
-       style="fill:url(#radialGradient3339);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 416.97069,261.60997 C 416.97069,276.46141 463.19914,276.0068 463.19914,261.15536 L 463.19914,255.76162 C 463.19914,240.91094 416.97069,233.57552 416.97069,248.4262 L 416.97069,261.60997 z"
-       id="path3291"
-       style="fill:url(#linearGradient3311);fill-opacity:1;fill-rule:evenodd;stroke:#2d2d2d;stroke-width:2.07042313;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 341,263.09448 A 37.5,40 0 1 1 266,263.09448 A 37.5,40 0 1 1 341,263.09448 z"
-       transform="matrix(0.692163,0,1.4106583e-2,0.289185,154.89061,202.07342)"
-       id="path3433"
-       style="opacity:1;fill:url(#radialGradient3441);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.227;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 397,316.09448 A 27.5,7 0 1 1 342,316.09448 A 27.5,7 0 1 1 397,316.09448 z"
-       transform="matrix(0.5642633,0,0,0.5642633,227.60762,70.172035)"
-       id="path3458"
-       style="opacity:1;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.06500006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 397,316.09448 A 27.5,7 0 1 1 342,316.09448 A 27.5,7 0 1 1 397,316.09448 z"
-       transform="matrix(0,0.30778,-0.5642633,0,708.24166,183.29531)"
-       id="path3510"
-       style="opacity:1;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:#1b1e1f;stroke-width:4.23126984;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <use
-       transform="translate(0.5000044,-17.235115)"
-       id="use3544"
-       x="0"
-       y="0"
-       width="1052.3622"
-       height="744.09448"
-       xlink:href="#path3510" />
-    <path
-       d="M 246,366.09448 A 8.5,8 0 1 1 229,366.09448 A 8.5,8 0 1 1 246,366.09448 z"
-       transform="matrix(1.7798114,-4.2997512e-2,1.3318941e-2,0.5513151,76.233334,95.845205)"
-       id="path3584"
-       style="opacity:1;fill:#787878;fill-opacity:1;fill-rule:nonzero;stroke:#1b1e1f;stroke-width:2.38492584;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/surface.svg b/examples/animation/sub-attaq/pics/scalable/surface.svg
deleted file mode 100644
index 40ed239..0000000
--- a/examples/animation/sub-attaq/pics/scalable/surface.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2685">
-  <defs
-     id="defs2687">
-    <linearGradient
-       id="linearGradient5097">
-      <stop
-         id="stop5099"
-         style="stop-color:#19a2db;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop5109"
-         style="stop-color:#1379a7;stop-opacity:0.49803922"
-         offset="0.30000001" />
-      <stop
-         id="stop5101"
-         style="stop-color:#0e5173;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="590.84674"
-       y1="274.57559"
-       x2="590.84674"
-       y2="334.01376"
-       id="linearGradient5103"
-       xlink:href="#linearGradient5097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-172.21428,209.55976)"
-       spreadMethod="pad" />
-  </defs>
-  <g
-     id="layer1">
-    <rect
-       width="1053.5891"
-       height="67.882248"
-       x="-172.50883"
-       y="484.13535"
-       id="rect3448"
-       style="opacity:1;fill:url(#linearGradient5103);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/scalable/torpedo.svg b/examples/animation/sub-attaq/pics/scalable/torpedo.svg
deleted file mode 100644
index 48e429d..0000000
--- a/examples/animation/sub-attaq/pics/scalable/torpedo.svg
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="744.09448"
-   height="1052.3622"
-   id="svg2584">
-  <defs
-     id="defs2586">
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         id="stop3710"
-         style="stop-color:#202020;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3712"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="518.26996"
-       y1="497.31476"
-       x2="533.02924"
-       y2="497.31476"
-       id="linearGradient3776"
-       xlink:href="#linearGradient3708"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3718">
-      <stop
-         id="stop3720"
-         style="stop-color:#bcbcbc;stop-opacity:0.28169015"
-         offset="0" />
-      <stop
-         id="stop3722"
-         style="stop-color:#bcbcbc;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="516.89508"
-       y1="503.50137"
-       x2="516.89508"
-       y2="543.80646"
-       id="linearGradient3774"
-       xlink:href="#linearGradient3718"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9947644,0,0,1.3346457,2.7877039,-166.60153)" />
-    <linearGradient
-       id="linearGradient3692">
-      <stop
-         id="stop3694"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3696"
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="506.95975"
-       y1="469.73706"
-       x2="525.41608"
-       y2="469.73706"
-       id="linearGradient3772"
-       xlink:href="#linearGradient3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="506.95975"
-       y1="469.73706"
-       x2="525.41608"
-       y2="469.73706"
-       id="linearGradient2403"
-       xlink:href="#linearGradient3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="516.89508"
-       y1="503.50137"
-       x2="516.89508"
-       y2="543.80646"
-       id="linearGradient2405"
-       xlink:href="#linearGradient3718"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9947644,0,0,1.3346457,2.7877039,-166.60153)" />
-    <linearGradient
-       x1="518.26996"
-       y1="497.31476"
-       x2="533.02924"
-       y2="497.31476"
-       id="linearGradient2407"
-       xlink:href="#linearGradient3708"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     transform="translate(-128.69958,6.6568748)"
-     id="torpedo">
-    <g
-       transform="matrix(0.8830571,0,0,0.8830571,-119.78327,177.67947)"
-       id="g3525">
-      <path
-         d="M 523.9661,469.73706 A 7.7781744,34.648232 0 1 1 508.40975,469.73706 A 7.7781744,34.648232 0 1 1 523.9661,469.73706 z"
-         id="path3682"
-         style="opacity:1;fill:url(#linearGradient2403);fill-opacity:1;fill-rule:nonzero;stroke:#272727;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         id="g3754">
-        <rect
-           width="33.58757"
-           height="59.927299"
-           x="498.86386"
-           y="497.84454"
-           id="rect3716"
-           style="opacity:1;fill:url(#linearGradient2405);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           d="M 523.35045,482.89424 C 523.35045,482.89424 532.31256,488.20203 532.02344,500.14638 C 531.73431,512.09072 531.73431,511.73417 531.73431,511.73417 C 531.73431,511.73417 520.70627,493.83104 519.26887,499.77636 L 523.35045,482.89424 z"
-           id="path3704"
-           style="fill:url(#linearGradient2407);fill-opacity:1;fill-rule:evenodd;stroke:#1f1f1f;stroke-width:1.99788344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           d="M 508.50327,482.89424 C 508.50327,482.89424 499.54116,488.20203 499.83028,500.14638 C 500.11941,512.09072 500.11941,511.73417 500.11941,511.73417 C 500.11941,511.73417 511.14745,493.83104 512.58485,499.77636 L 508.50327,482.89424 z"
-           id="path3706"
-           style="fill:#bcbcbc;fill-opacity:1;fill-rule:evenodd;stroke:#1f1f1f;stroke-width:1.99788344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/examples/animation/sub-attaq/pics/small/background.png b/examples/animation/sub-attaq/pics/small/background.png
deleted file mode 100644
index 5ad3db6..0000000
--- a/examples/animation/sub-attaq/pics/small/background.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/small/boat.png b/examples/animation/sub-attaq/pics/small/boat.png
deleted file mode 100644
index 114ccc3..0000000
--- a/examples/animation/sub-attaq/pics/small/boat.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/small/bomb.png b/examples/animation/sub-attaq/pics/small/bomb.png
deleted file mode 100644
index 3af5f2f..0000000
--- a/examples/animation/sub-attaq/pics/small/bomb.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/small/submarine.png b/examples/animation/sub-attaq/pics/small/submarine.png
deleted file mode 100644
index 0c0c350..0000000
--- a/examples/animation/sub-attaq/pics/small/submarine.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/small/surface.png b/examples/animation/sub-attaq/pics/small/surface.png
deleted file mode 100644
index 06d0e47..0000000
--- a/examples/animation/sub-attaq/pics/small/surface.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/small/torpedo.png b/examples/animation/sub-attaq/pics/small/torpedo.png
deleted file mode 100644
index f9c2687..0000000
--- a/examples/animation/sub-attaq/pics/small/torpedo.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a.png b/examples/animation/sub-attaq/pics/welcome/logo-a.png
deleted file mode 100644
index 67dd76d..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-a.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a2.png b/examples/animation/sub-attaq/pics/welcome/logo-a2.png
deleted file mode 100644
index 17668b0..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-a2.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-b.png b/examples/animation/sub-attaq/pics/welcome/logo-b.png
deleted file mode 100644
index cf6c045..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-b.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-dash.png b/examples/animation/sub-attaq/pics/welcome/logo-dash.png
deleted file mode 100644
index 219233c..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-dash.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-excl.png b/examples/animation/sub-attaq/pics/welcome/logo-excl.png
deleted file mode 100644
index 8dd0a2e..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-excl.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-q.png b/examples/animation/sub-attaq/pics/welcome/logo-q.png
deleted file mode 100644
index 86e588d..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-q.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-s.png b/examples/animation/sub-attaq/pics/welcome/logo-s.png
deleted file mode 100644
index 7b6a36e..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-s.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t.png b/examples/animation/sub-attaq/pics/welcome/logo-t.png
deleted file mode 100644
index b2e3526..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-t.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t2.png b/examples/animation/sub-attaq/pics/welcome/logo-t2.png
deleted file mode 100644
index b11a778..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-t2.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-u.png b/examples/animation/sub-attaq/pics/welcome/logo-u.png
deleted file mode 100644
index 24eede8..0000000
--- a/examples/animation/sub-attaq/pics/welcome/logo-u.png
+++ /dev/null
diff --git a/examples/animation/sub-attaq/pixmapitem.cpp b/examples/animation/sub-attaq/pixmapitem.cpp
deleted file mode 100644
index ed0f075..0000000
--- a/examples/animation/sub-attaq/pixmapitem.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "pixmapitem.h"
-
-//Qt
-#include <QtCore/QDir>
-
-PixmapItem::PixmapItem(const QString &fileName,GraphicsScene::Mode mode, QGraphicsItem * parent) : QGraphicsPixmapItem(parent),name(fileName)
-{
-    loadPixmap(mode);
-}
-
-void PixmapItem::loadPixmap(GraphicsScene::Mode mode)
-{
-    if (mode == GraphicsScene::Big)
-        setPixmap(":/big/" + name);
-    else
-        setPixmap(":/small/" + name);
-}
diff --git a/examples/animation/sub-attaq/pixmapitem.h b/examples/animation/sub-attaq/pixmapitem.h
deleted file mode 100644
index e32973e..0000000
--- a/examples/animation/sub-attaq/pixmapitem.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __PIXMAPITEM__H__
-#define __PIXMAPITEM__H__
-
-//Own
-#include "graphicsscene.h"
-
-//Qt
-#include <QtGui/QGraphicsPixmapItem>
-
-class PixmapItem : public QGraphicsPixmapItem
-{
-public:
-    PixmapItem(const QString &fileName, GraphicsScene::Mode mode, QGraphicsItem * parent = 0);
-
-private:
-    void loadPixmap(GraphicsScene::Mode mode);
-
-    QString name;
-    QPixmap pixmap;
-};
-
-#endif //__PIXMAPITEM__H__
diff --git a/examples/animation/sub-attaq/progressitem.cpp b/examples/animation/sub-attaq/progressitem.cpp
deleted file mode 100644
index 9ccaa72..0000000
--- a/examples/animation/sub-attaq/progressitem.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "progressitem.h"
-#include "pixmapitem.h"
-
-ProgressItem::ProgressItem (QGraphicsItem * parent)
-    : QGraphicsTextItem(parent), currentLevel(1), currentScore(0)
-{
-    setFont(QFont("Comic Sans MS"));
-    setPos(parentItem()->boundingRect().topRight() - QPointF(180, -5));
-}
-
-void ProgressItem::setLevel(int level)
-{
-    currentLevel = level;
-    updateProgress();
-}
-
-void ProgressItem::setScore(int score)
-{
-    currentScore = score;
-    updateProgress();
-}
-
-void ProgressItem::updateProgress()
-{
-    setHtml(QString("Level : %1 Score : %2").arg(currentLevel).arg(currentScore));
-}
diff --git a/examples/animation/sub-attaq/progressitem.h b/examples/animation/sub-attaq/progressitem.h
deleted file mode 100644
index 7be57c9..0000000
--- a/examples/animation/sub-attaq/progressitem.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PROGRESSITEM_H
-#define PROGRESSITEM_H
-
-//Qt
-#include <QtGui/QGraphicsTextItem>
-
-class ProgressItem : public QGraphicsTextItem
-{
-public:
-    ProgressItem(QGraphicsItem * parent = 0);
-    void setLevel(int level);
-    void setScore(int score);
-
-private:
-    void updateProgress();
-    int currentLevel;
-    int currentScore;
-};
-
-#endif // PROGRESSITEM_H
diff --git a/examples/animation/sub-attaq/qanimationstate.cpp b/examples/animation/sub-attaq/qanimationstate.cpp
deleted file mode 100644
index 4e6df56..0000000
--- a/examples/animation/sub-attaq/qanimationstate.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qanimationstate.h"
-
-#include <QtCore/qstate.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-\class QAnimationState
-
-\brief The QAnimationState class provides state that handle an animation and emit
-a signal when this animation is finished.
-
-\ingroup statemachine
-
-QAnimationState provides a state that handle an animation. It will start this animation
-when the state is entered and stop it when it is leaved. When the animation has finished the
-state emit animationFinished signal.
-QAnimationState is part of \l{The State Machine Framework}.
-
-\code
-QStateMachine machine;
-QAnimationState *s = new QAnimationState(machine->rootState());
-QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos");
-s->setAnimation(animation);
-QState *s2 = new QState(machine->rootState());
-s->addTransition(s, SIGNAL(animationFinished()), s2);
-machine.start();
-\endcode
-
-\sa QState, {The Animation Framework}
-*/
-
-
-#ifndef QT_NO_ANIMATION
-
-/*!
-  Constructs a new state with the given \a parent state.
-*/
-QAnimationState::QAnimationState(QState *parent)
-    : QState(parent), m_animation(0)
-{
-}
-
-/*!
-  Destroys the animation state.
-*/
-QAnimationState::~QAnimationState()
-{
-}
-
-/*!
-  Set an \a animation for this QAnimationState. If an animation was previously handle by this
-  state then it won't emit animationFinished for the old animation. The QAnimationState doesn't
-  take the ownership of the animation.
-*/
-void QAnimationState::setAnimation(QAbstractAnimation *animation)
-{
-    if (animation == m_animation)
-        return;
-
-    //Disconnect from the previous animation if exist
-    if(m_animation)
-        disconnect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished()));
-
-    m_animation = animation;
-
-    if (m_animation) {
-        //connect the new animation
-        connect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished()));
-    }
-}
-
-/*!
-  Returns the animation handle by this animation state, or 0 if there is no animation.
-*/
-QAbstractAnimation* QAnimationState::animation() const
-{
-    return m_animation;
-}
-
-/*!
-  \reimp
-*/
-void QAnimationState::onEntry(QEvent *)
-{
-    if (m_animation)
-        m_animation->start();
-}
-
-/*!
-  \reimp
-*/
-void QAnimationState::onExit(QEvent *)
-{
-    if (m_animation)
-        m_animation->stop();
-}
-
-/*!
-  \reimp
-*/
-bool QAnimationState::event(QEvent *e)
-{
-    return QState::event(e);
-}
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/examples/animation/sub-attaq/qanimationstate.h b/examples/animation/sub-attaq/qanimationstate.h
deleted file mode 100644
index 6c5b565..0000000
--- a/examples/animation/sub-attaq/qanimationstate.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QANIMATIONSTATE_H
-#define QANIMATIONSTATE_H
-
-#ifndef QT_STATEMACHINE_SOLUTION
-#  include <QtCore/qstate.h>
-#  include <QtCore/qabstractanimation.h>
-#else
-#  include "qstate.h"
-#  include "qabstractanimation.h"
-#endif
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_ANIMATION
-
-class QAbstractAnimation;
-
-class QAnimationState : public QState
-{
-    Q_OBJECT
-public:
-    QAnimationState(QState *parent = 0);
-    ~QAnimationState();
-
-    void setAnimation(QAbstractAnimation *animation);
-    QAbstractAnimation* animation() const;
-
-signals:
-    void animationFinished();
-
-protected:
-    void onEntry(QEvent *);
-    void onExit(QEvent *);
-    bool event(QEvent *e);
-
-private:
-    Q_DISABLE_COPY(QAnimationState)
-    QAbstractAnimation *m_animation;
-};
-
-#endif
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QANIMATIONSTATE_H
diff --git a/examples/animation/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp
deleted file mode 100644
index d63737f..0000000
--- a/examples/animation/sub-attaq/states.cpp
+++ /dev/null
@@ -1,325 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "states.h"
-#include "graphicsscene.h"
-#include "boat.h"
-#include "submarine.h"
-#include "torpedo.h"
-#include "animationmanager.h"
-#include "progressitem.h"
-
-//Qt
-#include <QtGui/QMessageBox>
-#include <QtGui/QGraphicsView>
-#include <QtCore/QStateMachine>
-#include <QtGui/QKeyEventTransition>
-#include <QtCore/QSignalEvent>
-#include <QtCore/QFinalState>
-
-PlayState::PlayState(GraphicsScene *scene, QState *parent)
-    : QState(parent),
-    scene(scene),
-    machine(0),
-    currentLevel(0),
-    score(0)
-{
-}
-
-PlayState::~PlayState()
-{
-}
-
-void PlayState::onEntry(QEvent *)
-{
-    //We are now playing?
-    if (machine) {
-        machine->stop();
-        scene->clearScene();
-        currentLevel = 0;
-        score = 0;
-        delete machine;
-    }
-
-    machine = new QStateMachine(this);
-
-    //This state is when player is playing
-    LevelState *levelState = new LevelState(scene, this, machine);
-
-    //This state is when the player is actually playing but the game is not paused
-    QState *playingState = new QState(levelState);
-    levelState->setInitialState(playingState);
-
-    //This state is when the game is paused
-    PauseState *pauseState = new PauseState(scene, levelState);
-
-    //We have one view, it receive the key press event
-    QKeyEventTransition *pressPplay = new QKeyEventTransition(scene->views().at(0), QEvent::KeyPress, Qt::Key_P);
-    pressPplay->setTargetState(pauseState);
-    QKeyEventTransition *pressPpause = new QKeyEventTransition(scene->views().at(0), QEvent::KeyPress, Qt::Key_P);
-    pressPpause->setTargetState(playingState);
-
-    //Pause "P" is triggered, the player pause the game
-    playingState->addTransition(pressPplay);
-
-    //To get back playing when the game has been paused
-    pauseState->addTransition(pressPpause);
-
-    //This state is when player have lost
-    LostState *lostState = new LostState(scene, this, machine);
-
-    //This state is when player have won
-    WinState *winState = new WinState(scene, this, machine);
-
-    //The boat has been destroyed then the game is finished
-    levelState->addTransition(scene->boat, SIGNAL(boatExecutionFinished()),lostState);
-
-    //This transition check if we won or not
-    WinTransition *winTransition = new WinTransition(scene, this, winState);
-
-    //The boat has been destroyed then the game is finished
-    levelState->addTransition(winTransition);
-
-    //This state is an animation when the score changed
-    UpdateScoreState *scoreState = new UpdateScoreState(this, levelState);
-
-    //This transition update the score when a submarine die
-    UpdateScoreTransition *scoreTransition = new UpdateScoreTransition(scene, this, levelState);
-    scoreTransition->setTargetState(scoreState);
-
-    //The boat has been destroyed then the game is finished
-    playingState->addTransition(scoreTransition);
-
-    //We go back to play state
-    scoreState->addTransition(playingState);
-
-    //We start playing!!!
-    machine->setInitialState(levelState);
-
-    //Final state
-    QFinalState *final = new QFinalState(machine);
-
-    //This transition is triggered when the player press space after completing a level
-    CustomSpaceTransition *spaceTransition = new CustomSpaceTransition(scene->views().at(0), this, QEvent::KeyPress, Qt::Key_Space);
-    spaceTransition->setTargetState(levelState);
-    winState->addTransition(spaceTransition);
-
-    //We lost we should reach the final state
-    lostState->addTransition(lostState, SIGNAL(finished()), final);
-
-    machine->start();
-}
-
-LevelState::LevelState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game)
-{
-}
-void LevelState::onEntry(QEvent *)
-{
-    initializeLevel();
-}
-
-void LevelState::initializeLevel()
-{
-    //we re-init the boat
-    scene->boat->setPos(scene->width()/2, scene->sealLevel() - scene->boat->size().height());
-    scene->boat->setCurrentSpeed(0);
-    scene->boat->setCurrentDirection(Boat::None);
-    scene->boat->setBombsLaunched(0);
-    scene->boat->show();
-    scene->setFocusItem(scene->boat,Qt::OtherFocusReason);
-    scene->boat->run();
-
-    scene->progressItem->setScore(game->score);
-    scene->progressItem->setLevel(game->currentLevel + 1);
-
-    GraphicsScene::LevelDescription currentLevelDescription = scene->levelsData.value(game->currentLevel);
-
-    for (int i = 0; i < currentLevelDescription.submarines.size(); ++i ) {
-
-        QPair<int,int> subContent = currentLevelDescription.submarines.at(i);
-        GraphicsScene::SubmarineDescription submarineDesc = scene->submarinesData.at(subContent.first);
-
-        for (int j = 0; j < subContent.second; ++j ) {
-            SubMarine *sub = new SubMarine(submarineDesc.type, submarineDesc.name, submarineDesc.points);
-            scene->addItem(sub);
-            int random = (qrand() % 15 + 1);
-            qreal x = random == 13 || random == 5 ? 0 : scene->width() - sub->size().width();
-            qreal y = scene->height() -(qrand() % 150 + 1) - sub->size().height();
-            sub->setPos(x,y);
-            sub->setCurrentDirection(x == 0 ? SubMarine::Right : SubMarine::Left);
-            sub->setCurrentSpeed(qrand() % 3 + 1);
-        }
-    }
-}
-
-/** Pause State */
-PauseState::PauseState(GraphicsScene *scene, QState *parent) : QState(parent),scene(scene)
-{
-}
-void PauseState::onEntry(QEvent *)
-{
-    AnimationManager::self()->pauseAll();
-    scene->boat->setEnabled(false);
-}
-void PauseState::onExit(QEvent *)
-{
-    AnimationManager::self()->resumeAll();
-    scene->boat->setEnabled(true);
-    scene->boat->setFocus();
-}
-
-/** Lost State */
-LostState::LostState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game)
-{
-}
-
-void LostState::onEntry(QEvent *)
-{
-    //The message to display
-    QString message = QString("You lose on level %1. Your score is %2.").arg(game->currentLevel+1).arg(game->score);
-
-    //We set the level back to 0
-    game->currentLevel = 0;
-
-    //We set the score back to 0
-    game->score = 0;
-
-    //We clear the scene
-    scene->clearScene();
-
-    //we have only one view
-    QMessageBox::information(scene->views().at(0),"You lose",message);
-}
-
-/** Win State */
-WinState::WinState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game)
-{
-}
-
-void WinState::onEntry(QEvent *)
-{
-    //We clear the scene
-    scene->clearScene();
-
-    QString message;
-    if (scene->levelsData.size() - 1 != game->currentLevel) {
-        message = QString("You win the level %1. Your score is %2.\nPress Space to continue after closing this dialog.").arg(game->currentLevel+1).arg(game->score);
-        //We increment the level number
-        game->currentLevel++;
-    } else {
-        message = QString("You finish the game on level %1. Your score is %2.").arg(game->currentLevel+1).arg(game->score);
-        //We set the level back to 0
-        game->currentLevel = 0;
-        //We set the score back to 0
-        game->score = 0;
-    }
-
-    //we have only one view
-    QMessageBox::information(scene->views().at(0),"You win",message);
-}
-
-/** UpdateScore State */
-UpdateScoreState::UpdateScoreState(PlayState *game, QState *parent) : QState(parent)
-{
-    this->game = game;
-}
-void UpdateScoreState::onEntry(QEvent *e)
-{
-    QState::onEntry(e);
-}
-
-/** Win transition */
-UpdateScoreTransition::UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target)
-    : QSignalTransition(scene,SIGNAL(subMarineDestroyed(int)), QList<QAbstractState*>() << target),
-    game(game), scene(scene)
-{
-}
-
-bool UpdateScoreTransition::eventTest(QEvent *event)
-{
-    if (!QSignalTransition::eventTest(event))
-        return false;
-    else {
-        QSignalEvent *se = static_cast<QSignalEvent*>(event);
-        game->score += se->arguments().at(0).toInt();
-        scene->progressItem->setScore(game->score);
-        return true;
-    }
-}
-
-/** Win transition */
-WinTransition::WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target)
-    : QSignalTransition(scene,SIGNAL(allSubMarineDestroyed(int)), QList<QAbstractState*>() << target),
-    game(game), scene(scene)
-{
-}
-
-bool WinTransition::eventTest(QEvent *event)
-{
-    if (!QSignalTransition::eventTest(event))
-        return false;
-    else {
-        QSignalEvent *se = static_cast<QSignalEvent*>(event);
-        game->score += se->arguments().at(0).toInt();
-        scene->progressItem->setScore(game->score);
-        return true;
-    }
-}
-
-/** Space transition */
-CustomSpaceTransition::CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key)
-    :   QKeyEventTransition(widget, type, key),
-        game(game)
-{
-}
-
-bool CustomSpaceTransition::eventTest(QEvent *event)
-{
-    Q_UNUSED(event);
-    if (!QKeyEventTransition::eventTest(event))
-        return false;
-    if (game->currentLevel != 0)
-        return true;
-    else
-        return false;
-
-}
diff --git a/examples/animation/sub-attaq/states.h b/examples/animation/sub-attaq/states.h
deleted file mode 100644
index c3d81e7..0000000
--- a/examples/animation/sub-attaq/states.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef STATES_H
-#define STATES_H
-
-//Qt
-#include <QtCore/QState>
-#include <QtCore/QSignalTransition>
-#include <QtCore/QPropertyAnimation>
-#include <QtGui/QKeyEventTransition>
-#include <QtCore/QSet>
-
-class GraphicsScene;
-class Boat;
-class SubMarine;
-QT_BEGIN_NAMESPACE
-class QStateMachine;
-QT_END_NAMESPACE
-
-class PlayState : public QState
-{
-public:
-    PlayState(GraphicsScene *scene, QState *parent = 0);
-    ~PlayState();
-
- protected:
-    void onEntry(QEvent *);
-
-private :
-    GraphicsScene *scene;
-    QStateMachine *machine;
-    int currentLevel;
-    int score;
-    QState *parallelChild;
-
-    friend class UpdateScoreState;
-    friend class UpdateScoreTransition;
-    friend class WinTransition;
-    friend class CustomSpaceTransition;
-    friend class WinState;
-    friend class LostState;
-    friend class LevelState;
-};
-
-class LevelState : public QState
-{
-public:
-    LevelState(GraphicsScene *scene, PlayState *game, QState *parent = 0);
-protected:
-    void onEntry(QEvent *);
-private :
-    void initializeLevel();
-    GraphicsScene *scene;
-    PlayState *game;
-};
-
-class PauseState : public QState
-{
-public:
-    PauseState(GraphicsScene *scene, QState *parent = 0);
-
-protected:
-    void onEntry(QEvent *);
-    void onExit(QEvent *);
-private :
-    GraphicsScene *scene;
-    Boat *boat;
-};
-
-class LostState : public QState
-{
-public:
-    LostState(GraphicsScene *scene, PlayState *game, QState *parent = 0);
-
-protected:
-    void onEntry(QEvent *);
-private :
-    GraphicsScene *scene;
-    PlayState *game;
-};
-
-class WinState : public QState
-{
-public:
-    WinState(GraphicsScene *scene, PlayState *game, QState *parent = 0);
-
-protected:
-    void onEntry(QEvent *);
-private :
-    GraphicsScene *scene;
-    PlayState *game;
-};
-
-class UpdateScoreState : public QState
-{
-public:
-    UpdateScoreState(PlayState *game, QState *parent);
-protected:
-    void onEntry(QEvent *);
-private:
-    QPropertyAnimation *scoreAnimation;
-    PlayState *game;
-};
-
-//These transtion is used to update the score
-class UpdateScoreTransition : public QSignalTransition
-{
-public:
-    UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target);
-protected:
-    virtual bool eventTest(QEvent *event);
-private:
-    PlayState * game;
-    GraphicsScene *scene;
-};
-
-//These transtion test if we have won the game
-class WinTransition : public QSignalTransition
-{
-public:
-    WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target);
-protected:
-    virtual bool eventTest(QEvent *event);
-private:
-    PlayState * game;
-    GraphicsScene *scene;
-};
-
-//These transtion is true if one level has been completed and the player want to continue
- class CustomSpaceTransition : public QKeyEventTransition
-{
-public:
-    CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key);
-protected:
-    virtual bool eventTest(QEvent *event);
-private:
-    PlayState *game;
-    int key;
-};
-
-#endif // STATES_H
diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro
deleted file mode 100644
index d13a099..0000000
--- a/examples/animation/sub-attaq/sub-attaq.pro
+++ /dev/null
@@ -1,36 +0,0 @@
-contains(QT_CONFIG, opengl):QT += opengl
-
-HEADERS += boat.h \
-    bomb.h \
-    mainwindow.h \
-    submarine.h \
-    torpedo.h \
-    pixmapitem.h \
-    graphicsscene.h \
-    animationmanager.h \
-    states.h \
-    boat_p.h \
-    submarine_p.h \
-    custompropertyanimation.h \
-    qanimationstate.h \
-    progressitem.h
-SOURCES += boat.cpp \
-    bomb.cpp \
-    main.cpp \
-    mainwindow.cpp \
-    submarine.cpp \
-    torpedo.cpp \
-    pixmapitem.cpp \
-    graphicsscene.cpp \
-    animationmanager.cpp \
-    states.cpp \
-    custompropertyanimation.cpp \
-    qanimationstate.cpp \
-    progressitem.cpp
-RESOURCES += subattaq.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sub-attaq.pro pics
-sources.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq
-INSTALLS += target sources
diff --git a/examples/animation/sub-attaq/subattaq.qrc b/examples/animation/sub-attaq/subattaq.qrc
deleted file mode 100644
index 80a3af1..0000000
--- a/examples/animation/sub-attaq/subattaq.qrc
+++ /dev/null
@@ -1,39 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file alias="all" >pics/scalable/sub-attaq.svg</file>
-        <file alias="submarine" >pics/scalable/submarine.svg</file>
-        <file alias="boat" >pics/scalable/boat.svg</file>
-        <file alias="torpedo" >pics/scalable/torpedo.svg</file>
-        <file alias="logo-s" >pics/welcome/logo-s.png</file>
-        <file alias="logo-u" >pics/welcome/logo-u.png</file>
-        <file alias="logo-b" >pics/welcome/logo-b.png</file>
-        <file alias="logo-dash" >pics/welcome/logo-dash.png</file>
-        <file alias="logo-a" >pics/welcome/logo-a.png</file>
-        <file alias="logo-t" >pics/welcome/logo-t.png</file>
-        <file alias="logo-t2" >pics/welcome/logo-t2.png</file>
-        <file alias="logo-a2" >pics/welcome/logo-a2.png</file>
-        <file alias="logo-q" >pics/welcome/logo-q.png</file>
-        <file alias="logo-excl" >pics/welcome/logo-excl.png</file>
-        <file alias="big/background" >pics/big/background.png</file>
-        <file alias="big/boat" >pics/big/boat.png</file>
-        <file alias="big/bomb" >pics/big/bomb.png</file>
-        <file alias="big/submarine" >pics/big/submarine.png</file>
-        <file alias="big/surface" >pics/big/surface.png</file>
-        <file alias="big/torpedo" >pics/big/torpedo.png</file>
-        <file alias="small/background" >pics/small/background.png</file>
-        <file alias="small/boat" >pics/small/boat.png</file>
-        <file alias="small/bomb" >pics/small/bomb.png</file>
-        <file alias="small/submarine" >pics/small/submarine.png</file>
-        <file alias="small/surface" >pics/small/surface.png</file>
-        <file alias="small/torpedo" >pics/small/torpedo.png</file>
-        <file alias="big/explosion/boat/step1" >pics/big/explosion/boat/step1.png</file>
-        <file alias="big/explosion/boat/step2" >pics/big/explosion/boat/step2.png</file>
-        <file alias="big/explosion/boat/step3" >pics/big/explosion/boat/step3.png</file>
-        <file alias="big/explosion/boat/step4" >pics/big/explosion/boat/step4.png</file>
-        <file alias="big/explosion/submarine/step1" >pics/big/explosion/submarine/step1.png</file>
-        <file alias="big/explosion/submarine/step2" >pics/big/explosion/submarine/step2.png</file>
-        <file alias="big/explosion/submarine/step3" >pics/big/explosion/submarine/step3.png</file>
-        <file alias="big/explosion/submarine/step4" >pics/big/explosion/submarine/step4.png</file>
-        <file>data.xml</file>
-    </qresource>
-</RCC>
diff --git a/examples/animation/sub-attaq/submarine.cpp b/examples/animation/sub-attaq/submarine.cpp
deleted file mode 100644
index 78a9539..0000000
--- a/examples/animation/sub-attaq/submarine.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "submarine.h"
-#include "submarine_p.h"
-#include "torpedo.h"
-#include "pixmapitem.h"
-#include "graphicsscene.h"
-#include "animationmanager.h"
-#include "custompropertyanimation.h"
-#include "qanimationstate.h"
-
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QStateMachine>
-#include <QtCore/QFinalState>
-#include <QtCore/QSequentialAnimationGroup>
-
-static QAbstractAnimation *setupDestroyAnimation(SubMarine *sub)
-{
-    QSequentialAnimationGroup *group = new QSequentialAnimationGroup(sub);
-#if QT_VERSION >=0x040500
-    PixmapItem *step1 = new PixmapItem(QString("explosion/submarine/step1"),GraphicsScene::Big, sub);
-    step1->setZValue(6);
-    PixmapItem *step2 = new PixmapItem(QString("explosion/submarine/step2"),GraphicsScene::Big, sub);
-    step2->setZValue(6);
-    PixmapItem *step3 = new PixmapItem(QString("explosion/submarine/step3"),GraphicsScene::Big, sub);
-    step3->setZValue(6);
-    PixmapItem *step4 = new PixmapItem(QString("explosion/submarine/step4"),GraphicsScene::Big, sub);
-    step4->setZValue(6);
-    step1->setOpacity(0);
-    step2->setOpacity(0);
-    step3->setOpacity(0);
-    step4->setOpacity(0);
-    CustomPropertyAnimation *anim1 = new CustomPropertyAnimation(sub);
-    anim1->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim1->setDuration(100);
-    anim1->setEndValue(1);
-    CustomPropertyAnimation *anim2 = new CustomPropertyAnimation(sub);
-    anim2->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim2->setDuration(100);
-    anim2->setEndValue(1);
-    CustomPropertyAnimation *anim3 = new CustomPropertyAnimation(sub);
-    anim3->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim3->setDuration(100);
-    anim3->setEndValue(1);
-    CustomPropertyAnimation *anim4 = new CustomPropertyAnimation(sub);
-    anim4->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity);
-    anim4->setDuration(100);
-    anim4->setEndValue(1);
-    group->addAnimation(anim1);
-    group->addAnimation(anim2);
-    group->addAnimation(anim3);
-    group->addAnimation(anim4);
-#else
-    // work around for a bug where we don't transition if the duration is zero.
-    QtPauseAnimation *anim = new QtPauseAnimation(group);
-    anim->setDuration(1);
-    group->addAnimation(anim);
-#endif
-    AnimationManager::self()->registerAnimation(group);
-    return group;
-}
-
-
-SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem * parent, Qt::WindowFlags wFlags)
-    : QGraphicsWidget(parent,wFlags), subType(type), subName(name), subPoints(points), speed(0), direction(SubMarine::None)
-{
-    pixmapItem = new PixmapItem(QString("submarine"),GraphicsScene::Big, this);
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    setZValue(5);
-    setFlags(QGraphicsItem::ItemIsMovable);
-    resize(pixmapItem->boundingRect().width(),pixmapItem->boundingRect().height());
-    setTransformOrigin(boundingRect().center());
-
-    //We setup the state machine of the submarine
-    QStateMachine *machine = new QStateMachine(this);
-
-    //This state is when the boat is moving/rotating
-    QState *moving = new QState(machine);
-
-    //This state is when the boat is moving from left to right
-    MovementState *movement = new MovementState(this, moving);
-
-    //This state is when the boat is moving from left to right
-    ReturnState *rotation = new ReturnState(this, moving);
-
-    //This is the initial state of the moving root state
-    moving->setInitialState(movement);
-
-    movement->addTransition(this, SIGNAL(subMarineStateChanged()), moving);
-
-    //This is the initial state of the machine
-    machine->setInitialState(moving);
-
-    //End
-    QFinalState *final = new QFinalState(machine);
-
-    //If the moving animation is finished we move to the return state
-    movement->addTransition(movement, SIGNAL(animationFinished()), rotation);
-
-    //If the return animation is finished we move to the moving state
-    rotation->addTransition(rotation, SIGNAL(animationFinished()), movement);
-
-    //This state play the destroyed animation
-    QAnimationState *destroyedState = new QAnimationState(machine);
-    destroyedState->setAnimation(setupDestroyAnimation(this));
-
-    //Play a nice animation when the submarine is destroyed
-    moving->addTransition(this, SIGNAL(subMarineDestroyed()), destroyedState);
-
-    //Transition to final state when the destroyed animation is finished
-    destroyedState->addTransition(destroyedState, SIGNAL(animationFinished()), final);
-
-    //The machine has finished to be executed, then the submarine is dead
-    connect(machine,SIGNAL(finished()),this, SIGNAL(subMarineExecutionFinished()));
-
-    machine->start();
-}
-
-int SubMarine::points()
-{
-    return subPoints;
-}
-
-void SubMarine::setCurrentDirection(SubMarine::Movement direction)
-{
-    if (this->direction == direction)
-        return;
-    if (direction == SubMarine::Right && this->direction == SubMarine::None) {
-          setYRotation(180);
-    }
-    this->direction = direction;
-}
-
-enum SubMarine::Movement SubMarine::currentDirection() const
-{
-    return direction;
-}
-
-void SubMarine::setCurrentSpeed(int speed)
-{
-    if (speed < 0 || speed > 3) {
-        qWarning("SubMarine::setCurrentSpeed : The speed is invalid");
-    }
-    this->speed = speed;
-    emit subMarineStateChanged();
-}
-
-int SubMarine::currentSpeed() const
-{
-    return speed;
-}
-
-void SubMarine::launchTorpedo(int speed)
-{
-    Torpedo * torp = new Torpedo();
-    GraphicsScene *scene = static_cast<GraphicsScene *>(this->scene());
-    scene->addItem(torp);
-    torp->setPos(x(), y());
-    torp->setCurrentSpeed(speed);
-    torp->launch();
-}
-
-void SubMarine::destroy()
-{
-    emit subMarineDestroyed();
-}
-
-int SubMarine::type() const
-{
-    return Type;
-}
diff --git a/examples/animation/sub-attaq/submarine.h b/examples/animation/sub-attaq/submarine.h
deleted file mode 100644
index 481e816..0000000
--- a/examples/animation/sub-attaq/submarine.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __SUBMARINE__H__
-#define __SUBMARINE__H__
-
-//Qt
-#include <QtCore/QVariantAnimation>
-#include <QtGui/QGraphicsWidget>
-
-class PixmapItem;
-
-class Torpedo;
-
-class SubMarine : public QGraphicsWidget
-{
-Q_OBJECT
-public:
-    enum Movement {
-       None = 0,
-       Left,
-       Right
-    };
-    enum { Type = UserType + 1 };
-    SubMarine(int type, const QString &name, int points, QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0);
-
-    int points();
-
-    void setCurrentDirection(Movement direction);
-    enum Movement currentDirection() const;
-
-    void setCurrentSpeed(int speed);
-    int currentSpeed() const;
-
-    void launchTorpedo(int speed);
-    void destroy();
-
-    virtual int type() const;
-
-signals:
-    void subMarineDestroyed();
-    void subMarineExecutionFinished();
-    void subMarineStateChanged();
-
-private:
-    int subType;
-    QString subName;
-    int subPoints;
-    int speed;
-    Movement direction;
-    PixmapItem *pixmapItem;
-};
-
-#endif //__SUBMARINE__H__
diff --git a/examples/animation/sub-attaq/submarine_p.h b/examples/animation/sub-attaq/submarine_p.h
deleted file mode 100644
index e8df877..0000000
--- a/examples/animation/sub-attaq/submarine_p.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SUBMARINE_P_H
-#define SUBMARINE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-//Own
-#include "animationmanager.h"
-#include "submarine.h"
-#include "qanimationstate.h"
-
-//Qt
-#include <QtCore/QPropertyAnimation>
-#include <QtGui/QGraphicsScene>
-
-//This state is describing when the boat is moving right
-class MovementState : public QAnimationState
-{
-Q_OBJECT
-public:
-    MovementState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent)
-    {
-        movementAnimation = new QPropertyAnimation(submarine, "pos");
-        connect(movementAnimation,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationMovementValueChanged(const QVariant &)));
-        setAnimation(movementAnimation);
-        AnimationManager::self()->registerAnimation(movementAnimation);
-        this->submarine = submarine;
-    }
-
-protected slots:
-    void onAnimationMovementValueChanged(const QVariant &)
-    {
-        if (qrand() % 200 + 1 == 3)
-            submarine->launchTorpedo(qrand() % 3 + 1);
-    }
-
-protected:
-    void onEntry(QEvent *e)
-    {
-        if (submarine->currentDirection() == SubMarine::Left) {
-            movementAnimation->setEndValue(QPointF(0,submarine->y()));
-            movementAnimation->setDuration(submarine->x()/submarine->currentSpeed()*12);
-        }
-        else /*if (submarine->currentDirection() == SubMarine::Right)*/ {
-            movementAnimation->setEndValue(QPointF(submarine->scene()->width()-submarine->size().width(),submarine->y()));
-            movementAnimation->setDuration((submarine->scene()->width()-submarine->size().width()-submarine->x())/submarine->currentSpeed()*12);
-        }
-        movementAnimation->setStartValue(submarine->pos());
-        QAnimationState::onEntry(e);
-    }
-
-private:
-    SubMarine *submarine;
-    QPropertyAnimation *movementAnimation;
-};
-
-//This state is describing when the boat is moving right
-class ReturnState : public QAnimationState
-{
-public:
-    ReturnState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent)
-    {
-        returnAnimation = new QPropertyAnimation(submarine, "yRotation");
-        AnimationManager::self()->registerAnimation(returnAnimation);
-        setAnimation(returnAnimation);
-        this->submarine = submarine;
-    }
-
-protected:
-    void onEntry(QEvent *e)
-    {
-        returnAnimation->stop();
-        returnAnimation->setStartValue(submarine->yRotation());
-        returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.);
-        returnAnimation->setDuration(500);
-        QAnimationState::onEntry(e);
-    }
-
-    void onExit(QEvent *e)
-    {
-        submarine->currentDirection() == SubMarine::Right ? submarine->setCurrentDirection(SubMarine::Left) : submarine->setCurrentDirection(SubMarine::Right);
-        QAnimationState::onExit(e);
-    }
-
-private:
-    SubMarine *submarine;
-    QPropertyAnimation *returnAnimation;
-};
-
-#endif // SUBMARINE_P_H
diff --git a/examples/animation/sub-attaq/torpedo.cpp b/examples/animation/sub-attaq/torpedo.cpp
deleted file mode 100644
index fe79488..0000000
--- a/examples/animation/sub-attaq/torpedo.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//Own
-#include "torpedo.h"
-#include "pixmapitem.h"
-#include "boat.h"
-#include "graphicsscene.h"
-#include "animationmanager.h"
-#include "qanimationstate.h"
-
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QStateMachine>
-#include <QtCore/QFinalState>
-
-Torpedo::Torpedo(QGraphicsItem * parent, Qt::WindowFlags wFlags)
-    : QGraphicsWidget(parent,wFlags), currentSpeed(0), launchAnimation(0)
-{
-    pixmapItem = new PixmapItem(QString::fromLatin1("torpedo"),GraphicsScene::Big, this);
-    setZValue(2);
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    setFlags(QGraphicsItem::ItemIsMovable);
-    resize(pixmapItem->boundingRect().size());
-}
-
-void Torpedo::launch()
-{
-    launchAnimation = new QPropertyAnimation(this, "pos");
-    AnimationManager::self()->registerAnimation(launchAnimation);
-    launchAnimation->setEndValue(QPointF(x(),qobject_cast<GraphicsScene *>(scene())->sealLevel() - 15));
-    launchAnimation->setEasingCurve(QEasingCurve::InQuad);
-    launchAnimation->setDuration(y()/currentSpeed*10);
-    connect(launchAnimation,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationLaunchValueChanged(const QVariant &)));
-
-    //We setup the state machine of the torpedo
-    QStateMachine *machine = new QStateMachine(this);
-
-    //This state is when the launch animation is playing
-    QAnimationState *launched = new QAnimationState(machine);
-    launched->setAnimation(launchAnimation);
-
-    //End
-    QFinalState *final = new QFinalState(machine);
-
-    machine->setInitialState(launched);
-
-    //### Add a nice animation when the torpedo is destroyed
-    launched->addTransition(this, SIGNAL(torpedoExplosed()),final);
-
-    //If the animation is finished, then we move to the final state
-    launched->addTransition(launched, SIGNAL(animationFinished()), final);
-
-    //The machine has finished to be executed, then the boat is dead
-    connect(machine,SIGNAL(finished()),this, SIGNAL(torpedoExecutionFinished()));
-
-    machine->start();
-}
-
-void Torpedo::setCurrentSpeed(int speed)
-{
-    if (speed < 0) {
-        qWarning("Torpedo::setCurrentSpeed : The speed is invalid");
-        return;
-    }
-    currentSpeed = speed;
-}
-
-void Torpedo::onAnimationLaunchValueChanged(const QVariant &)
-{
-    foreach (QGraphicsItem *item , collidingItems(Qt::IntersectsItemBoundingRect)) {
-        if (item->type() == Boat::Type) {
-            Boat *b = static_cast<Boat *>(item);
-            b->destroy();
-        }
-    }
-}
-
-void Torpedo::destroy()
-{
-    launchAnimation->stop();
-    emit torpedoExplosed();
-}
diff --git a/examples/animation/sub-attaq/torpedo.h b/examples/animation/sub-attaq/torpedo.h
deleted file mode 100644
index c44037f..0000000
--- a/examples/animation/sub-attaq/torpedo.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __TORPEDO__H__
-#define __TORPEDO__H__
-
-//Qt
-#include <QtCore/QObject>
-
-#include <QtCore/QVariantAnimation>
-#include <QtGui/QGraphicsWidget>
-
-class PixmapItem;
-
-class Torpedo : public QGraphicsWidget
-{
-Q_OBJECT
-public:
-    Torpedo(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0);
-    void launch();
-    void setCurrentSpeed(int speed);
-    void destroy();
-
-signals:
-    void torpedoExplosed();
-    void torpedoExecutionFinished();
-
-private slots:
-    void onAnimationLaunchValueChanged(const QVariant &);
-
-private:
-    int currentSpeed;
-    PixmapItem *pixmapItem;
-    QVariantAnimation *launchAnimation;
-};
-
-#endif //__TORPEDO__H__
diff --git a/examples/examples.pro b/examples/examples.pro
index 5855e4f..e6cece9 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -26,6 +26,7 @@ SUBDIRS       = \
                 multitouch \
                 gestures
 
+contains(QT_CONFIG, multimedia):!static: SUBDIRS += multimedia
 contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
 embedded:SUBDIRS += qws
diff --git a/examples/gestures/imageviewer/imageviewer.pro b/examples/gestures/imageviewer/imageviewer.pro
index 4c35dce..efbca00 100644
--- a/examples/gestures/imageviewer/imageviewer.pro
+++ b/examples/gestures/imageviewer/imageviewer.pro
@@ -1,12 +1,11 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Sep 11 17:18:17 2008
-######################################################################
-
 TEMPLATE = app
 TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 
 # Input
-HEADERS += imagewidget.h
-SOURCES += imagewidget.cpp main.cpp
+HEADERS += imagewidget.h \
+    tapandholdgesture.h
+SOURCES += imagewidget.cpp \
+    tapandholdgesture.cpp \
+    main.cpp
diff --git a/examples/gestures/imageviewer/imagewidget.cpp b/examples/gestures/imageviewer/imagewidget.cpp
index 717bb09..c0d1e2d 100644
--- a/examples/gestures/imageviewer/imagewidget.cpp
+++ b/examples/gestures/imageviewer/imagewidget.cpp
@@ -65,8 +65,9 @@ ImageWidget::ImageWidget(QWidget *parent)
     panGesture = new QPanGesture(this);
     connect(panGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
 
-    tapAndHoldGesture = new QTapAndHoldGesture(this);
+    tapAndHoldGesture = new TapAndHoldGesture(this);
     connect(tapAndHoldGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
+    connect(tapAndHoldGesture, SIGNAL(finished()), this, SLOT(gestureTriggered()));
 }
 
 void ImageWidget::paintEvent(QPaintEvent*)
@@ -100,7 +101,7 @@ void ImageWidget::paintEvent(QPaintEvent*)
         p.setPen(QPen(Qt::gray, 2));
         p.drawEllipse(touchFeedback.position, 5, 5);
         if (touchFeedback.doubleTapped) {
-            p.setPen(QPen(Qt::gray, 2, Qt::DotLine));
+            p.setPen(QPen(Qt::darkGray, 2, Qt::DotLine));
             p.drawEllipse(touchFeedback.position, 15, 15);
         } else if (touchFeedback.tapAndHoldState != 0) {
             QPoint pts[8] = {
@@ -112,7 +113,7 @@ void ImageWidget::paintEvent(QPaintEvent*)
                 touchFeedback.position + QPoint(-10,  10),
                 touchFeedback.position + QPoint(-15,   0)
             };
-            for (int i = 0; i < (touchFeedback.tapAndHoldState-20)/10; ++i)
+            for (int i = 0; i < touchFeedback.tapAndHoldState/5; ++i)
                 p.drawEllipse(pts[i], 3, 3);
         }
     } else if (touchFeedback.sliding) {
@@ -156,43 +157,39 @@ void ImageWidget::mouseDoubleClickEvent(QMouseEvent *event)
 
 void ImageWidget::gestureTriggered()
 {
-    touchFeedback.tapped = false;
-    touchFeedback.doubleTapped = false;
-
-    QGesture *g = qobject_cast<QGesture*>(sender());
     if (sender() == panGesture) {
+        touchFeedback.tapped = false;
+        touchFeedback.doubleTapped = false;
+        QPanGesture *pg = qobject_cast<QPanGesture*>(sender());
         if (zoomedIn) {
-            // usual panning
 #ifndef QT_NO_CURSOR
-            if (g->state() == Qt::GestureStarted)
-                setCursor(Qt::SizeAllCursor);
-            else
-                setCursor(Qt::ArrowCursor);
+            switch (pg->state()) {
+                case Qt::GestureStarted:
+                case Qt::GestureUpdated:
+                    setCursor(Qt::SizeAllCursor);
+                    break;
+                default:
+                    setCursor(Qt::ArrowCursor);
+            }
 #endif
-            const int dx = g->pos().x() - g->lastPos().x();
-            const int dy = g->pos().y() - g->lastPos().y();
-            horizontalOffset += dx;
-            verticalOffset += dy;
-            update();
+            horizontalOffset += pg->lastOffset().width();
+            verticalOffset += pg->lastOffset().height();
         } else {
             // only slide gesture should be accepted
-            const QPanGesture *pg = static_cast<const QPanGesture*>(g);
-            if (g->state() == Qt::GestureFinished) {
+            if (pg->state() == Qt::GestureFinished) {
                 touchFeedback.sliding = false;
                 zoomed = rotated = false;
-                if (pg->totalOffset().width() > 0) {
-                    qDebug() << "slide right";
+                if (pg->totalOffset().width() > 0)
                     goNextImage();
-                } else {
-                    qDebug() << "slide left";
+                else
                     goPrevImage();
-                }
                 updateImage();
             }
         }
+        update();
         feedbackFadeOutTimer.start(500, this);
     } else if (sender() == tapAndHoldGesture) {
-        if (g->state() == Qt::GestureFinished) {
+        if (tapAndHoldGesture->state() == Qt::GestureFinished) {
             qDebug() << "tap and hold detected";
             touchFeedback.reset();
             update();
@@ -201,7 +198,10 @@ void ImageWidget::gestureTriggered()
             menu.addAction("Action 1");
             menu.addAction("Action 2");
             menu.addAction("Action 3");
-            menu.exec(mapToGlobal(g->pos()));
+            menu.exec(mapToGlobal(tapAndHoldGesture->pos()));
+        } else {
+            ++touchFeedback.tapAndHoldState;
+            update();
         }
         feedbackFadeOutTimer.start(500, this);
     }
diff --git a/examples/gestures/imageviewer/imagewidget.h b/examples/gestures/imageviewer/imagewidget.h
index e12634d..d8d5f8d 100644
--- a/examples/gestures/imageviewer/imagewidget.h
+++ b/examples/gestures/imageviewer/imagewidget.h
@@ -48,6 +48,8 @@
 
 #include <QtGui>
 
+#include "tapandholdgesture.h"
+
 class ImageWidget : public QWidget
 {
     Q_OBJECT
@@ -79,7 +81,7 @@ private:
     void goToImage(int index);
 
     QPanGesture *panGesture;
-    QTapAndHoldGesture *tapAndHoldGesture;
+    TapAndHoldGesture *tapAndHoldGesture;
 
     QString path;
     QStringList files;
diff --git a/examples/gestures/imageviewer/main.cpp b/examples/gestures/imageviewer/main.cpp
index 6bda418..cd1928b 100644
--- a/examples/gestures/imageviewer/main.cpp
+++ b/examples/gestures/imageviewer/main.cpp
@@ -81,6 +81,9 @@ int main(int argc, char *argv[])
 
     if (QApplication::arguments().size() > 1)
         w.openDirectory(QApplication::arguments().at(1));
+    else
+        w.openDirectory(QFileDialog::getExistingDirectory(0, "Select image folder"));
+
     return app.exec();
 }
 
diff --git a/examples/gestures/imageviewer/tapandholdgesture.cpp b/examples/gestures/imageviewer/tapandholdgesture.cpp
new file mode 100644
index 0000000..5fe52cc
--- /dev/null
+++ b/examples/gestures/imageviewer/tapandholdgesture.cpp
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "tapandholdgesture.h"
+
+#include <QtGui/qevent.h>
+
+// #define TAPANDHOLD_USING_MOUSE
+
+/*!
+    \class TapAndHoldGesture
+    \since 4.6
+
+    \brief The TapAndHoldGesture class represents a Tap-and-Hold gesture,
+    providing additional information.
+*/
+
+const int TapAndHoldGesture::iterationCount = 40;
+const int TapAndHoldGesture::iterationTimeout = 50;
+
+/*!
+    Creates a new Tap and Hold gesture handler object and marks it as a child
+    of \a parent.
+
+    On some platforms like Windows there is a system-wide tap and hold gesture
+    that cannot be overriden, hence the gesture might never trigger and default
+    context menu will be shown instead.
+*/
+TapAndHoldGesture::TapAndHoldGesture(QWidget *parent)
+    : QGesture(parent), iteration(0)
+{
+}
+
+/*! \internal */
+bool TapAndHoldGesture::filterEvent(QEvent *event)
+{
+    if (!event->spontaneous())
+        return false;
+    const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
+    switch (event->type()) {
+    case QEvent::TouchBegin: {
+        if (timer.isActive())
+            timer.stop();
+        timer.start(TapAndHoldGesture::iterationTimeout, this);
+        const QPoint p = ev->touchPoints().at(0).pos().toPoint();
+        position = p;
+        break;
+    }
+    case QEvent::TouchUpdate:
+        if (ev->touchPoints().size() == 1) {
+            const QPoint startPos = ev->touchPoints().at(0).startPos().toPoint();
+            const QPoint pos = ev->touchPoints().at(0).pos().toPoint();
+            if ((startPos - pos).manhattanLength() > 15)
+                reset();
+        } else {
+            reset();
+        }
+        break;
+    case QEvent::TouchEnd:
+        reset();
+        break;
+#ifdef TAPANDHOLD_USING_MOUSE
+    case QEvent::MouseButtonPress: {
+        if (timer.isActive())
+            timer.stop();
+        timer.start(TapAndHoldGesture::iterationTimeout, this);
+        const QPoint p = static_cast<QMouseEvent*>(event)->pos();
+        position = startPosition = p;
+        break;
+    }
+    case QEvent::MouseMove: {
+        const QPoint startPos = startPosition;
+        const QPoint pos = static_cast<QMouseEvent*>(event)->pos();
+        if ((startPos - pos).manhattanLength() > 15)
+            reset();
+        break;
+    }
+    case QEvent::MouseButtonRelease:
+        reset();
+        break;
+#endif // TAPANDHOLD_USING_MOUSE
+    default:
+        break;
+    }
+    return false;
+}
+
+/*! \internal */
+void TapAndHoldGesture::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() != timer.timerId())
+        return;
+    if (iteration == TapAndHoldGesture::iterationCount) {
+        timer.stop();
+        updateState(Qt::GestureFinished);
+    } else {
+        updateState(Qt::GestureUpdated);
+    }
+    ++iteration;
+}
+
+/*! \internal */
+void TapAndHoldGesture::reset()
+{
+    timer.stop();
+    iteration = 0;
+    position = startPosition = QPoint();
+    updateState(Qt::NoGesture);
+}
+
+/*!
+    \property TapAndHoldGesture::pos
+
+    \brief The position of the gesture.
+*/
+QPoint TapAndHoldGesture::pos() const
+{
+    return position;
+}
diff --git a/examples/statemachine/tankgame/rocketitem.h b/examples/gestures/imageviewer/tapandholdgesture.h
index a485d03..61fabc2 100644
--- a/examples/statemachine/tankgame/rocketitem.h
+++ b/examples/gestures/imageviewer/tapandholdgesture.h
@@ -39,28 +39,36 @@
 **
 ****************************************************************************/
 
-#ifndef ROCKETITEM_H
-#define ROCKETITEM_H
+#ifndef TAPANDHOLDGESTURE_H
+#define TAPANDHOLDGESTURE_H
 
-#include "gameitem.h"
+#include <QtCore/QBasicTimer>
+#include <QtGui/QGesture>
+#include <QtGui/QWidget>
 
-class RocketItem: public GameItem
+class TapAndHoldGesture : public QGesture
 {
     Q_OBJECT
+    Q_PROPERTY(QPoint pos READ pos)
+
 public:
-    RocketItem(QObject *parent = 0);
+    TapAndHoldGesture(QWidget *parent);
+
+    bool filterEvent(QEvent *event);
+    void reset();
 
-    virtual void idle(qreal elapsed);
-    qreal speed() const { return 100.0; }
-    void setDirection(qreal direction) { m_direction = direction; }
+    QPoint pos() const;
 
 protected:
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-    QRectF boundingRect() const;
+    void timerEvent(QTimerEvent *event);
 
 private:
-    qreal m_direction;
-    qreal m_distance;
+    QBasicTimer timer;
+    int iteration;
+    QPoint position;
+    QPoint startPosition;
+    static const int iterationCount;
+    static const int iterationTimeout;
 };
 
-#endif
+#endif // TAPANDHOLDGESTURE_H
diff --git a/examples/graphicsview/collidingmice/mouse.cpp b/examples/graphicsview/collidingmice/mouse.cpp
index c6a67b1..4cc29dd 100644
--- a/examples/graphicsview/collidingmice/mouse.cpp
+++ b/examples/graphicsview/collidingmice/mouse.cpp
@@ -64,7 +64,7 @@ Mouse::Mouse()
     : angle(0), speed(0), mouseEyeDirection(0),
       color(qrand() % 256, qrand() % 256, qrand() % 256)
 {
-    rotate(qrand() % (360 * 16));
+    setRotation(qrand() % (360 * 16));
 }
 //! [0]
 
@@ -195,7 +195,7 @@ void Mouse::advance(int step)
     qreal dx = ::sin(angle) * 10;
     mouseEyeDirection = (qAbs(dx / 5) < 1) ? 0 : dx / 5;
 
-    rotate(dx);
+    setRotation(rotation() + dx);
     setPos(mapToParent(0, -(3 + sin(speed) * 3)));
 }
 //! [11]
diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro
index 0698f89..9098936 100644
--- a/examples/ipc/ipc.pro
+++ b/examples/ipc/ipc.pro
@@ -1,5 +1,6 @@
 TEMPLATE      = subdirs
-SUBDIRS       = sharedmemory 
+# no QSharedMemory
+!vxworks:!qnx:SUBDIRS = sharedmemory
 !wince*: SUBDIRS += localfortuneserver localfortuneclient
 
 # install
diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro
index d202451..7a9d197 100644
--- a/examples/itemviews/chart/chart.pro
+++ b/examples/itemviews/chart/chart.pro
@@ -4,7 +4,7 @@ RESOURCES   = chart.qrc
 SOURCES     = main.cpp \
               mainwindow.cpp \
               pieview.cpp
-unix:!mac:LIBS+= -lm
+unix:!mac:!vxworks:LIBS+= -lm
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/chart
diff --git a/examples/itemviews/frozencolumn/freezetablewidget.h b/examples/itemviews/frozencolumn/freezetablewidget.h
index e22660e..f7b8e43 100644
--- a/examples/itemviews/frozencolumn/freezetablewidget.h
+++ b/examples/itemviews/frozencolumn/freezetablewidget.h
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #ifndef FREEZETABLEWIDGET_H
 #define FREEZETABLEWIDGET_H
 
diff --git a/examples/itemviews/frozencolumn/main.cpp b/examples/itemviews/frozencolumn/main.cpp
index 8ed9d3b..9f6a637 100644
--- a/examples/itemviews/frozencolumn/main.cpp
+++ b/examples/itemviews/frozencolumn/main.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QApplication>
 #include <QStandardItemModel>
 #include <QFile>
diff --git a/examples/mainwindows/mdi/mainwindow.cpp b/examples/mainwindows/mdi/mainwindow.cpp
index 3cb54f1..9ef2cae 100644
--- a/examples/mainwindows/mdi/mainwindow.cpp
+++ b/examples/mainwindows/mdi/mainwindow.cpp
@@ -259,7 +259,6 @@ void MainWindow::createActions()
     connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste()));
 
     closeAct = new QAction(tr("Cl&ose"), this);
-    closeAct->setShortcut(tr("Ctrl+F4"));
     closeAct->setStatusTip(tr("Close the active window"));
     connect(closeAct, SIGNAL(triggered()),
             mdiArea, SLOT(closeActiveSubWindow()));
diff --git a/examples/multimedia/README b/examples/multimedia/README
new file mode 100644
index 0000000..aa78e36
--- /dev/null
+++ b/examples/multimedia/README
@@ -0,0 +1,34 @@
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/multimedia/audio/audio.pro b/examples/multimedia/audio/audio.pro
new file mode 100644
index 0000000..c64bb34
--- /dev/null
+++ b/examples/multimedia/audio/audio.pro
@@ -0,0 +1,10 @@
+TEMPLATE      = subdirs
+SUBDIRS       = audioinput \
+                audiooutput \
+                audiodevices
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS audio.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio
+INSTALLS += target sources
diff --git a/examples/multimedia/audio/audiodevices/audiodevices.cpp b/examples/multimedia/audio/audiodevices/audiodevices.cpp
new file mode 100644
index 0000000..2a3af98
--- /dev/null
+++ b/examples/multimedia/audio/audiodevices/audiodevices.cpp
@@ -0,0 +1,272 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QDebug>
+#include <QAudioDeviceInfo>
+
+#include "audiodevices.h"
+
+AudioDevicesBase::AudioDevicesBase( QMainWindow *parent, Qt::WFlags f )
+{
+    Q_UNUSED(parent)
+    Q_UNUSED(f)
+    setupUi( this );
+}
+
+AudioDevicesBase::~AudioDevicesBase() {}
+
+
+AudioTest::AudioTest( QMainWindow *parent, Qt::WFlags f )
+    : AudioDevicesBase( parent, f )
+{
+    mode = QAudio::AudioOutput;
+    modeBox->addItem("Input");
+    modeBox->addItem("Output");
+
+    connect(testButton,SIGNAL(clicked()),SLOT(test()));
+    connect(modeBox,SIGNAL(activated(int)),SLOT(modeChanged(int)));
+    connect(deviceBox,SIGNAL(activated(int)),SLOT(deviceChanged(int)));
+    connect(frequencyBox,SIGNAL(activated(int)),SLOT(freqChanged(int)));
+    connect(channelsBox,SIGNAL(activated(int)),SLOT(channelChanged(int)));
+    connect(codecsBox,SIGNAL(activated(int)),SLOT(codecChanged(int)));
+    connect(sampleSizesBox,SIGNAL(activated(int)),SLOT(sampleSizeChanged(int)));
+    connect(sampleTypesBox,SIGNAL(activated(int)),SLOT(sampleTypeChanged(int)));
+    connect(endianBox,SIGNAL(activated(int)),SLOT(endianChanged(int)));
+
+    device = 0;
+
+    modeBox->setCurrentIndex(0);
+    modeChanged(0);
+    deviceBox->setCurrentIndex(0);
+    deviceChanged(0);
+}
+
+AudioTest::~AudioTest()
+{
+}
+
+void AudioTest::test()
+{
+    // tries to set all the settings picked.
+
+    if(device) {
+        if(device->isFormatSupported(settings)) {
+            logOutput->append("Success");
+            nearestFreq->setText("");
+            nearestChannel->setText("");
+            nearestCodec->setText("");
+            nearestSampleSize->setText("");
+            nearestSampleType->setText("");
+            nearestEndian->setText("");
+        } else {
+            QAudioFormat nearest = device->nearestFormat(settings);
+            logOutput->append(tr("Failed"));
+            nearestFreq->setText(QString("%1").arg(nearest.frequency()));
+            nearestChannel->setText(QString("%1").arg(nearest.channels()));
+            nearestCodec->setText(nearest.codec());
+            nearestSampleSize->setText(QString("%1").arg(nearest.sampleSize()));
+
+            switch(nearest.sampleType()) {
+                case QAudioFormat::SignedInt:
+                    nearestSampleType->setText("SignedInt");
+                    break;
+                case QAudioFormat::UnSignedInt:
+                    nearestSampleType->setText("UnSignedInt");
+                    break;
+                case QAudioFormat::Float:
+                    nearestSampleType->setText("Float");
+                    break;
+                case QAudioFormat::Unknown:
+                    nearestSampleType->setText("Unknown");
+            }
+            switch(nearest.byteOrder()) {
+                case QAudioFormat::LittleEndian:
+                    nearestEndian->setText("LittleEndian");
+                    break;
+                case QAudioFormat::BigEndian:
+                    nearestEndian->setText("BigEndian");
+            }
+        }
+    }
+    else
+        logOutput->append("No Device");
+}
+
+void AudioTest::modeChanged(int idx)
+{
+    // mode has changed
+    if(idx == 0)
+        mode=QAudio::AudioInput;
+    else
+        mode=QAudio::AudioOutput;
+
+    deviceBox->clear();
+    QList<QAudioDeviceId> devices = QAudioDeviceInfo::deviceList(mode);
+    for(int i = 0; i < devices.size(); ++i) {
+        deviceBox->addItem(QAudioDeviceInfo(devices.at(i)).deviceName(), qVariantFromValue(devices.at(i)));
+    }
+}
+
+void AudioTest::deviceChanged(int idx)
+{
+    delete device;
+    device = 0;
+
+    if (deviceBox->count() == 0)
+        return;
+
+    // device has changed
+    deviceHandle = deviceBox->itemData(idx).value<QAudioDeviceId>();
+    device = new QAudioDeviceInfo(deviceHandle, this);
+
+    frequencyBox->clear();
+    QList<int> freqz = device->supportedFrequencies();
+    for(int i = 0; i < freqz.size(); ++i)
+        frequencyBox->addItem(QString("%1").arg(freqz.at(i)));
+    if(freqz.size())
+        settings.setFrequency(freqz.at(0));
+
+    channelsBox->clear();
+    QList<int> chz = device->supportedChannels();
+    for(int i = 0; i < chz.size(); ++i)
+        channelsBox->addItem(QString("%1").arg(chz.at(i)));
+    if(chz.size())
+        settings.setChannels(chz.at(0));
+
+    codecsBox->clear();
+    QStringList codecz = device->supportedCodecs();
+    for(int i = 0; i < codecz.size(); ++i)
+        codecsBox->addItem(QString("%1").arg(codecz.at(i)));
+    if(codecz.size())
+        settings.setCodec(codecz.at(0));
+    // Add false to create failed condition!
+    codecsBox->addItem("audio/mpeg");
+
+    sampleSizesBox->clear();
+    QList<int> sampleSizez = device->supportedSampleSizes();
+    for(int i = 0; i < sampleSizez.size(); ++i)
+        sampleSizesBox->addItem(QString("%1").arg(sampleSizez.at(i)));
+    if(sampleSizez.size())
+        settings.setSampleSize(sampleSizez.at(0));
+
+    sampleTypesBox->clear();
+    QList<QAudioFormat::SampleType> sampleTypez = device->supportedSampleTypes();
+    for(int i = 0; i < sampleTypez.size(); ++i) {
+        switch(sampleTypez.at(i)) {
+            case QAudioFormat::SignedInt:
+                sampleTypesBox->addItem("SignedInt");
+                break;
+            case QAudioFormat::UnSignedInt:
+                sampleTypesBox->addItem("UnSignedInt");
+                break;
+            case QAudioFormat::Float:
+                sampleTypesBox->addItem("Float");
+                break;
+            case QAudioFormat::Unknown:
+                sampleTypesBox->addItem("Unknown");
+        }
+	if(sampleTypez.size())
+            settings.setSampleType(sampleTypez.at(0));
+    }
+
+    endianBox->clear();
+    QList<QAudioFormat::Endian> endianz = device->supportedByteOrders();
+    for(int i = 0; i < endianz.size(); ++i) {
+        switch(endianz.at(i)) {
+            case QAudioFormat::LittleEndian:
+                endianBox->addItem("Little Endian");
+                break;
+            case QAudioFormat::BigEndian:
+                endianBox->addItem("Big Endian");
+                break;
+        }
+    }
+    if(endianz.size())
+        settings.setByteOrder(endianz.at(0));
+}
+
+void AudioTest::freqChanged(int idx)
+{
+    // freq has changed
+    settings.setFrequency(frequencyBox->itemText(idx).toInt());
+}
+
+void AudioTest::channelChanged(int idx)
+{
+    settings.setChannels(channelsBox->itemText(idx).toInt());
+}
+
+void AudioTest::codecChanged(int idx)
+{
+    settings.setCodec(codecsBox->itemText(idx));
+}
+
+void AudioTest::sampleSizeChanged(int idx)
+{
+    settings.setSampleSize(sampleSizesBox->itemText(idx).toInt());
+}
+
+void AudioTest::sampleTypeChanged(int idx)
+{
+    switch(sampleTypesBox->itemText(idx).toInt()) {
+        case QAudioFormat::SignedInt:
+            settings.setSampleType(QAudioFormat::SignedInt);
+            break;
+        case QAudioFormat::UnSignedInt:
+            settings.setSampleType(QAudioFormat::UnSignedInt);
+            break;
+        case QAudioFormat::Float:
+            settings.setSampleType(QAudioFormat::Float);
+    }
+}
+
+void AudioTest::endianChanged(int idx)
+{
+    switch(endianBox->itemText(idx).toInt()) {
+        case QAudioFormat::LittleEndian:
+            settings.setByteOrder(QAudioFormat::LittleEndian);
+            break;
+        case QAudioFormat::BigEndian:
+            settings.setByteOrder(QAudioFormat::BigEndian);
+    }
+}
+
diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h b/examples/multimedia/audio/audiodevices/audiodevices.h
index a97024d..34a531b 100644
--- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h
+++ b/examples/multimedia/audio/audiodevices/audiodevices.h
@@ -39,54 +39,41 @@
 **
 ****************************************************************************/
 
-#ifndef SPIN_AI_H
-#define SPIN_AI_H
-
-#include <tankgame/plugin.h>
 
 #include <QObject>
-#include <QState>
-#include <QVariant>
+#include <QMainWindow>
+#include <QAudioDeviceInfo>
+
+#include "ui_audiodevicesbase.h"
 
-class SpinState: public QState
+class AudioDevicesBase : public QMainWindow, public Ui::AudioDevicesBase
 {
-    Q_OBJECT
 public:
-    SpinState(QObject *tank, QState *parent) : QState(parent), m_tank(tank)
-    {
-    }
-
-public slots:
-    void spin()
-    {
-        m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0);
-    }
-
-protected:
-    void onEntry(QEvent *)
-    {
-        connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-        spin();
-    }
-
-    void onExit(QEvent *)
-    {
-        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-    }
-
-private:
-    QObject *m_tank;
-
+    AudioDevicesBase( QMainWindow *parent = 0, Qt::WFlags f = 0 );
+    virtual ~AudioDevicesBase();
 };
 
-class SpinAi: public QObject, public Plugin
+class AudioTest : public AudioDevicesBase
 {
     Q_OBJECT
-    Q_INTERFACES(Plugin)
 public:
-    SpinAi() { setObjectName("Spin and destroy"); }
+    AudioTest( QMainWindow *parent = 0, Qt::WFlags f = 0 );
+    virtual ~AudioTest();
+
+    QAudioDeviceId deviceHandle;
+    QAudioDeviceInfo*  device;
+    QAudioFormat settings;
+    QAudio::Mode mode;
 
-    virtual QState *create(QState *parentState, QObject *tank);
+private slots:
+    void modeChanged(int idx);
+    void deviceChanged(int idx);
+    void freqChanged(int idx);
+    void channelChanged(int idx);
+    void codecChanged(int idx);
+    void sampleSizeChanged(int idx);
+    void sampleTypeChanged(int idx);
+    void endianChanged(int idx);
+    void test();
 };
 
-#endif
diff --git a/examples/multimedia/audio/audiodevices/audiodevices.pro b/examples/multimedia/audio/audiodevices/audiodevices.pro
new file mode 100644
index 0000000..adc4890
--- /dev/null
+++ b/examples/multimedia/audio/audiodevices/audiodevices.pro
@@ -0,0 +1,12 @@
+HEADERS       = audiodevices.h
+SOURCES       = audiodevices.cpp \
+                main.cpp
+FORMS         += audiodevicesbase.ui
+
+QT           += multimedia
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices
+sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiodevices.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices
+INSTALLS += target sources
diff --git a/examples/multimedia/audio/audiodevices/audiodevicesbase.ui b/examples/multimedia/audio/audiodevices/audiodevicesbase.ui
new file mode 100644
index 0000000..674f201
--- /dev/null
+++ b/examples/multimedia/audio/audiodevices/audiodevicesbase.ui
@@ -0,0 +1,255 @@
+<ui version="4.0" >
+ <class>AudioDevicesBase</class>
+ <widget class="QMainWindow" name="AudioDevicesBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>504</width>
+    <height>702</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>AudioDevicesBase</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>28</y>
+     <width>504</width>
+     <height>653</height>
+    </rect>
+   </property>
+   <widget class="QWidget" name="layoutWidget" >
+    <property name="geometry" >
+     <rect>
+      <x>40</x>
+      <y>21</y>
+      <width>321</width>
+      <height>506</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="deviceLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Device</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLabel" name="modeLabel" >
+       <property name="text" >
+        <string>Mode</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QComboBox" name="deviceBox" />
+     </item>
+     <item row="1" column="1" >
+      <widget class="QComboBox" name="modeBox" />
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="actualLabel" >
+       <property name="frameShape" >
+        <enum>QFrame::Panel</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Raised</enum>
+       </property>
+       <property name="text" >
+        <string>Actual Settings</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QLabel" name="nearestLabel" >
+       <property name="frameShape" >
+        <enum>QFrame::Panel</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Raised</enum>
+       </property>
+       <property name="text" >
+        <string>Nearest Settings</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="actualFreqLabel" >
+       <property name="text" >
+        <string>Frequency</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QLabel" name="nearestFreqLabel" >
+       <property name="text" >
+        <string>Frequency</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0" >
+      <widget class="QComboBox" name="frequencyBox" />
+     </item>
+     <item row="4" column="1" >
+      <widget class="QLineEdit" name="nearestFreq" />
+     </item>
+     <item row="5" column="0" >
+      <widget class="QLabel" name="actualChannelsLabel" >
+       <property name="text" >
+        <string>Channels</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1" >
+      <widget class="QLabel" name="nearestChannelLabel" >
+       <property name="text" >
+        <string>Channel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0" >
+      <widget class="QComboBox" name="channelsBox" />
+     </item>
+     <item row="6" column="1" >
+      <widget class="QLineEdit" name="nearestChannel" />
+     </item>
+     <item row="7" column="0" >
+      <widget class="QLabel" name="actualCodecLabel" >
+       <property name="text" >
+        <string>Codecs</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1" >
+      <widget class="QLabel" name="nearestCodecLabel" >
+       <property name="text" >
+        <string>Codec</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="0" >
+      <widget class="QComboBox" name="codecsBox" />
+     </item>
+     <item row="8" column="1" >
+      <widget class="QLineEdit" name="nearestCodec" />
+     </item>
+     <item row="9" column="0" >
+      <widget class="QLabel" name="actualSampleSizeLabel" >
+       <property name="text" >
+        <string>SampleSize</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="1" >
+      <widget class="QLabel" name="nearestSampleSizeLabel" >
+       <property name="text" >
+        <string>SampleSize</string>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="0" >
+      <widget class="QComboBox" name="sampleSizesBox" />
+     </item>
+     <item row="10" column="1" >
+      <widget class="QLineEdit" name="nearestSampleSize" />
+     </item>
+     <item row="11" column="0" >
+      <widget class="QLabel" name="actualSampleTypeLabel" >
+       <property name="text" >
+        <string>SampleType</string>
+       </property>
+      </widget>
+     </item>
+     <item row="11" column="1" >
+      <widget class="QLabel" name="nearestSampleTypeLabel" >
+       <property name="text" >
+        <string>SampleType</string>
+       </property>
+      </widget>
+     </item>
+     <item row="12" column="0" >
+      <widget class="QComboBox" name="sampleTypesBox" />
+     </item>
+     <item row="12" column="1" >
+      <widget class="QLineEdit" name="nearestSampleType" />
+     </item>
+     <item row="13" column="0" >
+      <widget class="QLabel" name="actualEndianLabel" >
+       <property name="text" >
+        <string>Endianess</string>
+       </property>
+      </widget>
+     </item>
+     <item row="13" column="1" >
+      <widget class="QLabel" name="nearestEndianLabel" >
+       <property name="text" >
+        <string>Endianess</string>
+       </property>
+      </widget>
+     </item>
+     <item row="14" column="0" >
+      <widget class="QComboBox" name="endianBox" />
+     </item>
+     <item row="14" column="1" >
+      <widget class="QLineEdit" name="nearestEndian" />
+     </item>
+     <item row="15" column="0" colspan="2" >
+      <widget class="QTextEdit" name="logOutput" >
+       <property name="minimumSize" >
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="16" column="0" colspan="2" >
+      <widget class="QPushButton" name="testButton" >
+       <property name="text" >
+        <string>Test</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>504</width>
+     <height>28</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>681</y>
+     <width>504</width>
+     <height>21</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/statemachine/tankgame/plugin.h b/examples/multimedia/audio/audiodevices/main.cpp
index 97e4640..12e413e 100644
--- a/examples/statemachine/tankgame/plugin.h
+++ b/examples/multimedia/audio/audiodevices/main.cpp
@@ -39,24 +39,17 @@
 **
 ****************************************************************************/
 
-#ifndef PLUGIN_H
-#define PLUGIN_H
+#include <QtGui>
 
-#include <QtPlugin>
+#include "audiodevices.h"
 
-QT_BEGIN_NAMESPACE
-class QState;
-QT_END_NAMESPACE
-class Plugin
+int main(int argv, char **args)
 {
-public:
-    virtual ~Plugin() {}
+    QApplication app(argv, args);
+    app.setApplicationName("Audio Device Test");
 
-    virtual QState *create(QState *parentState, QObject *tank) = 0;
-};
+    AudioTest audio;
+    audio.show();
 
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(Plugin, "TankPlugin")
-QT_END_NAMESPACE
-
-#endif
+    return app.exec();
+}
diff --git a/examples/multimedia/audio/audioinput/audioinput.cpp b/examples/multimedia/audio/audioinput/audioinput.cpp
new file mode 100644
index 0000000..ae7d84c
--- /dev/null
+++ b/examples/multimedia/audio/audioinput/audioinput.cpp
@@ -0,0 +1,376 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <stdlib.h>
+#include <math.h>
+
+#include <QDebug>
+#include <QPainter>
+#include <QVBoxLayout>
+
+#include <QAudioDeviceInfo>
+#include <QAudioInput>
+#include "audioinput.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+Spectrum::Spectrum(QObject* parent, QAudioInput* device, float* out)
+    :QIODevice( parent )
+{
+    input = device;
+    output = out;
+
+    unsigned int i;
+
+    // Allocate sample buffer and initialize sin and cos lookup tables
+    fftState = (fft_state *) malloc (sizeof(fft_state));
+
+    for(i = 0; i < BUFFER_SIZE; i++) {
+        bitReverse[i] = reverseBits(i);
+    }
+    for(i = 0; i < BUFFER_SIZE / 2; i++) {
+        float j = 2 * M_PI * i / BUFFER_SIZE;
+        costable[i] = cos(j);
+        sintable[i] = sin(j);
+    }
+}
+
+Spectrum::~Spectrum()
+{
+}
+
+void Spectrum::start()
+{
+    open(QIODevice::WriteOnly);
+}
+
+void Spectrum::stop()
+{
+    close();
+}
+
+qint64 Spectrum::readData(char *data, qint64 maxlen)
+{
+    Q_UNUSED(data)
+    Q_UNUSED(maxlen)
+
+    return 0;
+}
+
+qint64 Spectrum::writeData(const char *data, qint64 len)
+{
+    performFFT((sound_sample*)data);
+    emit update();
+
+    return len;
+}
+
+int Spectrum::reverseBits(unsigned int initial) {
+    // BIT-REVERSE-COPY(a,A)
+
+    unsigned int reversed = 0, loop;
+    for(loop = 0; loop < BUFFER_SIZE_LOG; loop++) {
+        reversed <<= 1;
+        reversed += (initial & 1);
+        initial >>= 1;
+    }
+    return reversed;
+}
+
+void Spectrum::performFFT(const sound_sample *input) {
+    /* Convert to reverse bit order for FFT */
+    prepFFT(input, fftState->real, fftState->imag);
+
+    /* Calculate FFT */
+    calcFFT(fftState->real, fftState->imag);
+
+    /* Convert FFT to intensities */
+    outputFFT(fftState->real, fftState->imag);
+}
+
+void Spectrum::prepFFT(const sound_sample *input, float * re, float * im) {
+    unsigned int i;
+    float *realptr = re;
+    float *imagptr = im;
+
+    /* Get input, in reverse bit order */
+    for(i = 0; i < BUFFER_SIZE; i++) {
+        *realptr++ = input[bitReverse[i]];
+        *imagptr++ = 0;
+    }
+}
+
+void Spectrum::calcFFT(float * re, float * im) {
+    unsigned int i, j, k;
+    unsigned int exchanges;
+    float fact_real, fact_imag;
+    float tmp_real, tmp_imag;
+    unsigned int factfact;
+
+    /* Set up some variables to reduce calculation in the loops */
+    exchanges = 1;
+    factfact = BUFFER_SIZE / 2;
+
+    /* divide and conquer method */
+    for(i = BUFFER_SIZE_LOG; i != 0; i--) {
+        for(j = 0; j != exchanges; j++) {
+            fact_real = costable[j * factfact];
+            fact_imag = sintable[j * factfact];
+            for(k = j; k < BUFFER_SIZE; k += exchanges << 1) {
+                int k1 = k + exchanges;
+                tmp_real = fact_real * re[k1] - fact_imag * im[k1];
+                tmp_imag = fact_real * im[k1] + fact_imag * re[k1];
+                re[k1] = re[k] - tmp_real;
+                im[k1] = im[k] - tmp_imag;
+                re[k]  += tmp_real;
+                im[k]  += tmp_imag;
+            }
+        }
+        exchanges <<= 1;
+        factfact >>= 1;
+    }
+}
+
+void Spectrum::outputFFT(const float * re, const float * im) {
+    const float *realptr   = re;
+    const float *imagptr   = im;
+    float       *outputptr = output;
+
+    float *endptr    = output + BUFFER_SIZE / 2;
+
+    /* Convert FFT to intensities */
+
+    while(outputptr <= endptr) {
+        *outputptr = (*realptr * *realptr) + (*imagptr * *imagptr);
+        outputptr++; realptr++; imagptr++;
+    }
+    *output /= 4;
+    *endptr /= 4;
+}
+
+
+RenderArea::RenderArea(QWidget *parent)
+    : QWidget(parent)
+{
+    setBackgroundRole(QPalette::Base);
+    setAutoFillBackground(true);
+
+    samples = 0;
+    sampleSize = 0;
+    setMinimumHeight(30);
+    setMinimumWidth(200);
+}
+
+void RenderArea::paintEvent(QPaintEvent * /* event */)
+{
+    QPainter painter(this);
+
+    if(sampleSize == 0)
+        return;
+
+    painter.setPen(Qt::red);
+    int max = 0;
+    for(int i=0;i<sampleSize;i++) {
+        int m = (int)(sqrt(samples[i])/32768);
+        if(m > max)
+            max = m;
+    }
+    int x1,y1,x2,y2;
+
+    for(int i=0;i<10;i++) {
+        x1 = painter.viewport().left()+11;
+        y1 = painter.viewport().top()+10+i;
+        x2 = painter.viewport().right()-20-max;
+        y2 = painter.viewport().top()+10+i;
+        if(x2 < painter.viewport().left()+10)
+            x2 = painter.viewport().left()+10;
+
+        painter.drawLine(QPoint(x1,y1),QPoint(x2,y2));
+    }
+
+    painter.setPen(Qt::black);
+    painter.drawRect(QRect(painter.viewport().left()+10, painter.viewport().top()+10,
+                painter.viewport().right()-20, painter.viewport().bottom()-20));
+}
+
+void RenderArea::spectrum(float* output, int size)
+{
+    samples = output;
+    sampleSize = size;
+    repaint();
+}
+
+
+InputTest::InputTest()
+{
+    QWidget *window = new QWidget;
+    QVBoxLayout* layout = new QVBoxLayout;
+
+    canvas = new RenderArea;
+    layout->addWidget(canvas);
+
+    deviceBox = new QComboBox(this);
+    QList<QAudioDeviceId> devices = QAudioDeviceInfo::deviceList(QAudio::AudioInput);
+    for(int i = 0; i < devices.size(); ++i) {
+        deviceBox->addItem(QAudioDeviceInfo(devices.at(i)).deviceName(), qVariantFromValue(devices.at(i)));
+    }
+    connect(deviceBox,SIGNAL(activated(int)),SLOT(deviceChanged(int)));
+    layout->addWidget(deviceBox);
+
+    button = new QPushButton(this);
+    button->setText(tr("Click for Push Mode"));
+    connect(button,SIGNAL(clicked()),SLOT(toggleMode()));
+    layout->addWidget(button);
+
+    button2 = new QPushButton(this);
+    button2->setText(tr("Click To Suspend"));
+    connect(button2,SIGNAL(clicked()),SLOT(toggleSuspend()));
+    layout->addWidget(button2);
+
+    window->setLayout(layout);
+    setCentralWidget(window);
+    window->show();
+
+    buffer = new char[BUFFER_SIZE*10];
+    output = new float[1024];
+
+    pullMode = true;
+
+    format.setFrequency(8000);
+    format.setChannels(1);
+    format.setSampleSize(8);
+    format.setSampleType(QAudioFormat::UnSignedInt);
+    format.setByteOrder(QAudioFormat::LittleEndian);
+    format.setCodec("audio/pcm");
+
+    audioInput = new QAudioInput(format,this);
+    connect(audioInput,SIGNAL(notify()),SLOT(status()));
+    connect(audioInput,SIGNAL(stateChanged(QAudio::State)),SLOT(state(QAudio::State)));
+    spec  = new Spectrum(this,audioInput,output);
+    connect(spec,SIGNAL(update()),SLOT(refreshDisplay()));
+    spec->start();
+    audioInput->start(spec);
+}
+
+InputTest::~InputTest() {}
+
+void InputTest::status()
+{
+    qWarning()<<"bytesReady = "<<audioInput->bytesReady()<<" bytes, clock = "<<audioInput->clock()<<"ms, totalTime = "<<audioInput->totalTime()/1000<<"ms";
+}
+
+void InputTest::readMore()
+{
+    if(!audioInput)
+        return;
+    qint64 len = audioInput->bytesReady();
+    if(len > BUFFER_SIZE*10)
+        len = BUFFER_SIZE*10;
+    qint64 l = input->read(buffer,len);
+    if(l > 0) {
+        spec->write(buffer,l);
+    }
+}
+
+void InputTest::toggleMode()
+{
+    // Change bewteen pull and push modes
+    audioInput->stop();
+
+    if(pullMode) {
+        button->setText(tr("Click for Push Mode"));
+        input = audioInput->start(0);
+        connect(input,SIGNAL(readyRead()),SLOT(readMore()));
+        pullMode = false;
+    } else {
+        button->setText(tr("Click for Pull Mode"));
+        pullMode = true;
+        audioInput->start(spec);
+    }
+}
+
+void InputTest::toggleSuspend()
+{
+    // toggle suspend/resume
+    if(audioInput->state() == QAudio::SuspendState) {
+        qWarning()<<"status: Suspended, resume()";
+        audioInput->resume();
+        button2->setText("Click To Suspend");
+    } else if (audioInput->state() == QAudio::ActiveState) {
+        qWarning()<<"status: Active, suspend()";
+        audioInput->suspend();
+        button2->setText("Click To Resume");
+    } else if (audioInput->state() == QAudio::StopState) {
+        qWarning()<<"status: Stopped, resume()";
+        audioInput->resume();
+        button2->setText("Click To Suspend");
+    } else if (audioInput->state() == QAudio::IdleState) {
+        qWarning()<<"status: IdleState";
+    }
+}
+
+void InputTest::state(QAudio::State state)
+{
+    qWarning()<<" state="<<state;
+}
+
+void InputTest::refreshDisplay()
+{
+    canvas->spectrum(output,256);
+    canvas->repaint();
+}
+
+void InputTest::deviceChanged(int idx)
+{
+    spec->stop();
+    audioInput->stop();
+    audioInput->disconnect(this);
+    delete audioInput;
+
+    device = deviceBox->itemData(idx).value<QAudioDeviceId>();
+    audioInput = new QAudioInput(device, format, this);
+    connect(audioInput,SIGNAL(notify()),SLOT(status()));
+    connect(audioInput,SIGNAL(stateChanged(QAudio::State)),SLOT(state(QAudio::State)));
+    spec->start();
+    audioInput->start(spec);
+}
diff --git a/examples/statemachine/tankgame/tankitem.h b/examples/multimedia/audio/audioinput/audioinput.h
index a2f72de..3a6b356 100644
--- a/examples/statemachine/tankgame/tankitem.h
+++ b/examples/multimedia/audio/audioinput/audioinput.h
@@ -39,71 +39,106 @@
 **
 ****************************************************************************/
 
-#ifndef TANKITEM_H
-#define TANKITEM_H
+#include <QPixmap>
+#include <QWidget>
+#include <QObject>
+#include <QMainWindow>
+#include <QPushButton>
+#include <QComboBox>
 
-#include "gameitem.h"
+#include <qaudioinput.h>
 
-#include <QColor>
+#define BUFFER_SIZE_LOG 9
+#define BUFFER_SIZE (1 << BUFFER_SIZE_LOG)
 
-class Action;
-class TankItem: public GameItem
+struct _struct_fft_state {
+    float real[BUFFER_SIZE];
+    float imag[BUFFER_SIZE];
+};
+typedef _struct_fft_state   fft_state;
+typedef short int           sound_sample;
+
+class Spectrum : public QIODevice
 {
     Q_OBJECT
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
-    Q_PROPERTY(qreal direction READ direction WRITE turnTo)
-    Q_PROPERTY(qreal distanceToObstacle READ distanceToObstacle)
 public:
-    TankItem(QObject *parent = 0);
+    Spectrum(QObject* parent, QAudioInput* device, float* out);
+    ~Spectrum();
 
-    void setColor(const QColor &color) { m_color = color; }
-    QColor color() const { return m_color; }
+    void start();
+    void stop();
 
-    void idle(qreal elapsed);
-    void setDirection(qreal newDirection);
+    qint64 readData(char *data, qint64 maxlen);
+    qint64 writeData(const char *data, qint64 len);
 
-    qreal speed() const { return 90.0; }
-    qreal angularSpeed() const { return 90.0; }
+    QAudioInput*   input;
+    float*         output;
+    fft_state*     fftState;
 
-    QRectF boundingRect() const;
+    unsigned int bitReverse[BUFFER_SIZE];
+    float        sintable[BUFFER_SIZE / 2];
+    float        costable[BUFFER_SIZE / 2];
 
-    void hitByRocket();
+    void prepFFT (const sound_sample *input, float *re, float *im);
+    void calcFFT (float *re, float *im);
+    void outputFFT (const float *re, const float *im);
+    int  reverseBits (unsigned int initial);
+    void performFFT (const sound_sample *input);
 
-    void setEnabled(bool b) { m_enabled = b; }
-    bool enabled() const { return m_enabled; }
+signals:
+    void update();
+};
 
-    qreal direction() const;
-    qreal distanceToObstacle() const;
-    qreal distanceToObstacle(QGraphicsItem **item) const;
 
-//! [0]
-signals:
-    void tankSpotted(qreal direction, qreal distance);
-    void collision(const QLineF &collidedLine);
-    void actionCompleted();
-    void cannonFired();
-    void aboutToBeDestroyed();
-
-public slots:
-    void moveForwards(qreal length = 10.0);
-    void moveBackwards(qreal length = 10.0);
-    void turn(qreal degrees = 30.0);
-    void turnTo(qreal degrees = 0.0);
-    void stop();
-    void fireCannon();
-//! [0]
+class RenderArea : public QWidget
+{
+    Q_OBJECT
+
+public:
+    RenderArea(QWidget *parent = 0);
+
+    void spectrum(float* output, int size);
 
 protected:
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-    QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
+    void paintEvent(QPaintEvent *event);
 
 private:
-    void setAction(Action *newAction);
+    QPixmap pixmap;
+
+    float*  samples;
+    int     sampleSize;
+};
 
-    Action *m_currentAction;
-    qreal m_currentDirection;
-    QColor m_color;
-    bool m_enabled;
+class InputTest : public QMainWindow
+{
+    Q_OBJECT
+public:
+    InputTest();
+    ~InputTest();
+
+    QAudioDeviceId device;
+    QAudioFormat   format;
+    QAudioInput*   audioInput;
+    Spectrum*      spec;
+    QIODevice*     input;
+    RenderArea*    canvas;
+
+    bool           pullMode;
+
+    QPushButton*   button;
+    QPushButton*   button2;
+    QComboBox*     deviceBox;
+
+    char*          buffer;
+    float*         output;
+
+private slots:
+    void refreshDisplay();
+    void status();
+    void readMore();
+    void toggleMode();
+    void toggleSuspend();
+    void state(QAudio::State s);
+    void deviceChanged(int idx);
 };
 
-#endif
diff --git a/examples/multimedia/audio/audioinput/audioinput.pro b/examples/multimedia/audio/audioinput/audioinput.pro
new file mode 100644
index 0000000..d930750
--- /dev/null
+++ b/examples/multimedia/audio/audioinput/audioinput.pro
@@ -0,0 +1,12 @@
+HEADERS       = audioinput.h
+SOURCES       = audioinput.cpp \
+                main.cpp
+
+QT           += multimedia
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audioinput
+sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audioinput.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audioinput
+INSTALLS += target sources
+
diff --git a/examples/statemachine/tankgame/main.cpp b/examples/multimedia/audio/audioinput/main.cpp
index 85e2747..64a9b04 100644
--- a/examples/statemachine/tankgame/main.cpp
+++ b/examples/multimedia/audio/audioinput/main.cpp
@@ -39,15 +39,17 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-#include "mainwindow.h"
+#include <QtGui>
 
-int main(int argc, char **argv)
+#include "audioinput.h"
+
+int main(int argv, char **args)
 {
-    QApplication app(argc, argv);
+    QApplication app(argv, args);
+    app.setApplicationName("Audio Input Test");
 
-    MainWindow mainWindow;
-    mainWindow.show();
+    InputTest input;
+    input.show();
 
     return app.exec();
 }
diff --git a/examples/multimedia/audio/audiooutput/audiooutput.cpp b/examples/multimedia/audio/audiooutput/audiooutput.cpp
new file mode 100644
index 0000000..be26f19
--- /dev/null
+++ b/examples/multimedia/audio/audiooutput/audiooutput.cpp
@@ -0,0 +1,280 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include <QVBoxLayout>
+
+#include <QAudioOutput>
+#include <QAudioDeviceInfo>
+#include "audiooutput.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+Generator::Generator(QObject *parent)
+    :QIODevice( parent )
+{
+    finished = false;
+    buffer = new char[SECONDS*44100*4+1000];
+    t=buffer;
+    len=fillData(t+4,450,SECONDS); /* left channel, 450Hz sine */
+    len+=fillData(t+6,452,SECONDS); /* right channel, 452Hz sine */
+    putLong(t,len);
+    putLong(buffer+4,len+8+16+8);
+    pos   = 0;
+    total = len+8+16+8;
+}
+
+Generator::~Generator()
+{
+    delete [] buffer;
+}
+
+void Generator::start()
+{
+    open(QIODevice::ReadOnly);
+}
+
+void Generator::stop()
+{
+    close();
+}
+
+int Generator::putShort(char *t, unsigned int value)
+{
+    *(unsigned char *)(t++)=value&255;
+    *(unsigned char *)(t)=(value/256)&255;
+    return 2;
+}
+
+int Generator::putLong(char *t, unsigned int value)
+{
+    *(unsigned char *)(t++)=value&255;
+    *(unsigned char *)(t++)=(value/256)&255;
+    *(unsigned char *)(t++)=(value/(256*256))&255;
+    *(unsigned char *)(t)=(value/(256*256*256))&255;
+    return 4;
+}
+
+int Generator::fillData(char *start, int frequency, int seconds)
+{
+    int i, len=0;
+    int value;
+    for(i=0; i<seconds*44100; i++) {
+        value=(int)(32767.0*sin(2.0*M_PI*((double)(i))*(double)(frequency)/44100.0));
+        putShort(start, value);
+        start += 4;
+        len+=2;
+    }
+    return len;
+}
+
+qint64 Generator::readData(char *data, qint64 maxlen)
+{
+    int len = maxlen;
+    if(len > 16384)
+        len = 16384;
+
+    if(len < (SECONDS*44100*4+1000)-pos) {
+        // Normal
+        memcpy(data,t+pos,len);
+        pos+=len;
+        return len;
+    } else {
+        // Whats left and reset to start
+        qint64 left = (SECONDS*44100*4+1000)-pos;
+        memcpy(data,t+pos,left);
+        pos=0;
+        return left;
+    }
+}
+
+qint64 Generator::writeData(const char *data, qint64 len)
+{
+    Q_UNUSED(data);
+    Q_UNUSED(len);
+
+    return 0;
+}
+
+AudioTest::AudioTest()
+{
+    QWidget *window = new QWidget;
+    QVBoxLayout* layout = new QVBoxLayout;
+
+    deviceBox = new QComboBox(this);
+    QList<QAudioDeviceId> devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput);
+    for(int i = 0; i < devices.size(); ++i) {
+        deviceBox->addItem(QAudioDeviceInfo(devices.at(i)).deviceName(), qVariantFromValue(devices.at(i)));
+    }
+    connect(deviceBox,SIGNAL(activated(int)),SLOT(deviceChanged(int)));
+    layout->addWidget(deviceBox);
+
+    button = new QPushButton(this);
+    button->setText(tr("Click for Push Mode"));
+    connect(button,SIGNAL(clicked()),SLOT(toggle()));
+    layout->addWidget(button);
+
+    button2 = new QPushButton(this);
+    button2->setText(tr("Click To Suspend"));
+    connect(button2,SIGNAL(clicked()),SLOT(togglePlay()));
+    layout->addWidget(button2);
+
+    window->setLayout(layout);
+    setCentralWidget(window);
+    window->show();
+
+    buffer = new char[BUFFER_SIZE];
+
+    gen = new Generator(this);
+
+    pullMode = true;
+
+    timer = new QTimer(this);
+    connect(timer,SIGNAL(timeout()),SLOT(writeMore()));
+
+    gen->start();
+
+    settings.setFrequency(44100);
+    settings.setChannels(2);
+    settings.setSampleSize(16);
+    settings.setCodec("audio/pcm");
+    settings.setByteOrder(QAudioFormat::LittleEndian);
+    settings.setSampleType(QAudioFormat::SignedInt);
+    audioOutput = new QAudioOutput(settings,this);
+    connect(audioOutput,SIGNAL(notify()),SLOT(status()));
+    connect(audioOutput,SIGNAL(stateChanged(QAudio::State)),SLOT(state(QAudio::State)));
+
+    audioOutput->start(gen);
+}
+
+AudioTest::~AudioTest()
+{
+    delete [] buffer;
+}
+
+void AudioTest::deviceChanged(int idx)
+{
+    timer->stop();
+    gen->stop();
+    audioOutput->stop();
+    audioOutput->disconnect(this);
+    delete audioOutput;
+
+    device = deviceBox->itemData(idx).value<QAudioDeviceId>();
+    audioOutput = new QAudioOutput(device,settings,this);
+    connect(audioOutput,SIGNAL(notify()),SLOT(status()));
+    connect(audioOutput,SIGNAL(stateChanged(QAudio::State)),SLOT(state(QAudio::State)));
+    gen->start();
+    audioOutput->start(gen);
+}
+
+void AudioTest::status()
+{
+    qWarning()<<"byteFree = "<<audioOutput->bytesFree()<<" bytes, clock = "<<audioOutput->clock()<<"ms, totalTime = "<<audioOutput->totalTime()/1000<<"ms";
+}
+
+void AudioTest::writeMore()
+{
+    if(!audioOutput)
+        return;
+
+    if(audioOutput->state() == QAudio::StopState)
+        return;
+
+    int    l;
+    int    out;
+
+    int chunks = audioOutput->bytesFree()/audioOutput->periodSize();
+    while(chunks) {
+       l = gen->read(buffer,audioOutput->periodSize());
+       if(l > 0)
+           out = output->write(buffer,l);
+       if(l != audioOutput->periodSize())
+	   break;
+       chunks--;
+    }
+}
+
+void AudioTest::toggle()
+{
+    // Change between pull and push modes
+
+    timer->stop();
+    audioOutput->stop();
+
+    if (pullMode) {
+        button->setText("Click for Pull Mode");
+        output = audioOutput->start(0);
+        pullMode = false;
+        timer->start(20);
+    } else {
+        button->setText("Click for Push Mode");
+        pullMode = true;
+        audioOutput->start(gen);
+    }
+}
+
+void AudioTest::togglePlay()
+{
+    // toggle suspend/resume
+    if(audioOutput->state() == QAudio::SuspendState) {
+        qWarning()<<"status: Suspended, resume()";
+        audioOutput->resume();
+        button2->setText("Click To Suspend");
+    } else if (audioOutput->state() == QAudio::ActiveState) {
+        qWarning()<<"status: Active, suspend()";
+        audioOutput->suspend();
+        button2->setText("Click To Resume");
+    } else if (audioOutput->state() == QAudio::StopState) {
+        qWarning()<<"status: Stopped, resume()";
+        audioOutput->resume();
+        button2->setText("Click To Suspend");
+    } else if (audioOutput->state() == QAudio::IdleState) {
+        qWarning()<<"status: IdleState";
+    }
+}
+
+void AudioTest::state(QAudio::State state)
+{
+    qWarning()<<" state="<<state;
+}
diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h b/examples/multimedia/audio/audiooutput/audiooutput.h
index f35da26..1e21b48 100644
--- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h
+++ b/examples/multimedia/audio/audiooutput/audiooutput.h
@@ -39,54 +39,74 @@
 **
 ****************************************************************************/
 
-#ifndef SPIN_AI_WITH_ERROR_H
-#define SPIN_AI_WITH_ERROR_H
+#include <math.h>
 
-#include <tankgame/plugin.h>
+#define BUFFER_SIZE 32768
+#define SECONDS 3
 
 #include <QObject>
-#include <QState>
-#include <QVariant>
+#include <QMainWindow>
+#include <QIODevice>
+#include <QTimer>
+#include <QPushButton>
+#include <QComboBox>
 
-class SpinState: public QState
+#include <QAudioOutput>
+
+class Generator : public QIODevice
 {
     Q_OBJECT
 public:
-    SpinState(QObject *tank, QState *parent) : QState(parent), m_tank(tank)
-    {
-    }
+    Generator(QObject *parent);
+    ~Generator();
 
-public slots:
-    void spin()
-    {
-        m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0);
-    }
+    void start();
+    void stop();
 
-protected:
-    void onEntry(QEvent *)
-    {
-        connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-        spin();
-    }
+    char *t;
+    int  len;
+    int  pos;
+    int  total;
+    char *buffer;
+    bool finished;
+    int  chunk_size;
 
-    void onExit(QEvent *)
-    {
-        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-    }
+    qint64 readData(char *data, qint64 maxlen);
+    qint64 writeData(const char *data, qint64 len);
 
 private:
-    QObject *m_tank;
-
+    int putShort(char *t, unsigned int value);
+    int putLong(char *t, unsigned int value);
+    int fillData(char *start, int frequency, int seconds);
 };
 
-class SpinAiWithError: public QObject, public Plugin
+class AudioTest : public QMainWindow
 {
     Q_OBJECT
-    Q_INTERFACES(Plugin)
 public:
-    SpinAiWithError() { setObjectName("Spin and destroy with runtime error in state machine"); }
+    AudioTest();
+    ~AudioTest();
+
+    QAudioDeviceId  device;
+    Generator*        gen;
+    QAudioOutput*     audioOutput;
+    QIODevice*        output;
+    QTimer*           timer;
+    QAudioFormat      settings;
+
+    bool              pullMode;
+    char*             buffer;
+
+    QPushButton*      button;
+    QPushButton*      button2;
+    QComboBox*     deviceBox;
 
-    virtual QState *create(QState *parentState, QObject *tank);
+private slots:
+    void status();
+    void writeMore();
+    void toggle();
+    void togglePlay();
+    void state(QAudio::State s);
+    void deviceChanged(int idx);
 };
 
-#endif
diff --git a/examples/multimedia/audio/audiooutput/audiooutput.pro b/examples/multimedia/audio/audiooutput/audiooutput.pro
new file mode 100644
index 0000000..08f43ce
--- /dev/null
+++ b/examples/multimedia/audio/audiooutput/audiooutput.pro
@@ -0,0 +1,11 @@
+HEADERS       = audiooutput.h
+SOURCES       = audiooutput.cpp \
+                main.cpp
+
+QT           += multimedia
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput
+sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiooutput.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput
+INSTALLS += target sources
diff --git a/examples/animation/sub-attaq/main.cpp b/examples/multimedia/audio/audiooutput/main.cpp
index 4f6f4f9..fc319bd 100644
--- a/examples/animation/sub-attaq/main.cpp
+++ b/examples/multimedia/audio/audiooutput/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,19 +39,18 @@
 **
 ****************************************************************************/
 
+
 #include <QtGui>
 
-#include "mainwindow.h"
+#include "audiooutput.h"
 
-int main(int argc, char *argv[])
+int main(int argv, char **args)
 {
-    QApplication app(argc, argv);
-    Q_INIT_RESOURCE(subattaq);
-
-    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+    QApplication app(argv, args);
+    app.setApplicationName("Audio Output Test");
 
-    MainWindow w;
-    w.show();
+    AudioTest audio;
+    audio.show();
 
     return app.exec();
 }
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
new file mode 100644
index 0000000..ac78b15
--- /dev/null
+++ b/examples/multimedia/multimedia.pro
@@ -0,0 +1,8 @@
+TEMPLATE      = subdirs
+SUBDIRS       = audio
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multimedia.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia
+INSTALLS += target sources
diff --git a/examples/network/network.pro b/examples/network/network.pro
index 8c45745..adf998f 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -2,7 +2,6 @@ TEMPLATE      = subdirs
 SUBDIRS       = blockingfortuneclient \
  		broadcastreceiver \
                 broadcastsender \
-                network-chat \
 		download \
 		downloadmanager \
                 fortuneclient \
@@ -14,6 +13,9 @@ SUBDIRS       = blockingfortuneclient \
                 googlesuggest \
  		torrent
 
+# no QProcess
+!vxworks:!qnx:SUBDIRS += network-chat
+
 contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
 
 # install
diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro
index 76c9e82..98b9bd1 100644
--- a/examples/painting/painterpaths/painterpaths.pro
+++ b/examples/painting/painterpaths/painterpaths.pro
@@ -3,7 +3,7 @@ HEADERS       = renderarea.h \
 SOURCES       = main.cpp \
                 renderarea.cpp \
                 window.cpp
-unix:!mac:LIBS += -lm
+unix:!mac:!vxworks:LIBS += -lm
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp
index af2b637..a587b07 100644
--- a/examples/phonon/musicplayer/mainwindow.cpp
+++ b/examples/phonon/musicplayer/mainwindow.cpp
@@ -157,9 +157,12 @@ void MainWindow::tableClicked(int row, int /* column */)
     mediaObject->stop();
     mediaObject->clearQueue();
 
+    if (row >= sources.size())
+        return;
+
     mediaObject->setCurrentSource(sources[row]);
 
-    if (wasPlaying) 
+    if (wasPlaying)
         mediaObject->play();
     else
         mediaObject->stop();
diff --git a/examples/qws/qws.pro b/examples/qws/qws.pro
index fb3c3c7..95e1b44 100644
--- a/examples/qws/qws.pro
+++ b/examples/qws/qws.pro
@@ -1,5 +1,7 @@
 TEMPLATE      = subdirs
-SUBDIRS       = framebuffer mousecalibration simpledecoration
+# no /dev/fbX
+!qnx:!vxworks:SUBDIRS = framebuffer
+SUBDIRS      += mousecalibration simpledecoration
 
 # install
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/examples/script/calculator/calculator.js b/examples/script/calculator/calculator.js
index 62c2cba..ac3c1b6 100644
--- a/examples/script/calculator/calculator.js
+++ b/examples/script/calculator/calculator.js
@@ -1,10 +1,19 @@
+Function.prototype.bind = function() {
+    var func = this;
+    var thisObject = arguments[0];
+    var args = Array.prototype.slice.call(arguments, 1);
+    return function() {
+        return func.apply(thisObject, args);
+    }
+}
+
 //! [0]
 function Calculator(ui)
 {
     this.ui = ui;
 
-    this.pendingAdditiveOperator = "";
-    this.pendingMultiplicativeOperator = "";
+    this.pendingAdditiveOperator = Calculator.NO_OPERATOR;
+    this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
     this.sumInMemory = 0;
     this.sumSoFar = 0;
     this.factorSoFar = 0;
@@ -13,16 +22,16 @@ function Calculator(ui)
     with (ui) {
         display.text = "0";
 
-        zeroButton.clicked.connect(this, this.digitClicked);
-        oneButton.clicked.connect(this, "digitClicked");
-        twoButton.clicked.connect(this, "digitClicked");
-        threeButton.clicked.connect(this, "digitClicked");
-        fourButton.clicked.connect(this, "digitClicked");
-        fiveButton.clicked.connect(this, "digitClicked");
-        sixButton.clicked.connect(this, "digitClicked");
-        sevenButton.clicked.connect(this, "digitClicked");
-        eightButton.clicked.connect(this, "digitClicked");
-        nineButton.clicked.connect(this, "digitClicked");
+        zeroButton.clicked.connect(this.digitClicked.bind(this, 0));
+        oneButton.clicked.connect(this.digitClicked.bind(this, 1));
+        twoButton.clicked.connect(this.digitClicked.bind(this, 2));
+        threeButton.clicked.connect(this.digitClicked.bind(this, 3));
+        fourButton.clicked.connect(this.digitClicked.bind(this, 4));
+        fiveButton.clicked.connect(this.digitClicked.bind(this, 5));
+        sixButton.clicked.connect(this.digitClicked.bind(this, 6));
+        sevenButton.clicked.connect(this.digitClicked.bind(this, 7));
+        eightButton.clicked.connect(this.digitClicked.bind(this, 8));
+        nineButton.clicked.connect(this.digitClicked.bind(this, 9));
 
         pointButton.clicked.connect(this, "pointClicked");
         changeSignButton.clicked.connect(this, "changeSignClicked");
@@ -36,19 +45,28 @@ function Calculator(ui)
         setMemoryButton.clicked.connect(this, "setMemory");
         addToMemoryButton.clicked.connect(this, "addToMemory");
   
-        divisionButton.clicked.connect(this, "multiplicativeOperatorClicked");
-        timesButton.clicked.connect(this, "multiplicativeOperatorClicked");
-        minusButton.clicked.connect(this, "additiveOperatorClicked");
-        plusButton.clicked.connect(this, "additiveOperatorClicked");
-
-        squareRootButton.clicked.connect(this, "unaryOperatorClicked");
-        powerButton.clicked.connect(this, "unaryOperatorClicked");
-        reciprocalButton.clicked.connect(this, "unaryOperatorClicked");
+        divisionButton.clicked.connect(this.multiplicativeOperatorClicked.bind(this, Calculator.DIVISION_OPERATOR));
+        timesButton.clicked.connect(this.multiplicativeOperatorClicked.bind(this, Calculator.TIMES_OPERATOR));
+        minusButton.clicked.connect(this.additiveOperatorClicked.bind(this, Calculator.MINUS_OPERATOR));
+        plusButton.clicked.connect(this.additiveOperatorClicked.bind(this, Calculator.PLUS_OPERATOR));
+
+        squareRootButton.clicked.connect(this.unaryOperatorClicked.bind(this, Calculator.SQUARE_OPERATOR));
+        powerButton.clicked.connect(this.unaryOperatorClicked.bind(this, Calculator.POWER_OPERATOR));
+        reciprocalButton.clicked.connect(this.unaryOperatorClicked.bind(this, Calculator.RECIPROCAL_OPERATOR));
         equalButton.clicked.connect(this, "equalClicked");
     }
 }
 //! [0]
 
+Calculator.NO_OPERATOR = 0;
+Calculator.SQUARE_OPERATOR = 1;
+Calculator.POWER_OPERATOR = 2;
+Calculator.RECIPROCAL_OPERATOR = 3;
+Calculator.DIVISION_OPERATOR = 4;
+Calculator.TIMES_OPERATOR = 5;
+Calculator.MINUS_OPERATOR = 6;
+Calculator.PLUS_OPERATOR = 7;
+
 Calculator.prototype.abortOperation = function()
 {
     this.clearAll();
@@ -57,24 +75,23 @@ Calculator.prototype.abortOperation = function()
 
 Calculator.prototype.calculate = function(rightOperand, pendingOperator)
 {
-    if (pendingOperator == "+") {
+    if (pendingOperator == Calculator.PLUS_OPERATOR) {
         this.sumSoFar += rightOperand;
-    } else if (pendingOperator == "-") {
+    } else if (pendingOperator == Calculator.MINUS_OPERATOR) {
         this.sumSoFar -= rightOperand;
-    } else if (pendingOperator == "*") {
+    } else if (pendingOperator == Calculator.TIMES_OPERATOR) {
         this.factorSoFar *= rightOperand;
-    } else if (pendingOperator == "/") {
+    } else if (pendingOperator == Calculator.DIVISION_OPERATOR) {
         if (rightOperand == 0)
-        return false;
+            return false;
         this.factorSoFar /= rightOperand;
     }
     return true;
 }
 
 //! [1]
-Calculator.prototype.digitClicked = function()
+Calculator.prototype.digitClicked = function(digitValue)
 {
-    var digitValue = __qt_sender__.text - 0;
     if ((digitValue == 0) && (this.ui.display.text == "0"))
         return;
     if (this.waitingForOperand) {
@@ -85,19 +102,19 @@ Calculator.prototype.digitClicked = function()
 }
 //! [1]
 
-Calculator.prototype.unaryOperatorClicked = function()
+Calculator.prototype.unaryOperatorClicked = function(op)
 {
     var operand = this.ui.display.text - 0;
     var result = 0;
-    if (__qt_sender__.text == "Sqrt") {
+    if (op == Calculator.SQUARE_OPERATOR) {
         if (operand < 0) {
             this.abortOperation();
             return;
         }
         result = Math.sqrt(operand);
-    } else if (__qt_sender__.text == "x^2") {
+    } else if (op == Calculator.POWER_OPERATOR) {
         result = Math.pow(operand, 2);
-    } else if (__qt_sender__.text == "1/x") {
+    } else if (op == Calculator.RECIPROCAL_OPERATOR) {
         if (operand == 0.0) {
             this.abortOperation();
             return;
@@ -108,11 +125,11 @@ Calculator.prototype.unaryOperatorClicked = function()
     this.waitingForOperand = true;
 }
 
-Calculator.prototype.additiveOperatorClicked = function()
+Calculator.prototype.additiveOperatorClicked = function(op)
 {
     var operand = this.ui.display.text - 0;
 
-    if (this.pendingMultiplicativeOperator.length != 0) {
+    if (this.pendingMultiplicativeOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
             return;
@@ -120,10 +137,10 @@ Calculator.prototype.additiveOperatorClicked = function()
         this.ui.display.text = this.factorSoFar + "";
         operand = this.factorSoFar;
         this.factorSoFar = 0;
-        this.pendingMultiplicativeOperator = "";
+        this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
     }
 
-    if (this.pendingAdditiveOperator.length != 0) {
+    if (this.pendingAdditiveOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingAdditiveOperator)) {
             this.abortOperation();
             return;
@@ -133,15 +150,15 @@ Calculator.prototype.additiveOperatorClicked = function()
         this.sumSoFar = operand;
     }
 
-    this.pendingAdditiveOperator = __qt_sender__.text;
+    this.pendingAdditiveOperator = op;
     this.waitingForOperand = true;
 }
 
-Calculator.prototype.multiplicativeOperatorClicked = function()
+Calculator.prototype.multiplicativeOperatorClicked = function(op)
 {
     var operand = this.ui.display.text - 0;
 
-    if (this.pendingMultiplicativeOperator.length != 0) {
+    if (this.pendingMultiplicativeOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
             return;
@@ -151,7 +168,7 @@ Calculator.prototype.multiplicativeOperatorClicked = function()
         this.factorSoFar = operand;
     }
 
-    this.pendingMultiplicativeOperator = __qt_sender__.text;
+    this.pendingMultiplicativeOperator = op;
     this.waitingForOperand = true;
 }
 
@@ -159,21 +176,21 @@ Calculator.prototype.equalClicked = function()
 {
     var operand = this.ui.display.text - 0;
 
-    if (this.pendingMultiplicativeOperator.length != 0) {
+    if (this.pendingMultiplicativeOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
             return;
         }
         operand = this.factorSoFar;
         this.factorSoFar = 0.0;
-        this.pendingMultiplicativeOperator = "";
+        this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
     }
-    if (this.pendingAdditiveOperator.length != 0) {
+    if (this.pendingAdditiveOperator != Calculator.NO_OPERATOR) {
         if (!this.calculate(operand, this.pendingAdditiveOperator)) {
             this.abortOperation();
             return;
         }
-        this.pendingAdditiveOperator = "";
+        this.pendingAdditiveOperator = Calculator.NO_OPERATOR;
     } else {
         this.sumSoFar = operand;
     }
@@ -234,8 +251,8 @@ Calculator.prototype.clearAll = function()
 {
     this.sumSoFar = 0.0;
     this.factorSoFar = 0.0;
-    this.pendingAdditiveOperator = "";
-    this.pendingMultiplicativeOperator = "";
+    this.pendingAdditiveOperator = Calculator.NO_OPERATOR;
+    this.pendingMultiplicativeOperator = Calculator.NO_OPERATOR;
     this.ui.display.text = "0";
     this.waitingForOperand = true;
 }
diff --git a/examples/script/customclass/bytearrayclass.cpp b/examples/script/customclass/bytearrayclass.cpp
index 81a0b8a..8fe1a96 100644
--- a/examples/script/customclass/bytearrayclass.cpp
+++ b/examples/script/customclass/bytearrayclass.cpp
@@ -100,7 +100,7 @@ ByteArrayClass::ByteArrayClass(QScriptEngine *engine)
     QScriptValue global = engine->globalObject();
     proto.setPrototype(global.property("Object").property("prototype"));
 
-    ctor = engine->newFunction(construct);
+    ctor = engine->newFunction(construct, proto);
     ctor.setData(qScriptValueFromValue(engine, this));
 }
 //! [0]
@@ -224,7 +224,10 @@ QScriptValue ByteArrayClass::construct(QScriptContext *ctx, QScriptEngine *)
     ByteArrayClass *cls = qscriptvalue_cast<ByteArrayClass*>(ctx->callee().data());
     if (!cls)
         return QScriptValue();
-    int size = ctx->argument(0).toInt32();
+    QScriptValue arg = ctx->argument(0);
+    if (arg.instanceOf(ctx->callee()))
+        return cls->newInstance(qscriptvalue_cast<QByteArray>(arg));
+    int size = arg.toInt32();
     return cls->newInstance(size);
 }
 //! [2]
@@ -240,7 +243,7 @@ QScriptValue ByteArrayClass::toScriptValue(QScriptEngine *eng, const QByteArray
 
 void ByteArrayClass::fromScriptValue(const QScriptValue &obj, QByteArray &ba)
 {
-    ba = qscriptvalue_cast<QByteArray>(obj.data());
+    ba = qvariant_cast<QByteArray>(obj.data().toVariant());
 }
 
 
@@ -294,7 +297,7 @@ void ByteArrayClassPropertyIterator::toBack()
 
 QScriptString ByteArrayClassPropertyIterator::name() const
 {
-    return QScriptString();
+    return object().engine()->toStringHandle(QString::number(m_last));
 }
 
 uint ByteArrayClassPropertyIterator::id() const
diff --git a/examples/script/customclass/main.cpp b/examples/script/customclass/main.cpp
index 05aefd5..3b98f5c 100644
--- a/examples/script/customclass/main.cpp
+++ b/examples/script/customclass/main.cpp
@@ -52,6 +52,7 @@ int main(int argc, char **argv)
     eng.globalObject().setProperty("ByteArray", baClass->constructor());
 
     qDebug() << "ba = new ByteArray(4):" << eng.evaluate("ba = new ByteArray(4)").toString();
+    qDebug() << "ba instanceof ByteArray:" << eng.evaluate("ba instanceof ByteArray").toBool();
     qDebug() << "ba.length:" << eng.evaluate("ba.length").toNumber();
     qDebug() << "ba[1] = 123; ba[1]:" << eng.evaluate("ba[1] = 123; ba[1]").toNumber();
     qDebug() << "ba[7] = 224; ba.length:" << eng.evaluate("ba[7] = 224; ba.length").toNumber();
@@ -65,6 +66,9 @@ int main(int argc, char **argv)
     qDebug() << "ba.toBase64().toLatin1String():" << eng.evaluate("b64.toLatin1String()").toString();
     qDebug() << "ba.valueOf():" << eng.evaluate("ba.valueOf()").toString();
     qDebug() << "ba.chop(2); ba.length:" << eng.evaluate("ba.chop(2); ba.length").toNumber();
+    qDebug() << "ba2 = new ByteArray(ba):" << eng.evaluate("ba2 = new ByteArray(ba)").toString();
+    qDebug() << "ba2.equals(ba):" << eng.evaluate("ba2.equals(ba)").toBool();
+    qDebug() << "ba2.equals(new ByteArray()):" << eng.evaluate("ba2.equals(new ByteArray())").toBool();
 
     return 0;
 }
diff --git a/examples/animation/sub-attaq/mainwindow.h b/examples/statemachine/rogue/main.cpp
index 08cfcd9..0c2fb2d 100644
--- a/examples/animation/sub-attaq/mainwindow.h
+++ b/examples/statemachine/rogue/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,26 +39,17 @@
 **
 ****************************************************************************/
 
-#ifndef __MAINWINDOW__H__
-#define __MAINWINDOW__H__
+#include <QtGui>
 
-//Qt
-#include <QtGui/QMainWindow>
-class GraphicsScene;
-QT_BEGIN_NAMESPACE
-class QGraphicsView;
-QT_END_NAMESPACE
+#include "window.h"
 
-class MainWindow : public QMainWindow
+int main(int argv, char **args)
 {
-Q_OBJECT
-public:
-    MainWindow();
-    ~MainWindow();
+    QApplication app(argv, args);
 
-private:
-    GraphicsScene *scene;
-    QGraphicsView *view;
-};
+    Window window;
+    window.show();
+
+    return app.exec();
+}
 
-#endif //__MAINWINDOW__H__
diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h b/examples/statemachine/rogue/movementtransition.h
index 4c3fc0f..929077d 100644
--- a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h
+++ b/examples/statemachine/rogue/movementtransition.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,67 +39,70 @@
 **
 ****************************************************************************/
 
-#ifndef RANDOM_AI_PLUGIN_H
-#define RANDOM_AI_PLUGIN_H
+#ifndef MOVEMENTTRANSITION_H
+#define MOVEMENTTRANSITION_H
 
-#include <QObject>
-#include <QState>
+#include <QtGui>
 
-#include <tankgame/plugin.h>
+#include "window.h"
 
-class SelectActionState: public QState
+//![0]
+class MovementTransition : public QEventTransition
 {
     Q_OBJECT
+
 public:
-    SelectActionState(QState *parent = 0) : QState(parent)
-    {
+    MovementTransition(Window *window) :
+        QEventTransition(window, QEvent::KeyPress) {
+        this->window = window;
     }
+//![0]
 
-signals:
-    void fireSelected();
-    void moveForwardsSelected();
-    void moveBackwardsSelected();
-    void turnSelected();
-
+//![1]
 protected:
-    void onEntry(QEvent *)
-    {
-        int rand = qrand() % 4;
-        switch (rand) {
-        case 0: emit fireSelected(); break;
-        case 1: emit moveForwardsSelected(); break;
-        case 2: emit moveBackwardsSelected(); break;
-        case 3: emit turnSelected(); break;
-        };
-    }
-};
+    bool eventTest(QEvent *event) {
+        if (event->type() == QEvent::Wrapped &&
+            static_cast<QWrappedEvent *>(event)->event()->type() == QEvent::KeyPress) {
+            QEvent *wrappedEvent = static_cast<QWrappedEvent *>(event)->event();
 
-class RandomDistanceState: public QState
-{
-    Q_OBJECT
-public:
-    RandomDistanceState(QState *parent = 0) : QState(parent)
-    {
+            QKeyEvent *keyEvent = static_cast<QKeyEvent *>(wrappedEvent);
+            int key = keyEvent->key();
+
+            return key == Qt::Key_2 || key == Qt::Key_8 || key == Qt::Key_6 ||
+                   key == Qt::Key_4;
+        }
+        return false;
     }
+//![1]
 
-signals:
-    void distanceComputed(qreal distance);
+//![2]
+    void onTransition(QEvent *event) {
+        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(
+            static_cast<QWrappedEvent *>(event)->event());
 
-protected:
-    void onEntry(QEvent *)
-    {
-        emit distanceComputed(qreal(qrand() % 180));
+        int key = keyEvent->key();
+        switch (key) {
+            case Qt::Key_4:
+                window->movePlayer(Window::Left);
+                break;
+            case Qt::Key_8:
+                window->movePlayer(Window::Up);
+                break;
+            case Qt::Key_6:
+                window->movePlayer(Window::Right);
+                break;
+            case Qt::Key_2:
+                window->movePlayer(Window::Down);
+                break;
+            default:
+                ;
+        }
     }
-};
+//![2]
 
-class RandomAiPlugin: public QObject, public Plugin
-{
-    Q_OBJECT
-    Q_INTERFACES(Plugin)
-public:
-    RandomAiPlugin() { setObjectName("Random"); }
-
-    virtual QState *create(QState *parentState, QObject *tank);
+private:
+    Window *window;
 };
 
-#endif // RANDOM_AI_PLUGIN_H
+#endif
+
diff --git a/examples/statemachine/rogue/rogue.pro b/examples/statemachine/rogue/rogue.pro
new file mode 100644
index 0000000..1571854
--- /dev/null
+++ b/examples/statemachine/rogue/rogue.pro
@@ -0,0 +1,11 @@
+HEADERS       = window.h \
+                movementtransition.h
+SOURCES       = main.cpp \
+                window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/rogue
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/rogue
+INSTALLS += target sources
+
diff --git a/examples/statemachine/rogue/window.cpp b/examples/statemachine/rogue/window.cpp
new file mode 100644
index 0000000..39565a3
--- /dev/null
+++ b/examples/statemachine/rogue/window.cpp
@@ -0,0 +1,201 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "window.h"
+#include "movementtransition.h"
+
+//![0]
+Window::Window()
+{
+    pX = 5;
+    pY = 5;
+//![0]
+
+    QFontDatabase database;
+    QFont font;
+    if (database.families().contains("Monospace"))
+        font = QFont("Monospace", 12);
+    else {
+        foreach (QString family, database.families()) {
+            if (database.isFixedPitch(family)) {
+                font = QFont(family, 12);
+                break;
+            }
+        }
+    }
+    setFont(font);
+
+//![1]
+    setupMap();
+    buildMachine();
+}
+//![1]
+
+void Window::setStatus(const QString &status)
+{
+    myStatus = status;
+    repaint();
+}
+
+QString Window::status() const
+{
+    return myStatus;
+}
+
+void Window::paintEvent(QPaintEvent * /* event */)
+{
+    QFontMetrics metrics(font());
+    QPainter painter(this);
+    int fontHeight = metrics.height();
+    int fontWidth = metrics.width('X');
+    int yPos = fontHeight;
+    int xPos;
+
+    painter.fillRect(rect(), Qt::black);
+    painter.setPen(Qt::white);
+
+    painter.drawText(QPoint(0, yPos), status());
+    
+    for (int y = 0; y < HEIGHT; ++y) {
+        yPos += fontHeight;
+        xPos = 0;
+
+        for (int x = 0; x < WIDTH; ++x) {
+            if (y == pY && x == pX) {
+                xPos += fontWidth;
+                continue;
+            }
+
+            painter.drawText(QPoint(xPos, yPos), map[x][y]);
+            xPos += fontWidth;
+        }
+    }
+    painter.drawText(QPoint(pX * fontWidth, (pY + 2) * fontHeight), QChar('@'));
+}
+
+QSize Window::sizeHint() const
+{
+    QFontMetrics metrics(font());
+
+    return QSize(metrics.width('X') * WIDTH, metrics.height() * (HEIGHT + 1));
+}
+
+//![2]
+void Window::buildMachine()
+{
+    machine = new QStateMachine;
+
+    QState *inputState = new QState(machine);
+    inputState->assignProperty(this, "status", "Move the rogue with 2, 4, 6, and 8");
+
+    MovementTransition *transition = new MovementTransition(this);
+    inputState->addTransition(transition);
+//![2]
+
+//![3]
+    QState *quitState = new QState(machine);
+    quitState->assignProperty(this, "status", "Really quit(y/n)?"); 
+
+    QKeyEventTransition *yesTransition = new
+        QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Y);
+    yesTransition->setTargetState(new QFinalState(machine));
+    quitState->addTransition(yesTransition);
+
+    QKeyEventTransition *noTransition =
+        new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_N);
+    noTransition->setTargetState(inputState);
+    quitState->addTransition(noTransition);
+//![3]
+
+//![4]
+    QKeyEventTransition *quitTransition =
+        new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Q);
+    quitTransition->setTargetState(quitState);
+    inputState->addTransition(quitTransition);
+//![4]
+
+//![5]
+    machine->setInitialState(inputState);
+
+    connect(machine, SIGNAL(finished()), qApp, SLOT(quit()));
+
+    machine->start();
+}
+//![5]
+
+void Window::movePlayer(Direction direction)
+{
+    switch (direction) {
+        case Left:
+            if (map[pX - 1][pY] != '#')
+                --pX;            
+            break;
+        case Right:
+            if (map[pX + 1][pY] != '#')
+                ++pX;
+            break;
+        case Up:
+            if (map[pX][pY - 1] != '#')
+                --pY;
+            break;
+        case Down:
+            if (map[pX][pY + 1] != '#')
+                ++pY;
+            break;        
+    }
+    repaint();
+}
+
+void Window::setupMap()
+{
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+
+    for (int x = 0; x < WIDTH; ++x)
+        for (int y = 0; y < HEIGHT; ++y) {
+        if (x == 0 || x == WIDTH - 1 || y == 0 || y == HEIGHT - 1 || qrand() % 40 == 0)
+            map[x][y] = '#';
+        else
+            map[x][y] = '.';
+    }
+}
+
diff --git a/examples/statemachine/tankgame/gameitem.h b/examples/statemachine/rogue/window.h
index af012bb..bcd86bd 100644
--- a/examples/statemachine/tankgame/gameitem.h
+++ b/examples/statemachine/rogue/window.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,28 +39,51 @@
 **
 ****************************************************************************/
 
-#ifndef GAMEITEM_H
-#define GAMEITEM_H
+#ifndef WINDOW_H
+#define WINDOW_H
 
-#include <QGraphicsItem>
+#include <QWidget>
 
-QT_BEGIN_NAMESPACE
-class QLineF;
-QT_END_NAMESPACE
-class GameItem: public QObject, public QGraphicsItem
+class QState;
+class QStateMachine;
+class QTransition;
+
+#define WIDTH 35
+#define HEIGHT 20
+
+//![0]
+class Window : public QWidget
 {
     Q_OBJECT
+    Q_PROPERTY(QString status READ status WRITE setStatus)
+
 public:
-    enum { Type = UserType + 1 };
-    int type() const { return Type; }
+    enum Direction { Up, Down, Left, Right };
+
+    Window();
 
-    GameItem(QObject *parent = 0);
+    void movePlayer(Direction direction);
+    void setStatus(const QString &status);
+    QString status() const;
 
-    virtual void idle(qreal elapsed) = 0;
+    QSize sizeHint() const;
 
 protected:
-    QPointF tryMove(const QPointF &requestedPosition, QLineF *collidedLine = 0, 
-        QGraphicsItem **collidedItem = 0) const;
+    void paintEvent(QPaintEvent *event);
+//![0]
+
+//![1]
+private:
+    void buildMachine();
+    void setupMap();
+
+    QChar map[WIDTH][HEIGHT];
+    int pX, pY;
+
+    QStateMachine *machine;
+    QString myStatus;
 };
+//![1]
 
 #endif
+
diff --git a/examples/statemachine/statemachine.pro b/examples/statemachine/statemachine.pro
index 5074a3c..298c0ae 100644
--- a/examples/statemachine/statemachine.pro
+++ b/examples/statemachine/statemachine.pro
@@ -3,10 +3,9 @@ SUBDIRS       = \
                 eventtransitions \
                 factorial \
                 pingpong \
+                rogue \
                 trafficlight \
-                twowaybutton \
-                tankgame \
-                tankgameplugins
+                twowaybutton
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/statemachine
diff --git a/examples/statemachine/tankgame/gameitem.cpp b/examples/statemachine/tankgame/gameitem.cpp
deleted file mode 100644
index 94affb4..0000000
--- a/examples/statemachine/tankgame/gameitem.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "gameitem.h"
-
-#include <QGraphicsScene>
-#include <QDebug>
-
-GameItem::GameItem(QObject *parent) : QObject(parent)
-{
-}
-
-QPointF GameItem::tryMove(const QPointF &requestedPosition, QLineF *collidedLine, 
-                          QGraphicsItem **collidedItem) const
-{
-    QLineF movementPath(pos(), requestedPosition);    
-
-    qreal cannonLength = 0.0;
-    {
-        QPointF p1 = boundingRect().center();
-        QPointF p2 = QPointF(boundingRect().right() + 10.0, p1.y());
-
-        cannonLength = QLineF(mapToScene(p1), mapToScene(p2)).length();
-    }
-
-    movementPath.setLength(movementPath.length() + cannonLength);
-
-    QRectF boundingRectPath(QPointF(qMin(movementPath.x1(), movementPath.x2()), qMin(movementPath.y1(), movementPath.y2())),
-                            QPointF(qMax(movementPath.x1(), movementPath.x2()), qMax(movementPath.y1(), movementPath.y2())));
-
-    QList<QGraphicsItem *> itemsInRect = scene()->items(boundingRectPath, Qt::IntersectsItemBoundingRect);
-
-    QPointF nextPoint = requestedPosition;
-    QRectF sceneRect = scene()->sceneRect();
-
-    foreach (QGraphicsItem *item, itemsInRect) {
-        if (item == static_cast<const QGraphicsItem *>(this))
-            continue; 
-
-        QPolygonF mappedBoundingRect = item->mapToScene(item->boundingRect());
-        for (int i=0; i<mappedBoundingRect.size(); ++i) {
-            QPointF p1 = mappedBoundingRect.at(i == 0 ? mappedBoundingRect.size()-1 : i-1);
-            QPointF p2 = mappedBoundingRect.at(i);
-
-            QLineF rectLine(p1, p2);
-            QPointF intersectionPoint;
-            QLineF::IntersectType intersectType = movementPath.intersect(rectLine, &intersectionPoint);
-
-            if (intersectType == QLineF::BoundedIntersection) {
-                movementPath.setP2(intersectionPoint);
-                movementPath.setLength(movementPath.length() - cannonLength);
-                nextPoint = movementPath.p2();
-
-                if (collidedLine != 0)
-                    *collidedLine = rectLine;
-
-                if (collidedItem != 0)
-                    *collidedItem = item;
-            }
-        }
-    }
-
-
-    // Don't go outside of map
-    if (nextPoint.x() < sceneRect.left()) {
-        nextPoint.rx() = sceneRect.left();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().topLeft(), scene()->sceneRect().bottomLeft());
-    }
-    
-    if (nextPoint.x() > sceneRect.right()) {
-        nextPoint.rx() = sceneRect.right();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().topRight(), scene()->sceneRect().bottomRight());        
-    }
-    
-    if (nextPoint.y() < sceneRect.top()) {
-        nextPoint.ry() = sceneRect.top();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().topLeft(), scene()->sceneRect().topRight());
-    }
-    
-    if (nextPoint.y() > sceneRect.bottom()) {
-        nextPoint.ry() = sceneRect.bottom();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().bottomLeft(), scene()->sceneRect().bottomRight());
-    }
-
-    return nextPoint;
-}
-
diff --git a/examples/statemachine/tankgame/mainwindow.cpp b/examples/statemachine/tankgame/mainwindow.cpp
deleted file mode 100644
index 596cdfe..0000000
--- a/examples/statemachine/tankgame/mainwindow.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mainwindow.h"
-#include "tankitem.h"
-#include "rocketitem.h"
-#include "plugin.h"
-#include "gameovertransition.h"
-
-#include <QStateMachine>
-#include <QGraphicsView>
-#include <QAction>
-#include <QMenuBar>
-#include <QState>
-#include <QHistoryState>
-#include <QTimer>
-#include <QFileDialog>
-#include <QPluginLoader>
-#include <QApplication>
-#include <QInputDialog>
-#include <QMessageBox>
-
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent), m_scene(0), m_machine(0), m_runningState(0), m_started(false)
-{
-    init();
-}
-
-MainWindow::~MainWindow()
-{
-}
-
-void MainWindow::addWall(const QRectF &wall)
-{
-    QGraphicsRectItem *item = new QGraphicsRectItem;
-    item->setRect(wall);
-    item->setBrush(Qt::darkGreen);
-    item->setPen(QPen(Qt::black, 0));
-
-    m_scene->addItem(item);
-}
-
-void MainWindow::init()
-{
-    setWindowTitle("Pluggable Tank Game");
-
-    QGraphicsView *view = new QGraphicsView(this);
-    view->setRenderHints(QPainter::Antialiasing);
-    setCentralWidget(view);
-
-    m_scene = new QGraphicsScene(this);
-    view->setScene(m_scene);
-
-    QRectF sceneRect = QRectF(-200.0, -200.0, 400.0, 400.0);
-    m_scene->setSceneRect(sceneRect);
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().topLeft() + QPointF(30.0, 30.0));
-        item->setDirection(45.0);
-        item->setColor(Qt::red);
-
-        m_spawns.append(item);
-    }
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().topRight() + QPointF(-30.0, 30.0));
-        item->setDirection(135.0);
-        item->setColor(Qt::green);
-
-        m_spawns.append(item);
-    }
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().bottomRight() + QPointF(-30.0, -30.0));
-        item->setDirection(225.0);
-        item->setColor(Qt::blue);
-
-        m_spawns.append(item);
-    }
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().bottomLeft() + QPointF(30.0, -30.0));
-        item->setDirection(315.0);
-        item->setColor(Qt::yellow);
-
-        m_spawns.append(item);
-    }
-
-    QPointF centerOfMap = sceneRect.center();
-
-    addWall(QRectF(centerOfMap + QPointF(-50.0, -60.0), centerOfMap + QPointF(50.0, -50.0)));
-    addWall(QRectF(centerOfMap - QPointF(-50.0, -60.0), centerOfMap - QPointF(50.0, -50.0)));
-    addWall(QRectF(centerOfMap + QPointF(-50.0, -50.0), centerOfMap + QPointF(-40.0, 50.0)));
-    addWall(QRectF(centerOfMap - QPointF(-50.0, -50.0), centerOfMap - QPointF(-40.0, 50.0)));
-
-    addWall(QRectF(sceneRect.topLeft() + QPointF(sceneRect.width() / 2.0 - 5.0, -10.0),
-                   sceneRect.topLeft() + QPointF(sceneRect.width() / 2.0 + 5.0, 100.0)));
-    addWall(QRectF(sceneRect.bottomLeft() + QPointF(sceneRect.width() / 2.0 - 5.0, 10.0),
-                   sceneRect.bottomLeft() + QPointF(sceneRect.width() / 2.0 + 5.0, -100.0)));
-    addWall(QRectF(sceneRect.topLeft() + QPointF(-10.0, sceneRect.height() / 2.0 - 5.0),
-                   sceneRect.topLeft() + QPointF(100.0, sceneRect.height() / 2.0 + 5.0)));
-    addWall(QRectF(sceneRect.topRight() + QPointF(10.0, sceneRect.height() / 2.0 - 5.0),
-                   sceneRect.topRight() + QPointF(-100.0, sceneRect.height() / 2.0 + 5.0)));
-
-
-    QAction *addTankAction = menuBar()->addAction("&Add tank");
-    QAction *runGameAction = menuBar()->addAction("&Run game");
-    runGameAction->setObjectName("runGameAction");
-    QAction *stopGameAction = menuBar()->addAction("&Stop game");
-    menuBar()->addSeparator();
-    QAction *quitAction = menuBar()->addAction("&Quit");
-
-    connect(addTankAction, SIGNAL(triggered()), this, SLOT(addTank()));
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-
-    m_machine = new QStateMachine(this);
-    QState *stoppedState = new QState(m_machine);
-    stoppedState->setObjectName("stoppedState");
-    stoppedState->assignProperty(runGameAction, "enabled", true);
-    stoppedState->assignProperty(stopGameAction, "enabled", false);
-    stoppedState->assignProperty(this, "started", false);
-    m_machine->setInitialState(stoppedState);
-
-//! [5]
-    QState *spawnsAvailable = new QState(stoppedState);
-    spawnsAvailable->assignProperty(addTankAction, "enabled", true);
-
-    QState *noSpawnsAvailable = new QState(stoppedState);
-    noSpawnsAvailable->assignProperty(addTankAction, "enabled", false);
-//! [5]
-    spawnsAvailable->setObjectName("spawnsAvailable");
-    noSpawnsAvailable->setObjectName("noSpawnsAvailable");
-
-    spawnsAvailable->addTransition(this, SIGNAL(mapFull()), noSpawnsAvailable);
-
-//! [3]
-    QHistoryState *hs = new QHistoryState(stoppedState);
-    hs->setDefaultState(spawnsAvailable);
-//! [3]
-    hs->setObjectName("hs");
-
-    stoppedState->setInitialState(hs);
-
-//! [0]
-    m_runningState = new QState(QState::ParallelStates, m_machine);
-//! [0]
-    m_runningState->setObjectName("runningState");
-    m_runningState->assignProperty(addTankAction, "enabled", false);
-    m_runningState->assignProperty(runGameAction, "enabled", false);
-    m_runningState->assignProperty(stopGameAction, "enabled", true);
-
-    QState *gameOverState = new QState(m_machine);
-    gameOverState->setObjectName("gameOverState");
-    gameOverState->assignProperty(stopGameAction, "enabled", false);
-    connect(gameOverState, SIGNAL(entered()), this, SLOT(gameOver()));
-
-    stoppedState->addTransition(runGameAction, SIGNAL(triggered()), m_runningState);
-    m_runningState->addTransition(stopGameAction, SIGNAL(triggered()), stoppedState);
-
-    m_gameOverTransition = new GameOverTransition(gameOverState);
-    m_runningState->addTransition(m_gameOverTransition);
-
-    QTimer *timer = new QTimer(this);
-    timer->setInterval(100);
-    connect(timer, SIGNAL(timeout()), this, SLOT(runStep()));
-    connect(m_runningState, SIGNAL(entered()), timer, SLOT(start()));
-    connect(m_runningState, SIGNAL(exited()), timer, SLOT(stop()));
-
-    m_machine->start();
-    m_time.start();
-}
-
-void MainWindow::runStep()
-{
-    if (!m_started) {
-        m_time.restart();
-        m_started = true;
-    } else {
-        int elapsed = m_time.elapsed();
-        if (elapsed > 0) {
-            m_time.restart();
-            qreal elapsedSecs = elapsed / 1000.0;
-            QList<QGraphicsItem *> items = m_scene->items();
-            foreach (QGraphicsItem *item, items) {
-                if (GameItem *gameItem = qgraphicsitem_cast<GameItem *>(item))
-                    gameItem->idle(elapsedSecs);
-            }
-        }
-    }
-}
-
-void MainWindow::gameOver()
-{
-    QList<QGraphicsItem *> items = m_scene->items();
-
-    TankItem *lastTankStanding = 0;
-    foreach (QGraphicsItem *item, items) {
-        if (GameItem *gameItem = qgraphicsitem_cast<GameItem *>(item)) {
-            if ((lastTankStanding = qobject_cast<TankItem *>(gameItem)) != 0)
-                break;
-        }
-    }
-
-    QMessageBox::information(this, "Game over!",
-        QString::fromLatin1("The tank played by '%1' has won!").arg(lastTankStanding->objectName()));
-}
-
-void MainWindow::addRocket()
-{
-    TankItem *tankItem = qobject_cast<TankItem *>(sender());
-    if (tankItem != 0) {
-        RocketItem *rocketItem = new RocketItem;
-
-        QPointF s = tankItem->mapToScene(QPointF(tankItem->boundingRect().right() + 10.0,
-                                                 tankItem->boundingRect().center().y()));
-        rocketItem->setPos(s);
-        rocketItem->setDirection(tankItem->direction());
-        m_scene->addItem(rocketItem);
-    }
-}
-
-void MainWindow::addTank()
-{
-    Q_ASSERT(!m_spawns.isEmpty());
-
-    QDir pluginsDir(qApp->applicationDirPath());
-#if defined(Q_OS_WIN)
-    if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release")
-        pluginsDir.cdUp();
-#elif defined(Q_OS_MAC)
-    if (pluginsDir.dirName() == "MacOS") {
-        pluginsDir.cdUp();
-        pluginsDir.cdUp();
-        pluginsDir.cdUp();
-    }
-#endif
-
-    pluginsDir.cd("plugins");
-
-    QStringList itemNames;
-    QList<Plugin *> items;
-    foreach (QString fileName, pluginsDir.entryList(QDir::Files)) {
-        QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
-        QObject *possiblePlugin = loader.instance();
-        if (Plugin *plugin = qobject_cast<Plugin *>(possiblePlugin)) {
-            QString objectName = possiblePlugin->objectName();
-            if (objectName.isEmpty())
-                objectName = fileName;
-
-            itemNames.append(objectName);
-            items.append(plugin);
-        }
-    }
-
-    if (items.isEmpty()) {
-        QMessageBox::information(this, "No tank types found", "Please build the errorstateplugins directory");
-        return;
-    }
-
-    bool ok;
-//! [1]
-    QString selectedName = QInputDialog::getItem(this, "Select a tank type", "Tank types",
-        itemNames, 0, false, &ok);
-//! [1]
-
-    if (ok && !selectedName.isEmpty()) {
-        int idx = itemNames.indexOf(selectedName);
-        if (Plugin *plugin = idx >= 0 ? items.at(idx) : 0) {
-            TankItem *tankItem = m_spawns.takeLast();
-            tankItem->setObjectName(selectedName);
-            tankItem->setToolTip(selectedName);
-            m_scene->addItem(tankItem);
-            connect(tankItem, SIGNAL(cannonFired()), this, SLOT(addRocket()));
-            if (m_spawns.isEmpty())
-                emit mapFull();
-
-            m_gameOverTransition->addTankItem(tankItem);
-
-            QState *region = new QState(m_runningState);
-            region->setObjectName(QString::fromLatin1("region%1").arg(m_spawns.size()));
-//! [2]
-            QState *pluginState = plugin->create(region, tankItem);
-//! [2]
-            region->setInitialState(pluginState);
-
-            // If the plugin has an error it is disabled
-//! [4]
-            QState *errorState = new QState(region);
-            errorState->setObjectName(QString::fromLatin1("errorState%1").arg(m_spawns.size()));
-            errorState->assignProperty(tankItem, "enabled", false);
-            pluginState->setErrorState(errorState);
-//! [4]
-        }
-    }
-}
-
diff --git a/examples/statemachine/tankgame/mainwindow.h b/examples/statemachine/tankgame/mainwindow.h
deleted file mode 100644
index d42b7ac..0000000
--- a/examples/statemachine/tankgame/mainwindow.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-#include <QTime>
-
-QT_BEGIN_NAMESPACE
-class QGraphicsScene;
-class QStateMachine;
-class QState;
-QT_END_NAMESPACE
-class GameOverTransition;
-class TankItem;
-
-class MainWindow: public QMainWindow
-{
-    Q_OBJECT
-    Q_PROPERTY(bool started READ started WRITE setStarted)
-public:
-    MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-
-    void setStarted(bool b) { m_started = b; }
-    bool started() const { return m_started; }
-
-public slots:
-    void addTank();
-    void addRocket();
-    void runStep();
-    void gameOver();
-
-signals:
-    void mapFull();
-
-private:
-    void init();
-    void addWall(const QRectF &wall);
-
-    QGraphicsScene *m_scene;
-
-    QStateMachine *m_machine;
-    QState *m_runningState;
-    GameOverTransition *m_gameOverTransition;
-
-    QList<TankItem *> m_spawns;
-    QTime m_time;
-
-    bool m_started : 1;
-};
-
-#endif
-
diff --git a/examples/statemachine/tankgame/rocketitem.cpp b/examples/statemachine/tankgame/rocketitem.cpp
deleted file mode 100644
index d286e5d..0000000
--- a/examples/statemachine/tankgame/rocketitem.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "rocketitem.h"
-#include "tankitem.h"
-
-#include <QPainter>
-#include <QGraphicsScene>
-
-#include <math.h>
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-RocketItem::RocketItem(QObject *parent)
-    : GameItem(parent), m_direction(0.0), m_distance(300.0)
-{
-}
-
-QRectF RocketItem::boundingRect() const
-{
-    return QRectF(-1.0, -1.0, 2.0, 2.0);
-}
-
-void RocketItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    painter->setBrush(Qt::black);
-    painter->drawEllipse(boundingRect());
-}
-
-void RocketItem::idle(qreal elapsed)
-{
-    qreal dist = elapsed * speed();
-
-    m_distance -= dist;
-    if (m_distance < 0.0) {
-        scene()->removeItem(this);
-        delete this;
-        return;
-    }
-
-    qreal a = m_direction * M_PI / 180.0;
-
-    qreal yd = dist * sin(a);
-    qreal xd = dist * sin(M_PI / 2.0 - a);
-
-    QPointF requestedPosition = pos() + QPointF(xd, yd);
-    QGraphicsItem *collidedItem = 0;
-    QPointF nextPosition = tryMove(requestedPosition, 0, &collidedItem);
-    if (requestedPosition == nextPosition) {
-        setPos(nextPosition);
-    } else {
-        if (GameItem *gameItem = qgraphicsitem_cast<GameItem *>(collidedItem)) {
-            TankItem *tankItem = qobject_cast<TankItem *>(gameItem);
-            if (tankItem != 0)
-                tankItem->hitByRocket();
-        }
-
-        scene()->removeItem(this);
-        delete this;
-    }
-}
diff --git a/examples/statemachine/tankgame/tankgame.pro b/examples/statemachine/tankgame/tankgame.pro
deleted file mode 100644
index 59415be..0000000
--- a/examples/statemachine/tankgame/tankgame.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-HEADERS += mainwindow.h \
-           plugin.h \
-           tankitem.h \
-           rocketitem.h \
-           gameitem.h \
-           gameovertransition.h
-SOURCES += main.cpp \
-           mainwindow.cpp \
-           tankitem.cpp \
-           rocketitem.cpp \
-           gameitem.cpp \
-           gameovertransition.cpp
-CONFIG += console
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tankgame.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame
-INSTALLS += target sources
diff --git a/examples/statemachine/tankgame/tankitem.cpp b/examples/statemachine/tankgame/tankitem.cpp
deleted file mode 100644
index 192b272..0000000
--- a/examples/statemachine/tankgame/tankitem.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "tankitem.h"
-
-#include <QPainter>
-#include <QGraphicsScene>
-#include <QDebug>
-
-#include <math.h>
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-class Action
-{
-public:
-    Action(TankItem *item) : m_item(item)
-    {
-    }
-
-    TankItem *item() const { return m_item; }
-    void setItem(TankItem *item) { m_item = item; }
-
-    virtual bool apply(qreal timeDelta) = 0;
-
-private:
-    TankItem *m_item;
-};
-
-class MoveAction: public Action
-{
-public:
-    MoveAction(TankItem *item, qreal distance)
-        : Action(item), m_distance(distance)
-    {
-        m_reverse = m_distance < 0.0;
-    }
-
-    bool apply(qreal timeDelta)
-    {
-        qreal dist = timeDelta * item()->speed() * (m_reverse ? -1.0 : 1.0);
-
-        bool done = false;
-        if (qAbs(m_distance) < qAbs(dist)) {
-            done = true;
-            dist = m_distance;
-        }
-        m_distance -= dist;
-
-        qreal a = item()->direction() * M_PI / 180.0;
-
-        qreal yd = dist * sin(a);
-        qreal xd = dist * sin(M_PI / 2.0 - a);
-
-        item()->setPos(item()->pos() + QPointF(xd, yd));
-        return !done;
-    }
-
-private:
-    qreal m_distance;
-    bool m_reverse;
-};
-
-class TurnAction: public Action
-{
-public:
-    TurnAction(TankItem *item, qreal distance)
-        : Action(item), m_distance(distance)
-    {
-        m_reverse = m_distance < 0.0;
-    }
-
-    bool apply(qreal timeDelta)
-    {
-        qreal dist = timeDelta * item()->angularSpeed() * (m_reverse ? -1.0 : 1.0);
-        bool done = false;
-        if (qAbs(m_distance) < qAbs(dist)) {
-            done = true;
-            dist = m_distance;
-        }
-        m_distance -= dist;
-
-        item()->setDirection(item()->direction() + dist);
-        return !done;
-    }
-
-private:
-    qreal m_distance;
-    bool m_reverse;
-};
-
-TankItem::TankItem(QObject *parent)
-    : GameItem(parent), m_currentAction(0), m_currentDirection(0.0), m_enabled(true)
-{
-    connect(this, SIGNAL(cannonFired()), this, SIGNAL(actionCompleted()));
-}
-
-void TankItem::idle(qreal elapsed)
-{
-    if (m_enabled) {
-        if (m_currentAction != 0) {
-            if (!m_currentAction->apply(elapsed)) {
-                setAction(0);
-                emit actionCompleted();
-            }
-
-            QGraphicsItem *item = 0;
-            qreal distance = distanceToObstacle(&item);
-            if (TankItem *tankItem = qgraphicsitem_cast<TankItem *>(item))
-                emit tankSpotted(tankItem->direction(), distance);
-        }
-    }
-}
-
-void TankItem::hitByRocket()
-{
-    emit aboutToBeDestroyed();
-    deleteLater();
-}
-
-void TankItem::setAction(Action *newAction)
-{
-    if (m_currentAction != 0)
-        delete m_currentAction;
-
-    m_currentAction = newAction;
-}
-
-void TankItem::fireCannon()
-{
-    emit cannonFired();
-}
-
-void TankItem::moveForwards(qreal length)
-{
-    setAction(new MoveAction(this, length));
-}
-
-void TankItem::moveBackwards(qreal length)
-{
-    setAction(new MoveAction(this, -length));
-}
-
-void TankItem::turn(qreal degrees)
-{
-    setAction(new TurnAction(this, degrees));
-}
-
-void TankItem::turnTo(qreal degrees)
-{
-    setAction(new TurnAction(this, degrees - direction()));
-}
-
-void TankItem::stop()
-{
-    setAction(0);
-}
-
-QVariant TankItem::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
-{
-    if (change == ItemPositionChange && scene()) {
-        QPointF requestedPosition = value.toPointF();
-        QLineF collidedLine;
-        QPointF nextPoint = tryMove(requestedPosition, &collidedLine);
-        if (nextPoint != requestedPosition)
-            emit collision(collidedLine);
-        return nextPoint;
-    } else {
-        return QGraphicsItem::itemChange(change, value);
-    }
-}
-
-
-void TankItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    QRectF brect = boundingRect();
-
-    painter->setBrush(m_color);
-    painter->setPen(Qt::black);
-
-    // body
-    painter->drawRect(brect.adjusted(0.0, 4.0, -2.0, -4.0));
-
-    // cannon
-    QRectF cannonBase = brect.adjusted(10.0, 6.0, -12.0, -6.0);
-    painter->drawEllipse(cannonBase);
-
-    painter->drawRect(QRectF(QPointF(cannonBase.center().x(), cannonBase.center().y() - 2.0),
-                             QPointF(brect.right(), cannonBase.center().y() + 2.0)));
-
-    // left track
-    painter->setBrush(QBrush(Qt::black, Qt::VerPattern));
-    QRectF leftTrackRect = QRectF(brect.topLeft(), QPointF(brect.right() - 2.0, brect.top() + 4.0));
-    painter->fillRect(leftTrackRect, Qt::darkYellow);
-    painter->drawRect(leftTrackRect);
-
-    // right track
-    QRectF rightTrackRect = QRectF(QPointF(brect.left(), brect.bottom() - 4.0),
-                                   QPointF(brect.right() - 2.0, brect.bottom()));
-    painter->fillRect(rightTrackRect, Qt::darkYellow);
-    painter->drawRect(rightTrackRect);
-
-    if (!m_enabled) {
-        painter->setPen(QPen(Qt::red, 5));
-
-        painter->drawEllipse(brect);
-
-        QPainterPath path;
-        path.addEllipse(brect);
-        painter->setClipPath(path);
-        painter->drawLine(brect.topRight(), brect.bottomLeft());
-    }
-}
-
-QRectF TankItem::boundingRect() const
-{
-    return QRectF(-20.0, -10.0, 40.0, 20.0);
-}
-
-qreal TankItem::direction() const
-{
-    return m_currentDirection;
-}
-
-void TankItem::setDirection(qreal newDirection)
-{
-    int fullRotations = int(newDirection) / 360;
-    newDirection -= fullRotations * 360.0;
-
-    qreal diff = newDirection - m_currentDirection;
-    m_currentDirection = newDirection;
-    rotate(diff);
-}
-
-qreal TankItem::distanceToObstacle(QGraphicsItem **obstacle) const
-{
-    qreal dist = sqrt(pow(scene()->sceneRect().width(), 2) + pow(scene()->sceneRect().height(), 2));
-
-    qreal a = m_currentDirection * M_PI / 180.0;
-
-    qreal yd = dist * sin(a);
-    qreal xd = dist * sin(M_PI / 2.0 - a);
-
-    QPointF requestedPosition = pos() + QPointF(xd, yd);
-    QGraphicsItem *collidedItem = 0;
-    QPointF nextPosition = tryMove(requestedPosition, 0, &collidedItem);
-    if (collidedItem != 0) {
-        if (obstacle != 0)
-            *obstacle = collidedItem;
-
-        QPointF d = nextPosition - pos();
-        return sqrt(pow(d.x(), 2) + pow(d.y(), 2));
-    } else {
-        return 0.0;
-    }
-}
-
-qreal TankItem::distanceToObstacle() const
-{
-    return distanceToObstacle(0);
-}
-
diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai.pro b/examples/statemachine/tankgameplugins/random_ai/random_ai.pro
deleted file mode 100644
index 5bc0b26..0000000
--- a/examples/statemachine/tankgameplugins/random_ai/random_ai.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = lib
-CONFIG       += plugin
-INCLUDEPATH  += ../..
-HEADERS       = random_ai_plugin.h
-SOURCES       = random_ai_plugin.cpp
-TARGET        = $$qtLibraryTarget(random_ai)
-DESTDIR       = ../../tankgame/plugins
-
-#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS random_ai.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/random_ai
-\ No newline at end of file
diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp b/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp
deleted file mode 100644
index ddfd1c5..0000000
--- a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "random_ai_plugin.h"
-
-#include <QState>
-#include <QTime>
-#include <QtPlugin>
-
-QState *RandomAiPlugin::create(QState *parentState, QObject *tank)
-{
-    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
-
-    QState *topLevel = new QState(parentState);
-
-    QState *selectNextActionState = new SelectActionState(topLevel);
-    topLevel->setInitialState(selectNextActionState);
-
-    QState *fireState = new RandomDistanceState(topLevel);
-    connect(fireState, SIGNAL(distanceComputed(qreal)), tank, SLOT(fireCannon()));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(fireSelected()), fireState);
-
-    QState *moveForwardsState = new RandomDistanceState(topLevel);
-    connect(moveForwardsState, SIGNAL(distanceComputed(qreal)), tank, SLOT(moveForwards(qreal)));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(moveForwardsSelected()), moveForwardsState);
-
-    QState *moveBackwardsState = new RandomDistanceState(topLevel);
-    connect(moveBackwardsState, SIGNAL(distanceComputed(qreal)), tank, SLOT(moveBackwards(qreal)));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(moveBackwardsSelected()), moveBackwardsState);
-
-    QState *turnState = new RandomDistanceState(topLevel);
-    connect(turnState, SIGNAL(distanceComputed(qreal)), tank, SLOT(turn(qreal)));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(turnSelected()), turnState);
-
-    topLevel->addTransition(tank, SIGNAL(actionCompleted()), selectNextActionState);
-
-    return topLevel;
-}
-
-Q_EXPORT_PLUGIN2(random_ai, RandomAiPlugin)
diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp
deleted file mode 100644
index 79d7d0c..0000000
--- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "seek_ai.h"
-
-QState *SeekAi::create(QState *parentState, QObject *tank)
-{
-    QState *topLevel = new QState(parentState);
-    topLevel->setObjectName("topLevel");
-
-    QState *seek = new QState(topLevel);
-    seek->setObjectName("seek");
-    topLevel->setInitialState(seek);
-
-    QState *lookForNearestWall = new SearchState(tank, seek);
-    lookForNearestWall->setObjectName("lookForNearestWall");
-    seek->setInitialState(lookForNearestWall);
-
-    QState *driveToFirstObstacle = new QState(seek);
-    driveToFirstObstacle->setObjectName("driveToFirstObstacle");
-    lookForNearestWall->addTransition(lookForNearestWall, SIGNAL(nearestObstacleStraightAhead()),
-        driveToFirstObstacle);
-
-    QState *drive = new QState(driveToFirstObstacle);
-    drive->setObjectName("drive");
-    driveToFirstObstacle->setInitialState(drive);
-    connect(drive, SIGNAL(entered()), tank, SLOT(moveForwards()));
-    connect(drive, SIGNAL(exited()), tank, SLOT(stop()));
-
-    // Go in loop
-    QState *finishedDriving = new QState(driveToFirstObstacle);
-    finishedDriving->setObjectName("finishedDriving");
-    drive->addTransition(tank, SIGNAL(actionCompleted()), finishedDriving);
-    finishedDriving->addTransition(drive);
-
-    QState *turnTo = new QState(seek);
-    turnTo->setObjectName("turnTo");
-    driveToFirstObstacle->addTransition(new CollisionTransition(tank, turnTo));
-
-    turnTo->addTransition(tank, SIGNAL(actionCompleted()), driveToFirstObstacle);
-
-    ChaseState *chase = new ChaseState(tank, topLevel);
-    chase->setObjectName("chase");
-    seek->addTransition(new TankSpottedTransition(tank, chase));
-    chase->addTransition(chase, SIGNAL(finished()), driveToFirstObstacle);
-    chase->addTransition(new TankSpottedTransition(tank, chase));
-
-    return topLevel;
-}
-
-Q_EXPORT_PLUGIN2(seek_ai, SeekAi)
diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
deleted file mode 100644
index 1bc5b26..0000000
--- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SEEK_AI_H
-#define SEEK_AI_H
-
-#include <tankgame/plugin.h>
-
-#include <QState>
-#include <QFinalState>
-#include <QSignalTransition>
-#include <QSignalEvent>
-#include <QVariant>
-#include <QLineF>
-#include <QDebug>
-
-class SearchState: public QState
-{
-    Q_OBJECT
-public:
-    SearchState(QObject *tank, QState *parentState = 0)
-        : QState(parentState),
-          m_tank(tank),
-          m_distanceToTurn(360.0),
-          m_nearestDistance(-1.0),
-          m_directionOfNearestObstacle(0.0)
-    {
-    }
-
-public slots:
-    void turnAlittle()
-    {
-        qreal dist = m_tank->property("distanceToObstacle").toDouble();
-
-        if (m_nearestDistance < 0.0 || dist < m_nearestDistance) {
-            m_nearestDistance = dist;
-            m_directionOfNearestObstacle = m_tank->property("direction").toDouble();
-        }
-
-        m_distanceToTurn -= 10.0;
-        if (m_distanceToTurn < 0.0) {
-            disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle()));
-            connect(m_tank, SIGNAL(actionCompleted()), this, SIGNAL(nearestObstacleStraightAhead()));
-            m_tank->setProperty("direction", m_directionOfNearestObstacle);
-        }
-
-        qreal currentDirection = m_tank->property("direction").toDouble();
-        m_tank->setProperty("direction", currentDirection + 10.0);
-    }
-
-signals:
-    void nearestObstacleStraightAhead();
-
-protected:
-    void onEntry(QEvent *)
-    {
-        connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle()));
-        turnAlittle();
-    }
-
-    void onExit(QEvent *)
-    {
-        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle()));
-        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(nearestObstacleStraightAhead()));
-    }
-
-private:
-    QObject *m_tank;
-
-    qreal m_distanceToTurn;
-    qreal m_nearestDistance;
-    qreal m_directionOfNearestObstacle;
-};
-
-class CollisionTransition: public QSignalTransition
-{
-public:
-    CollisionTransition(QObject *tank, QState *turnTo)
-        : QSignalTransition(tank, SIGNAL(collision(QLineF))),
-          m_tank(tank),
-          m_turnTo(turnTo)
-    {
-        setTargetState(turnTo);
-    }
-
-protected:
-    bool eventTest(QEvent *event)
-    {
-        bool b = QSignalTransition::eventTest(event);
-        if (b) {
-            QSignalEvent *se = static_cast<QSignalEvent *>(event);
-            m_lastLine = se->arguments().at(0).toLineF();
-        }
-        return b;
-    }
-
-    void onTransition(QEvent *)
-    {
-        qreal angleOfWall = m_lastLine.angle();
-
-        qreal newDirection;
-        if (qrand() % 2 == 0)
-            newDirection = angleOfWall;
-        else
-            newDirection = angleOfWall - 180.0;
-
-        m_turnTo->assignProperty(m_tank, "direction", newDirection);
-    }
-
-private:
-    QLineF m_lastLine;
-    QObject *m_tank;
-    QState *m_turnTo;
-};
-
-class ChaseState: public QState
-{
-    class GoToLocationState: public QState
-    {
-    public:
-        GoToLocationState(QObject *tank, QState *parentState = 0)
-            : QState(parentState), m_tank(tank), m_distance(0.0)
-        {
-        }
-
-        void setDistance(qreal distance) { m_distance = distance; }
-
-    protected:
-        void onEntry()
-        {
-            QMetaObject::invokeMethod(m_tank, "moveForwards", Q_ARG(qreal, m_distance));
-        }
-
-    private:
-        QObject *m_tank;
-        qreal m_distance;
-    };
-
-public:
-    ChaseState(QObject *tank, QState *parentState = 0) : QState(parentState), m_tank(tank)
-    {
-        QState *fireCannon = new QState(this);
-        fireCannon->setObjectName("fireCannon");
-        connect(fireCannon, SIGNAL(entered()), tank, SLOT(fireCannon()));
-        setInitialState(fireCannon);
-
-        m_goToLocation = new GoToLocationState(tank, this);
-        m_goToLocation->setObjectName("goToLocation");
-        fireCannon->addTransition(tank, SIGNAL(actionCompleted()), m_goToLocation);
-
-        m_turnToDirection = new QState(this);
-        m_turnToDirection->setObjectName("turnToDirection");
-        m_goToLocation->addTransition(tank, SIGNAL(actionCompleted()), m_turnToDirection);
-
-        QFinalState *finalState = new QFinalState(this);
-        finalState->setObjectName("finalState");
-        m_turnToDirection->addTransition(tank, SIGNAL(actionCompleted()), finalState);
-    }
-
-    void setDirection(qreal direction)
-    {
-        m_turnToDirection->assignProperty(m_tank, "direction", direction);
-    }
-
-    void setDistance(qreal distance)
-    {
-        m_goToLocation->setDistance(distance);
-    }
-
-private:
-    QObject *m_tank;
-    GoToLocationState *m_goToLocation;
-    QState *m_turnToDirection;
-
-};
-
-class TankSpottedTransition: public QSignalTransition
-{
-public:
-    TankSpottedTransition(QObject *tank, ChaseState *target) : QSignalTransition(tank, SIGNAL(tankSpotted(qreal,qreal))), m_chase(target)
-    {
-        setTargetState(target);
-    }
-
-protected:
-    bool eventTest(QEvent *event)
-    {
-        bool b = QSignalTransition::eventTest(event);
-        if (b) {
-            QSignalEvent *se = static_cast<QSignalEvent *>(event);
-            m_chase->setDirection(se->arguments().at(0).toDouble());
-            m_chase->setDistance(se->arguments().at(1).toDouble());
-        }
-        return b;
-    }
-
-private:
-    ChaseState *m_chase;
-};
-
-class SeekAi: public QObject, public Plugin
-{
-    Q_OBJECT
-    Q_INTERFACES(Plugin)
-public:
-    SeekAi() { setObjectName("Seek and destroy"); }
-
-    virtual QState *create(QState *parentState, QObject *tank);
-};
-
-#endif
diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro
deleted file mode 100644
index 0d8bf2e..0000000
--- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = lib
-CONFIG       += plugin
-INCLUDEPATH  += ../..
-HEADERS       = seek_ai.h
-SOURCES       = seek_ai.cpp
-TARGET        = $$qtLibraryTarget(seek_ai)
-DESTDIR       = ../../tankgame/plugins
-
-#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS seek_ai.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/seek_ai
-\ No newline at end of file
diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp
deleted file mode 100644
index 4e71285..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "spin_ai.h"
-
-#include <QtPlugin>
-
-QState *SpinAi::create(QState *parentState, QObject *tank)
-{
-    QState *topLevel = new QState(parentState);
-    QState *spinState = new SpinState(tank, topLevel);
-    topLevel->setInitialState(spinState);
-
-    // When tank is spotted, fire two times and go back to spin state
-    QState *fireState = new QState(topLevel);
-
-    QState *fireOnce = new QState(fireState);
-    fireState->setInitialState(fireOnce);
-    connect(fireOnce, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    QState *fireTwice = new QState(fireState);
-    connect(fireTwice, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    fireOnce->addTransition(tank, SIGNAL(actionCompleted()), fireTwice);
-    fireTwice->addTransition(tank, SIGNAL(actionCompleted()), spinState);
-
-    spinState->addTransition(tank, SIGNAL(tankSpotted(qreal,qreal)), fireState);
-
-    return topLevel;
-}
-
-Q_EXPORT_PLUGIN2(spin_ai, SpinAi)
diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro
deleted file mode 100644
index 8ab4da0..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = lib
-CONFIG       += plugin
-INCLUDEPATH  += ../..
-HEADERS       = spin_ai.h
-SOURCES       = spin_ai.cpp
-TARGET        = $$qtLibraryTarget(spin_ai)
-DESTDIR       = ../../tankgame/plugins
-
-#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spin_ai.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/spin_ai
-\ No newline at end of file
diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp
deleted file mode 100644
index 12a9656..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "spin_ai_with_error.h"
-
-#include <QtPlugin>
-
-QState *SpinAiWithError::create(QState *parentState, QObject *tank)
-{
-    QState *topLevel = new QState(parentState);
-    QState *spinState = new SpinState(tank, topLevel);
-    topLevel->setInitialState(spinState);
-
-    // When tank is spotted, fire two times and go back to spin state
-    // (no initial state set for fireState will lead to run-time error in machine)
-    QState *fireState = new QState(topLevel);
-
-    QState *fireOnce = new QState(fireState);
-    connect(fireOnce, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    QState *fireTwice = new QState(fireState);
-    connect(fireTwice, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    fireOnce->addTransition(tank, SIGNAL(actionCompleted()), fireTwice);
-    fireTwice->addTransition(tank, SIGNAL(actionCompleted()), spinState);
-
-    spinState->addTransition(tank, SIGNAL(tankSpotted(qreal,qreal)), fireState);
-
-    return topLevel;
-}
-
-Q_EXPORT_PLUGIN2(spin_ai_with_error, SpinAiWithError)
diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro
deleted file mode 100644
index 124cf98..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = lib
-CONFIG       += plugin
-INCLUDEPATH  += ../..
-HEADERS       = spin_ai_with_error.h
-SOURCES       = spin_ai_with_error.cpp
-TARGET        = $$qtLibraryTarget(spin_ai_with_error)
-DESTDIR       = ../../tankgame/plugins
-
-#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spin_ai_with_error.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/spin_ai_with_error
-\ No newline at end of file
diff --git a/examples/statemachine/tankgameplugins/tankgameplugins.pro b/examples/statemachine/tankgameplugins/tankgameplugins.pro
deleted file mode 100644
index a098e03..0000000
--- a/examples/statemachine/tankgameplugins/tankgameplugins.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS       = random_ai \
-                spin_ai_with_error \
-                spin_ai \
-                seek_ai 
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tankgameplugins.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins
-INSTALLS += target sources
diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro
index 437f449..7870ca8 100644
--- a/examples/threads/mandelbrot/mandelbrot.pro
+++ b/examples/threads/mandelbrot/mandelbrot.pro
@@ -4,7 +4,7 @@ SOURCES       = main.cpp \
                 mandelbrotwidget.cpp \
                 renderthread.cpp
 
-unix:!mac:LIBS += -lm
+unix:!mac:!vxworks:LIBS += -lm
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot
diff --git a/examples/webkit/framecapture/framecapture.cpp b/examples/webkit/framecapture/framecapture.cpp
new file mode 100644
index 0000000..ef31f6d
--- /dev/null
+++ b/examples/webkit/framecapture/framecapture.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "framecapture.h"
+
+#include <iostream>
+#include <QtWebKit>
+
+FrameCapture::FrameCapture(): QObject(), m_percent(0)
+{
+    connect(&m_page, SIGNAL(loadProgress(int)), this, SLOT(printProgress(int)));
+    connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
+}
+
+void FrameCapture::load(const QUrl &url, const QString &outputFileName)
+{
+    std::cout << "Loading " << qPrintable(url.toString()) << std::endl;
+    m_percent = 0;
+    int index = outputFileName.lastIndexOf('.');
+    m_fileName = (index == -1) ? outputFileName + ".png" : outputFileName;
+    m_page.mainFrame()->load(url);
+    m_page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+    m_page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+}
+
+void FrameCapture::printProgress(int percent)
+{
+    if (m_percent >= percent)
+        return;
+
+    while (m_percent++ < percent)
+        std::cout << "#" << std::flush;
+}
+
+void FrameCapture::saveResult(bool ok)
+{
+    std::cout << std::endl;
+
+    // crude error-checking
+    if (!ok) {
+        std::cerr << "Failed loading " << qPrintable(m_page.mainFrame()->url().toString()) << std::endl;
+        emit finished();
+        return;
+    }
+
+    // save each internal frame in different image files
+    int frameCounter = 0;
+    foreach(QWebFrame *frame, m_page.mainFrame()->childFrames()) {
+        QString fileName(m_fileName);
+        int index = m_fileName.lastIndexOf('.');
+        fileName = fileName.insert(index, "_frame" + QString::number(++frameCounter));
+
+        frame->setClipRenderToViewport(false);
+
+        QImage image(frame->contentsSize(), QImage::Format_ARGB32_Premultiplied);
+        image.fill(Qt::transparent);
+
+        saveFrame(frame, image, fileName);
+    }
+
+    // save the main frame
+    m_page.setViewportSize(m_page.mainFrame()->contentsSize());
+    QImage image(m_page.mainFrame()->contentsSize(), QImage::Format_ARGB32_Premultiplied);
+    image.fill(Qt::transparent);
+    saveFrame(m_page.mainFrame(), image, m_fileName);
+
+    emit finished();
+}
+
+void FrameCapture::saveFrame(QWebFrame *frame, QImage image, QString fileName)
+{
+    QPainter painter(&image);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setRenderHint(QPainter::TextAntialiasing, true);
+    painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
+
+    frame->render(&painter);
+
+    painter.end();
+
+    image.save(fileName);
+}
+
diff --git a/examples/statemachine/tankgame/gameovertransition.h b/examples/webkit/framecapture/framecapture.h
index e918359..ffc93ac 100644
--- a/examples/statemachine/tankgame/gameovertransition.h
+++ b/examples/webkit/framecapture/framecapture.h
@@ -39,25 +39,32 @@
 **
 ****************************************************************************/
 
-#ifndef GAMEOVERTRANSITION_H
-#define GAMEOVERTRANSITION_H
+#ifndef FRAMECAPTURE_H
+#define FRAMECAPTURE_H
 
-#include <QSignalTransition>
+#include <QtWebKit>
 
-class TankItem;
-class GameOverTransition: public QSignalTransition
+class FrameCapture : public QObject
 {
     Q_OBJECT
+
 public:
-    GameOverTransition(QAbstractState *targetState);
+    FrameCapture();
+    void load(const QUrl &url, const QString &outputFileName);
 
-    void addTankItem(TankItem *tankItem);
+signals:
+    void finished();
 
-protected:
-    bool eventTest(QEvent *event);
+private slots:
+    void printProgress(int percent);
+    void saveResult(bool ok);
 
 private:
-    QList<TankItem *> m_tankItems;
+    QWebPage m_page;
+    QString m_fileName;
+    int m_percent;
+
+    void saveFrame(QWebFrame *frame, QImage image, QString fileName);
 };
 
 #endif
diff --git a/examples/webkit/framecapture/framecapture.pro b/examples/webkit/framecapture/framecapture.pro
new file mode 100644
index 0000000..6f2f093
--- /dev/null
+++ b/examples/webkit/framecapture/framecapture.pro
@@ -0,0 +1,11 @@
+QT      += webkit
+
+HEADERS = framecapture.h
+SOURCES = main.cpp \
+          framecapture.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkit/framecapture
+sources.files = $$SOURCES $$HEADERS
+sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/framecapture
+INSTALLS += target sources
diff --git a/examples/statemachine/tankgame/gameovertransition.cpp b/examples/webkit/framecapture/main.cpp
index 634fbce..fcdb62a 100644
--- a/examples/statemachine/tankgame/gameovertransition.cpp
+++ b/examples/webkit/framecapture/main.cpp
@@ -39,42 +39,38 @@
 **
 ****************************************************************************/
 
-#include "gameovertransition.h"
-#include "tankitem.h"
+#include "framecapture.h"
 
-#include <QSignalEvent>
-#include <QSignalMapper>
+#include <iostream>
+#include <QtGui>
 
-GameOverTransition::GameOverTransition(QAbstractState *targetState)
-    : QSignalTransition(new QSignalMapper(), SIGNAL(mapped(QObject*)))
+int main(int argc, char * argv[])
 {
-    setTargetState(targetState);
+    if (argc != 3) {
+        std::cout << "Capture a web page and save its internal frames in different images" << std::endl << std::endl;
+        std::cout << "  framecapture <url> <outputfile>" << std::endl;
+        std::cout << std::endl;
+        std::cout << "Notes:" << std::endl;
+        std::cout << "  'url' is the URL of the web page to be captured" << std::endl;
+        std::cout << "  'outputfile' is the prefix of the image files to be generated" << std::endl;
+        std::cout << std::endl;
+        std::cout << "Example: " << std::endl;
+        std::cout << "  framecapture www.trolltech.com trolltech.png" << std::endl;
+        std::cout << std::endl;
+        std::cout << "Result:" << std::endl;
+        std::cout << "  trolltech.png (full page)" << std::endl;
+        std::cout << "  trolltech_frame1.png (...) trolltech_frameN.png ('N' number of internal frames)" << std::endl;
+        return 0;
+    }
 
-    QSignalMapper *mapper = qobject_cast<QSignalMapper *>(senderObject());
-    mapper->setParent(this);
-}
+    QUrl url = QWebView::guessUrlFromString(QString::fromLatin1(argv[1]));
+    QString fileName = QString::fromLatin1(argv[2]);
 
-void GameOverTransition::addTankItem(TankItem *tankItem)
-{
-    m_tankItems.append(tankItem);
+    QApplication a(argc, argv);
+    FrameCapture capture;
+    QObject::connect(&capture, SIGNAL(finished()), QApplication::instance(), SLOT(quit()));
+    capture.load(url, fileName);
 
-    QSignalMapper *mapper = qobject_cast<QSignalMapper *>(senderObject());
-    mapper->setMapping(tankItem, tankItem);
-    connect(tankItem, SIGNAL(aboutToBeDestroyed()), mapper, SLOT(map()));
+    return a.exec();
 }
 
-bool GameOverTransition::eventTest(QEvent *e)
-{
-    bool ret = QSignalTransition::eventTest(e);
-
-    if (ret) {
-        QSignalEvent *signalEvent = static_cast<QSignalEvent *>(e);
-        QObject *sender = qvariant_cast<QObject *>(signalEvent->arguments().at(0));
-        TankItem *tankItem = qobject_cast<TankItem *>(sender);
-        m_tankItems.removeAll(tankItem);
-
-        return m_tankItems.size() <= 1;
-    } else {
-        return false;
-    }
-}
author	Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>	2009-08-07 12:31:58 (GMT)
committer	Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>	2009-08-07 12:31:58 (GMT)
commit	103334ced3b0cb6e69a1ed3075d9b81e591f37e9 (patch)
tree	c7e36b012a042ce864556f9851cb1220d9f385c5 /examples
parent	a4391dfd2aef38e3a3d37bee07900296ced2521c (diff)
parent	490f135caa35831646dac7e00f1c9422cb09aca9 (diff)
download	Qt-103334ced3b0cb6e69a1ed3075d9b81e591f37e9.zip Qt-103334ced3b0cb6e69a1ed3075d9b81e591f37e9.tar.gz Qt-103334ced3b0cb6e69a1ed3075d9b81e591f37e9.tar.bz2