X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmoveeffectcommand.cpp;h=cfbd76bfd77ac8443909033a724b15f9d664ab13;hb=2553030e55b9872509b433d0eb12b546fa33f7e3;hp=0f7f03c5b63433fb293041e9b76a41880549b6dc;hpb=22450b894d464967c1976d19139ff32954b657a4;p=kdenlive diff --git a/src/moveeffectcommand.cpp b/src/moveeffectcommand.cpp index 0f7f03c5..cfbd76bf 100644 --- a/src/moveeffectcommand.cpp +++ b/src/moveeffectcommand.cpp @@ -17,28 +17,37 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "moveeffectcommand.h" #include "customtrackview.h" -MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt) - : m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos), m_doIt(doIt) { -/* QString effectName; - QDomNode namenode = effect.elementsByTagName("name").item(0); - if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); - else effectName = i18n("effect"); - setText(i18n("Move effect %1", effectName));*/ +#include + +MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_track(track), + m_oldindex(oldPos), + m_newindex(newPos), + m_pos(pos) +{ + /* QString effectName; + QDomNode namenode = effect.elementsByTagName("name").item(0); + if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + else effectName = i18n("effect"); + setText(i18n("Move effect %1", effectName));*/ setText(i18n("Move effect")); } // virtual -int MoveEffectCommand::id() const { +int MoveEffectCommand::id() const +{ return 2; } // virtual -bool MoveEffectCommand::mergeWith(const QUndoCommand * other) { +bool MoveEffectCommand::mergeWith(const QUndoCommand * other) +{ if (other->id() != id()) return false; if (m_track != static_cast(other)->m_track) return false; if (m_pos != static_cast(other)->m_pos) return false; @@ -48,14 +57,15 @@ bool MoveEffectCommand::mergeWith(const QUndoCommand * other) { } // virtual -void MoveEffectCommand::undo() { +void MoveEffectCommand::undo() +{ kDebug() << "---- undoing action"; m_view->moveEffect(m_track, m_pos, m_newindex, m_oldindex); } // virtual -void MoveEffectCommand::redo() { +void MoveEffectCommand::redo() +{ kDebug() << "---- redoing action"; m_view->moveEffect(m_track, m_pos, m_oldindex, m_newindex); } -#include "moveeffectcommand.moc"