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 30b8137951f3dd2e7ac9e94a3d4229a669c50220..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,7 +35,8 @@
 
 class ClipItem;
 
-class Transition : public AbstractClipItem {
+class Transition : public AbstractClipItem
+{
     Q_OBJECT
 public:
 
@@ -61,22 +61,24 @@ 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;