From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 11 Feb 2013 22:55:42 +0000 (+0100)
Subject: Fix Coverity #980706
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f3d9d916c7df8860f70a91645577c9590d08d36e;hp=0ef69cc8c8c540530d63cf2b20ec08fc6b6601ed;p=kdenlive

Fix Coverity #980706
---

diff --git a/src/transition.cpp b/src/transition.cpp
index 5b4a7d44..ecdd7086 100644
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -37,7 +37,6 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
         AbstractClipItem(info, QRectF(), fps),
         m_forceTransitionTrack(false),
         m_automaticTransition(automaticTransition),
-        m_secondClip(NULL),
         m_transitionTrack(transitiontrack)
 {
     setZValue(3);
@@ -79,9 +78,6 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
     else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true;
     if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true;
     m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
-    m_secondClip = 0;
-
-    //m_referenceClip->addTransition(this);
 }
 
 Transition::~Transition()
@@ -318,27 +314,6 @@ int Transition::itemOffset()
     return (int) (KdenliveSettings::trackheight() / 3 * 2);
 }
 
-bool Transition::hasClip(const ClipItem * clip) const
-{
-    if (clip == m_secondClip) return true;
-    return false;
-}
-
-bool Transition::belongsToClip(const ClipItem * clip) const
-{
-    if (clip == m_referenceClip) return true;
-    return false;
-}
-
-/*
-Transition *Transition::clone() {
-    return new Transition::Transition(rect(), m_referenceClip, toXML() , m_fps);
-}*/
-
-const ClipItem *Transition::referencedClip() const
-{
-    return m_referenceClip;
-}
 
 QDomElement Transition::toXML()
 {
@@ -350,11 +325,6 @@ QDomElement Transition::toXML()
     m_parameters.setAttribute("end", endPos().frames(m_fps));
     m_parameters.setAttribute("force_track", m_forceTransitionTrack);
     m_parameters.setAttribute("automatic", m_automaticTransition);
-
-    if (m_secondClip) {
-        m_parameters.setAttribute("clipb_starttime", m_secondClip->startPos().frames(m_referenceClip->fps()));
-        m_parameters.setAttribute("clipb_track", transitionEndTrack());
-    }
     return m_parameters.cloneNode().toElement();
 }
 
diff --git a/src/transition.h b/src/transition.h
index b0d43081..e7796655 100644
--- a/src/transition.h
+++ b/src/transition.h
@@ -53,8 +53,6 @@ public:
 
     /** @brief Returns the track number of the transition in the playlist. */
     int transitionEndTrack() const;
-    bool hasClip(const ClipItem * clip) const;
-    bool belongsToClip(const ClipItem * clip) const;
     QString transitionTag() const;
     QStringList transitionInfo() const;
     OPERATIONTYPE operationMode(QPointF pos);
@@ -70,7 +68,6 @@ public:
     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);
@@ -94,11 +91,6 @@ private:
     /** @brief Contains the transition parameters. */
     QDomElement m_parameters;
 
-    /** @brief The clip to which the transition is attached. */
-    ClipItem *m_referenceClip;
-
-    /** @brief The second clip to which the transition is attached. */
-    ClipItem *m_secondClip;
     int m_transitionTrack;
 
     /** @brief Returns the display name for a transition type. */