X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fediteffectcommand.cpp;h=9bbebc748651bf0efb4652c8098db84ab33a8861;hb=7c066a50b5c795b85b4e94d489dfb18458d7ce7b;hp=191631dc39ae6ff2d27732f29dfc4a4a5979e486;hpb=5ee798aed90c5a3a50024e6b5bd26753e03ec7cc;p=kdenlive

diff --git a/src/editeffectcommand.cpp b/src/editeffectcommand.cpp
index 191631dc..9bbebc74 100644
--- a/src/editeffectcommand.cpp
+++ b/src/editeffectcommand.cpp
@@ -23,15 +23,16 @@
 
 #include <KLocale>
 
-EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, int stackPos, bool doIt) :
+EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, int stackPos, bool doIt, QUndoCommand *parent) :
+        QUndoCommand(parent),
         m_view(view),
         m_track(track),
-        m_pos(pos),
         m_oldeffect(oldeffect),
+        m_effect(effect),
+        m_pos(pos),
         m_stackPos(stackPos),
         m_doIt(doIt)
 {
-    m_effect = effect.cloneNode().toElement();
     QString effectName;
     QDomNode namenode = effect.elementsByTagName("name").item(0);
     if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
@@ -51,20 +52,18 @@ bool EditEffectCommand::mergeWith(const QUndoCommand * other)
     if (other->id() != id()) return false;
     if (m_track != static_cast<const EditEffectCommand*>(other)->m_track) return false;
     if (m_pos != static_cast<const EditEffectCommand*>(other)->m_pos) return false;
-    m_effect = static_cast<const EditEffectCommand*>(other)->m_effect;
+    m_effect = static_cast<const EditEffectCommand*>(other)->m_effect.cloneNode().toElement();
     return true;
 }
 
 // virtual
 void EditEffectCommand::undo()
 {
-    kDebug() << "----  undoing action";
     m_view->updateEffect(m_track, m_pos, m_oldeffect, m_stackPos, false);
 }
 // virtual
 void EditEffectCommand::redo()
 {
-    kDebug() << "----  redoing action";
     m_view->updateEffect(m_track, m_pos, m_effect, m_stackPos, m_doIt);
     m_doIt = false;
 }