Fix segfault at plasma_applet_animation_example from kdeexamples

Patch-by: Andre L. V. Loureiro <loureiro.andrew@gmail.com>

svn path=/trunk/KDE/kdelibs/; revision=1082144

animations/rotationstacked.cpp

@@ -34,12 +34,12 @@ RotationStackedAnimation::RotationStackedAnimation(QObject *parent)
 {
     m_backRotation = new QGraphicsRotation(this);
     m_frontRotation = new QGraphicsRotation(this);
-    m_sLayout = new StackedLayout;
+    m_wLayout = new StackedLayout;
 }
 
 RotationStackedAnimation::~RotationStackedAnimation()
 {
-    delete m_sLayout;
+    delete m_wLayout.data();
 }
 
 void RotationStackedAnimation::setMovementDirection(const qint8 &direction)
@@ -147,15 +147,17 @@ void RotationStackedAnimation::setBackWidget(QGraphicsWidget *backWidget)
 {
     m_backWidget = backWidget;
 
-    if(targetWidget()) {
+    StackedLayout *layout = m_wLayout.data();
-        m_sLayout->addWidget(targetWidget());
+
-        m_sLayout->addWidget(m_backWidget.data());
+    if(targetWidget() && backWidget && layout) {
+        layout->addWidget(targetWidget());
+        layout->addWidget(backWidget);
     }
 }
 
 QGraphicsLayoutItem *RotationStackedAnimation::layout()
 {
-    return m_sLayout;
+    return m_wLayout.data();
 }
 
 void RotationStackedAnimation::updateState(QAbstractAnimation::State newState,
@@ -172,14 +174,19 @@ void RotationStackedAnimation::updateCurrentTime(int currentTime)
         return;
     }
 
+    StackedLayout *layout = m_wLayout.data();
+    if (!layout) {
+        return;
+    }
+
     qreal delta;
     if (currentTime <= duration()/2) {
-        m_sLayout->setCurrentWidgetIndex(0);
+        layout->setCurrentWidgetIndex(0);
         delta = easingCurve().valueForProgress((currentTime*2) / qreal(duration()));
         delta *= sideAngle;
         m_frontRotation->setAngle(delta);
     } else {
-        m_sLayout->setCurrentWidgetIndex(1);
+        layout->setCurrentWidgetIndex(1);
         delta = 1 - easingCurve().valueForProgress(((currentTime*2) - duration()) / qreal(duration()));
         delta = -delta;
         delta *= sideAngle;

animations/rotationstacked_p.h

@@ -112,13 +112,12 @@ private:
     MovementDirection m_animDirection;
     /**  Object the animation(s) should act upon. */
     QWeakPointer<QGraphicsWidget> m_backWidget;
+    /** Layout where widget would be added */
+    QWeakPointer<StackedLayout> m_wLayout;
     /** Back Widget Rotation transform object */
     QGraphicsRotation *m_backRotation;
     /** Front Widget Rotation transform object */
     QGraphicsRotation *m_frontRotation;
-    /** rotation stacked layout where the widget would be added */
-    StackedLayout *m_sLayout;
-
 };
 } // Plasma
 

animations/stackedlayout.cpp

@@ -21,7 +21,7 @@
 #include <QDebug>
 
 StackedLayout::StackedLayout(QGraphicsLayoutItem *parent)
-    : QGraphicsLayout(parent), m_currentWidgetIndex(-1)
+    : QObject(0), m_currentWidgetIndex(-1), QGraphicsLayout(parent)
 {
 }
 

animations/stackedlayout.h

@@ -20,8 +20,11 @@
 
 #include <QGraphicsLayout>
 #include <QList>
+#include <QObject>
 
-class StackedLayout : public QGraphicsLayout {
+class StackedLayout : public QObject, public QGraphicsLayout
+{
+Q_OBJECT
     public:
         explicit StackedLayout(QGraphicsLayoutItem *parent = 0);
         ~StackedLayout();