X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fediteffectcommand.h;h=c793fd4f842ac3962644dd5d8ec9b3fb7381b7f1;hb=a6aafb4cb3d09e17564f60bce207e7678b507a95;hp=9f871e196215a385cfbb2f9e1e2112829e4266b1;hpb=69fc8364266f9668d1c77ce09afbbf3b7fec8492;p=kdenlive

diff --git a/src/editeffectcommand.h b/src/editeffectcommand.h
index 9f871e19..c793fd4f 100644
--- a/src/editeffectcommand.h
+++ b/src/editeffectcommand.h
@@ -23,25 +23,30 @@
 
 #include <QUndoCommand>
 #include <KDebug>
+#include <gentime.h>
+#include <QDomElement>
 
-#include "customtrackview.h"
+class CustomTrackView;
 
 class EditEffectCommand : public QUndoCommand
- {
- public:
-     EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt);
+{
+public:
+    EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, int stackPos, bool doIt, QUndoCommand *parent = 0);
 
+    virtual int id() const;
+    virtual bool mergeWith(const QUndoCommand * command);
     virtual void undo();
     virtual void redo();
 
- private:
-     CustomTrackView *m_view;
-     int m_track;
-     QDomElement m_effect;
-     QDomElement m_oldeffect;
-     GenTime m_pos;
-     bool m_doIt;
- };
+private:
+    CustomTrackView *m_view;
+    const int m_track;
+    QDomElement m_oldeffect;
+    QDomElement m_effect;
+    const GenTime m_pos;
+    int m_stackPos;
+    bool m_doIt;
+};
 
 #endif