use const'ref

[kdenlive] / src / keyframehelper.cpp

diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp
index 907e5090a206a727049311c45948a480c6e85c8e..d1d84362e27d4cfb2c9fada761ac322011caefc8 100644 (file)
--- a/src/keyframehelper.cpp
+++ b/src/keyframehelper.cpp
@@ -36,15 +36,17 @@ const int cursorWidth = 6;
 #define SEEK_INACTIVE (-1)
 
 KeyframeHelper::KeyframeHelper(QWidget *parent) :
-        QWidget(parent),
-        m_geom(NULL),
-        m_position(0),
-        m_scale(0),
-        m_movingKeyframe(false),
-        m_lineHeight(9),
-        m_drag(false),
-        m_hoverKeyframe(-1),
-        m_seekPosition(SEEK_INACTIVE)
+        QWidget(parent)
+       , frameLength(1)
+        , m_geom(NULL)
+        , m_position(0)
+        , m_scale(0)
+        , m_movingKeyframe(false)
+       , m_movingItem()
+        , m_lineHeight(9)
+        , m_drag(false)
+        , m_hoverKeyframe(-1)
+        , m_seekPosition(SEEK_INACTIVE)
 {
     setFont(KGlobalSettings::toolBarFont());
     setMouseTracking(true);
@@ -80,16 +82,16 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event)
 
                 while (!m_extraMovingItems.isEmpty()) {
                     Mlt::GeometryItem *gitem = m_extraMovingItems.takeFirst();
-                    delete gitem;
+                    if (gitem) delete gitem;
                 }
                 for (int i = 0; i < m_extraGeometries.count(); i++) {
-                    Mlt::GeometryItem *item2 = new Mlt::GeometryItem();
                     if (m_extraGeometries.at(i)->next_key(item, mousePos) == 0) {
+                       Mlt::GeometryItem *item2 = new Mlt::GeometryItem();
                         item2->x(item.x());
                         item2->frame(item.frame());
                         m_extraMovingItems.append(item2);
                     } else {
-                        delete(item2);
+                        m_extraMovingItems.append(NULL);
                     }
                 }
                 
@@ -168,7 +170,7 @@ void KeyframeHelper::mouseMoveEvent(QMouseEvent * event)
         if (KdenliveSettings::snaptopoints() && qAbs(pos - m_position) < 5) pos = m_position;
         m_movingItem.frame(pos);
         for (int i = 0; i < m_extraMovingItems.count(); i++) {
-            m_extraMovingItems[i]->frame(pos);
+            if (m_extraMovingItems.at(i)) m_extraMovingItems[i]->frame(pos);
         }
         update();
         return;
@@ -209,7 +211,7 @@ void KeyframeHelper::mouseReleaseEvent(QMouseEvent * event)
         m_movingKeyframe = false;
 
         for (int i = 0; i < m_extraGeometries.count(); i++) {
-            m_extraGeometries[i]->insert(m_extraMovingItems.at(i));
+            if (m_extraMovingItems.at(i)) m_extraGeometries[i]->insert(m_extraMovingItems.at(i));
         }
         
         emit keyframeMoved(m_position);
@@ -326,7 +328,7 @@ void KeyframeHelper::setValue(const int pos)
 void KeyframeHelper::setKeyGeometry(Mlt::Geometry *geom, const int length)
 {
     m_geom = geom;
-    frameLength = length;
+    frameLength = qMax(1, length);
     update();
 }