Merge branch 'master' into feature/pkey

[kdenlive] / src / transition.h

diff --git a/src/transition.h b/src/transition.h
index a904d1d670fb03b9882a51175fa7ad9f9c68d7f4..a26f19d17511b55e6a03f551cfb52fe7b914f588 100644 (file)
--- a/src/transition.h
+++ b/src/transition.h
@@ -41,7 +41,7 @@ class Transition : public AbstractClipItem
     Q_OBJECT
 public:
 
-    Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params = QDomElement(), bool automaticTransition = false);
+    Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params = QDomElement(), bool automaticTransition = false);
     virtual ~Transition();
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
@@ -55,7 +55,6 @@ public:
     int transitionEndTrack() const;
     bool hasClip(const ClipItem * clip) const;
     bool belongsToClip(const ClipItem * clip) const;
-    bool invertedTransition() const;
     QString transitionTag() const;
     QStringList transitionInfo() const;
     OPERATIONTYPE operationMode(QPointF pos);
@@ -63,10 +62,7 @@ public:
     static int itemOffset();
     //const QMap < QString, QString > transitionParameters() const;
     void setTransitionParameters(const QDomElement params);
-    void setTransitionDirection(bool inv);
     void setTransitionTrack(int track);
-    //Transition *reparent(ClipItem * clip);
-    bool isValid() const;
 
     /** @brief Links the transition to another track.
      *
@@ -108,10 +104,6 @@ private:
 
     /** @brief Returns the transition type for a given name. */
     TRANSITIONTYPE getTransitionForName(const QString & type);
-
-#if QT_VERSION >= 0x040600
-    QPropertyAnimation *m_startAnimation;
-#endif
 };
 
 #endif