[PATCH 3/6] Don't bother null checking before calling delete.

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index de411aaa4b80a68c860180c2f720cc76cec8cc12..bd6f955e8ea5ef0aa7ec00cdd51b0cda684c4121 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -326,15 +326,15 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 m_dragItem->updateKeyFramePos(keyFramePos, pos);
             }
 
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animation = NULL;
-            if (m_visualTip) delete m_visualTip;
+            delete m_visualTip;
             m_visualTip = NULL;
             return;
         } else if (m_operationMode == MOVEGUIDE) {
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animation = NULL;
-            if (m_visualTip) delete m_visualTip;
+            delete m_visualTip;
             m_visualTip = NULL;
             QGraphicsView::mouseMoveEvent(event);
             return;
@@ -385,7 +385,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             return;
         } else {
             if (m_visualTip) {
-                if (m_animation) delete m_animation;
+                delete m_animation;
                 m_animation = NULL;
                 m_animationTimer->stop();
                 delete m_visualTip;
@@ -546,7 +546,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             slotCheckPositionScrolling();
         } else m_moveOpMode = NONE;
         if (m_visualTip) {
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animationTimer->stop();
             m_animation = NULL;
             delete m_visualTip;
@@ -3580,14 +3580,10 @@ void CustomTrackView::setScale(double scaleFactor)
     m_scene->setScale(scaleFactor);
     //scale(scaleFactor, 1);
     m_animationTimer->stop();
-    if (m_visualTip) {
-        delete m_visualTip;
-        m_visualTip = NULL;
-    }
-    if (m_animation) {
-        delete m_animation;
-        m_animation = NULL;
-    }
+    delete m_visualTip;
+    m_visualTip = NULL;
+    delete m_animation;
+    m_animation = NULL;
 
     //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height());
     setMatrix(matrix);