Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / transition.h

diff --git a/src/transition.h b/src/transition.h
index 41f7d7da5daf45ecc1730cf4a70d6b7b9c781c74..088fa15a4c220461b3023b67914fb405c244c9b0 100644 (file)
--- a/src/transition.h
+++ b/src/transition.h
@@ -23,7 +23,6 @@
 #include <QPixmap>
 #include <QDomElement>
 #include <QMap>
-#include <QLinearGradient>
 
 #include "gentime.h"
 #include "definitions.h"
@@ -36,11 +35,12 @@
 
 class ClipItem;
 
-class Transition : public AbstractClipItem {
+class Transition : public AbstractClipItem
+{
     Q_OBJECT
 public:
 
-    Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params = QDomElement());
+    Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params = QDomElement(), bool automaticTransition = false);
     virtual ~Transition();
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
@@ -61,21 +61,27 @@ public:
     void setTransitionParameters(const QDomElement params);
     void setTransitionDirection(bool inv);
     void setTransitionTrack(int track);
-    QPixmap transitionPixmap() const;
     //Transition *reparent(ClipItem * clip);
     bool isValid() const;
     /** Transition should be linked to another track */
     void updateTransitionEndTrack(int newtrack);
+    void setForcedTrack(bool force, int track);
+    bool forcedTrack() const;
     const ClipItem *referencedClip() const;
     Transition *clone();
+    bool isAutomatic() const;
+    void setAutomatic(bool automatic);
+    bool hasGeometry();
 
 protected:
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 
 private:
-    bool m_singleClip;
-    QLinearGradient m_gradient;
     QString m_name;
+    bool m_forceTransitionTrack;
+
+    /** true if the transition was added automatically and should be moved with its clip */
+    bool m_automaticTransition;
     /** contains the transition parameters */
     QDomElement m_parameters;
     /** The clip to which the transition is attached */