Integrate with the required MLT hooks for getting Movit to work.

[kdenlive] / src / commands / moveeffectcommand.cpp

diff --git a/src/commands/moveeffectcommand.cpp b/src/commands/moveeffectcommand.cpp
index 5be578e290608d8cf12e890ccbb513f09cbe35fa..a96fcc4016e1f42d40796c505b5b59f36863309f 100644 (file)
--- a/src/commands/moveeffectcommand.cpp
+++ b/src/commands/moveeffectcommand.cpp
@@ -21,7 +21,7 @@
 #include "moveeffectcommand.h"
 #include "customtrackview.h"
 
-#include <KLocale>
+#include <KLocalizedString>
 #include <KDebug>
 
 MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, const GenTime &pos, const QList<int> &oldPos, int newPos, QUndoCommand * parent) :
@@ -51,13 +51,16 @@ int MoveEffectCommand::id() const
 // virtual
 bool MoveEffectCommand::mergeWith(const QUndoCommand * other)
 {
+    Q_UNUSED(other)
     return false;
+    /* dead code (flaged by coverity), was removed to avoid crash when dropping on group
     if (other->id() != id()) return false;
     if (m_track != static_cast<const MoveEffectCommand*>(other)->m_track) return false;
     if (m_pos != static_cast<const MoveEffectCommand*>(other)->m_pos) return false;
     m_oldindex = static_cast<const MoveEffectCommand*>(other)->m_oldindex;
     m_newindex = static_cast<const MoveEffectCommand*>(other)->m_newindex;
     return true;
+    */
 }
 
 // virtual