Remove m_doIt from several QUndoCommand subclasses.

Some command objects do not actually make use of the m_doIt
member variable.  Remove the member variable from these classes
and update the constructors and all callers.

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
svn path=/trunk/kdenlive/; revision=3217

diff --git a/src/addmarkercommand.cpp b/src/addmarkercommand.cpp
index e3287ec96a66ec85f815d816cca9d2a3a6eb336c..adec5022b383ab9bd4840c02a469b0ddac6be097 100644 (file)
--- a/src/addmarkercommand.cpp
+++ b/src/addmarkercommand.cpp
@@ -21,7 +21,7 @@
 
 #include <KLocale>
 
-AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos), m_doIt(doIt)
+AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos)
 {
     if (m_comment.isEmpty()) setText(i18n("Delete marker"));
     else if (m_oldcomment.isEmpty()) setText(i18n("Add marker"));
@@ -37,9 +37,6 @@ void AddMarkerCommand::undo()
 // virtual
 void AddMarkerCommand::redo()
 {
-    if (m_doIt) {
         m_view->addMarker(m_id, m_pos, m_comment);
-    }
-    m_doIt = true;
 }
 

diff --git a/src/addmarkercommand.h b/src/addmarkercommand.h
index 483d9bcf392a4077e71aee54b9ef73896d26cfde..c89d0c6748fac14a7d23b6f0dafe2e82f2b74131 100644 (file)
--- a/src/addmarkercommand.h
+++ b/src/addmarkercommand.h
@@ -32,7 +32,7 @@ class CustomTrackView;
 class AddMarkerCommand : public QUndoCommand
 {
 public:
-    AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, bool doIt, QUndoCommand * parent = 0);
+    AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
@@ -42,7 +42,6 @@ private:
     QString m_comment;
     QString m_id;
     GenTime m_pos;
-    bool m_doIt;
 };
 
 #endif

diff --git a/src/addtrackcommand.cpp b/src/addtrackcommand.cpp
index 7fe8087aac2ea3d52a00e6adcc56428bc05db5eb..89bf7deb7cf5550c01c3a1259734e9a311ec32b5 100644 (file)
--- a/src/addtrackcommand.cpp
+++ b/src/addtrackcommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_info(info), m_addTrack(addTrack), m_doIt(doIt)
+AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_info(info), m_addTrack(addTrack)
 {
     if (addTrack) setText(i18n("Add track"));
     else setText(i18n("Delete track"));
@@ -34,7 +34,6 @@ AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info,
 void AddTrackCommand::undo()
 {
 // kDebug()<<"----  undoing action";
-    m_doIt = true;
     if (m_addTrack) m_view->removeTrack(m_ix);
     else m_view->addTrack(m_info, m_ix);
 }
@@ -42,10 +41,7 @@ void AddTrackCommand::undo()
 void AddTrackCommand::redo()
 {
     kDebug() << "----  redoing action";
-    if (m_doIt) {
         if (m_addTrack) m_view->addTrack(m_info, m_ix);
         else m_view->removeTrack(m_ix);
-    }
-    m_doIt = true;
 }
 

diff --git a/src/addtrackcommand.h b/src/addtrackcommand.h
index 595c65ca23812e2b82e833b9a8fbb4a31c4af273..3e54191d50a93973e54482ba67c86608d5942a2c 100644 (file)
--- a/src/addtrackcommand.h
+++ b/src/addtrackcommand.h
@@ -33,14 +33,13 @@ class CustomTrackView;
 class AddTrackCommand : public QUndoCommand
 {
 public:
-    AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, bool doIt, QUndoCommand * parent = 0);
+    AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
 private:
     CustomTrackView *m_view;
     int m_ix;
-    bool m_doIt;
     bool m_addTrack;
     TrackInfo m_info;
 };

diff --git a/src/changecliptypecommand.cpp b/src/changecliptypecommand.cpp
index cfae86569234822d3a02524fc845204684bee3d8..d5c9e31fa3acbc6f9c6d67083480d883b06d7470 100644 (file)
--- a/src/changecliptypecommand.cpp
+++ b/src/changecliptypecommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_videoOnly(videoOnly), m_audioOnly(audioOnly), m_originalVideoOnly(originalVideo), m_originalAudioOnly(originalAudio), m_doIt(doIt)
+ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_videoOnly(videoOnly), m_audioOnly(audioOnly), m_originalVideoOnly(originalVideo), m_originalAudioOnly(originalAudio)
 {
     setText(i18n("Change clip type"));
 }
@@ -32,15 +32,12 @@ ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int tr
 void ChangeClipTypeCommand::undo()
 {
 // kDebug()<<"----  undoing action";
-    m_doIt = true;
     m_view->doChangeClipType(m_pos, m_track, m_originalVideoOnly, m_originalAudioOnly);
 }
 // virtual
 void ChangeClipTypeCommand::redo()
 {
     kDebug() << "----  redoing action";
-    if (m_doIt)
         m_view->doChangeClipType(m_pos, m_track, m_videoOnly, m_audioOnly);
-    m_doIt = true;
 }
 

diff --git a/src/changecliptypecommand.h b/src/changecliptypecommand.h
index 17d2313cdeae9e2294585cfb75dce577614896b9..c9cc82cbe9afc7b7f38cc9b3d707da5a4c389eed 100644 (file)
--- a/src/changecliptypecommand.h
+++ b/src/changecliptypecommand.h
@@ -34,7 +34,7 @@ class CustomTrackView;
 class ChangeClipTypeCommand : public QUndoCommand
 {
 public:
-    ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, bool doIt, QUndoCommand * parent = 0);
+    ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
@@ -46,7 +46,6 @@ private:
     bool m_audioOnly;
     bool m_originalVideoOnly;
     bool m_originalAudioOnly;
-    bool m_doIt;
 };
 
 #endif

diff --git a/src/changespeedcommand.cpp b/src/changespeedcommand.cpp
index 38b5f2e1e2b586b09647cb3820b0188ccb1cbe58..f99baead29861b6fa73488baf57654a5112e8804 100644 (file)
--- a/src/changespeedcommand.cpp
+++ b/src/changespeedcommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId), m_doIt(doIt)
+ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId)
 {
     setText(i18n("Adjust clip length"));
 }
@@ -37,10 +37,7 @@ void ChangeSpeedCommand::undo()
 // virtual
 void ChangeSpeedCommand::redo()
 {
-    if (m_doIt) {
         m_view->doChangeClipSpeed(m_clipInfo, m_new_speed, m_old_speed, m_clipId);
-    }
-    m_doIt = true;
 }
 
 

diff --git a/src/changespeedcommand.h b/src/changespeedcommand.h
index 7852843ffedb68c3bd0da86624ee55d1cfb0a5f8..ab1c5b41d579c74b05862ccefee8871c20808b2e 100644 (file)
--- a/src/changespeedcommand.h
+++ b/src/changespeedcommand.h
@@ -33,7 +33,7 @@ class CustomTrackView;
 class ChangeSpeedCommand : public QUndoCommand
 {
 public:
-    ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, bool doIt, QUndoCommand * parent = 0);
+    ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
@@ -41,7 +41,6 @@ private:
     CustomTrackView *m_view;
     ItemInfo m_clipInfo;
     QString m_clipId;
-    bool m_doIt;
     double m_old_speed;
     double m_new_speed;
 };

diff --git a/src/changetrackcommand.cpp b/src/changetrackcommand.cpp
index b33a2d04b804c551ddcf97a5ba3b953dd61ceff4..da87e7d7c548239f83d203e1550d2f128f1211a2 100644 (file)
--- a/src/changetrackcommand.cpp
+++ b/src/changetrackcommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_oldinfo(oldInfo), m_newinfo(newInfo), m_doIt(doIt)
+ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_oldinfo(oldInfo), m_newinfo(newInfo)
 {
     setText(i18n("Change track type"));
 }
@@ -33,13 +33,11 @@ ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo
 void ChangeTrackCommand::undo()
 {
 // kDebug()<<"----  undoing action";
-    m_doIt = true;
     m_view->changeTrack(m_ix, m_oldinfo);
 }
 // virtual
 void ChangeTrackCommand::redo()
 {
-    if (m_doIt) m_view->changeTrack(m_ix, m_newinfo);
-    m_doIt = true;
+    m_view->changeTrack(m_ix, m_newinfo);
 }
 

diff --git a/src/changetrackcommand.h b/src/changetrackcommand.h
index 85d871f991844dd4f05955d85856f1a14f3690c1..6114e964ab1445751d195cf574af65b307d41ded 100644 (file)
--- a/src/changetrackcommand.h
+++ b/src/changetrackcommand.h
@@ -33,14 +33,13 @@ class CustomTrackView;
 class ChangeTrackCommand : public QUndoCommand
 {
 public:
-    ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, bool doIt, QUndoCommand * parent = 0);
+    ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
 private:
     CustomTrackView *m_view;
     int m_ix;
-    bool m_doIt;
     TrackInfo m_oldinfo;
     TrackInfo m_newinfo;
 };

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index f10b6cf1c58c4a4b9c4fd60d7fbe6a2ee059b54d..435c9ef21a4d7e596ca75a240cc0b3fb1e5ec1d3 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -691,7 +691,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             return;
         }
         AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
-        RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true);
+        RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()));
         m_document->renderer()->pause();
         m_commandStack->push(command);
         m_document->setModified(true);
@@ -1337,7 +1337,7 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool
 
 void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos)
 {
-    MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos, true);
+    MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos);
     m_commandStack->push(command);
     m_document->setModified(true);
 }
@@ -1832,7 +1832,7 @@ void CustomTrackView::slotSwitchTrackAudio(int ix)
 void CustomTrackView::slotSwitchTrackLock(int ix)
 {
     int tracknumber = m_document->tracksCount() - ix - 1;
-    LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked, true);
+    LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked);
     m_commandStack->push(command);
 }
 
@@ -2033,7 +2033,7 @@ void CustomTrackView::deleteClip(const QString &clipId)
                 count++;
                 if (item->parentItem()) {
                     // Clip is in a group, destroy the group
-                    new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, true, deleteCommand);
+                    new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, deleteCommand);
                 }
                 new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand);
             }
@@ -2648,7 +2648,7 @@ void CustomTrackView::deleteSelectedClips()
                 }
             }
             if (clipInfos.count() > 0) {
-                new GroupClipsCommand(this, clipInfos, transitionInfos, false, true, deleteSelected);
+                new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected);
             }
         }
     }
@@ -2693,7 +2693,7 @@ void CustomTrackView::changeClipSpeed()
             double speed = (double) percent / 100.0;
             if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) {
                 count++;
-                new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
+                new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected);
             }
         }
     }
@@ -2731,7 +2731,7 @@ void CustomTrackView::cutSelectedClips()
             if (item->parentItem() && item->parentItem() != m_selectionGroup) {
                 emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage);
             } else if (currentPos > item->startPos() && currentPos <  item->endPos()) {
-                RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true);
+                RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos);
                 m_commandStack->push(command);
             }
         }
@@ -2763,7 +2763,7 @@ void CustomTrackView::groupClips(bool group)
         }
     }
     if (clipInfos.count() > 0) {
-        GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group, true);
+        GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
         m_commandStack->push(command);
     }
 }
@@ -3398,13 +3398,13 @@ void CustomTrackView::clipEnd()
 void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c)
 {
     QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t);
-    AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true);
+    AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t);
     m_commandStack->push(command);
 }
 
 void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position)
 {
-    AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true);
+    AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position);
     m_commandStack->push(command);
 }
 
@@ -3421,7 +3421,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id)
     deleteMarkers->setText("Delete clip markers");
 
     for (int i = 0; i < markers.size(); i++) {
-        new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), true, deleteMarkers);
+        new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), deleteMarkers);
     }
     m_commandStack->push(deleteMarkers);
 }
@@ -4032,7 +4032,7 @@ void CustomTrackView::slotInsertTrack(int ix)
             info.isBlind = true;
             info.isLocked = false;
         }
-        AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true);
+        AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true);
         m_commandStack->push(addTrack);
         m_document->setModified(true);
     }
@@ -4046,7 +4046,7 @@ void CustomTrackView::slotDeleteTrack(int ix)
         TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
         deleteTimelineTrack(ix, info);
         m_document->setModified(true);
-        /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false, true);
+        /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false);
         m_commandStack->push(command);*/
     }
 }
@@ -4106,14 +4106,14 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
         }
     }
 
-    new AddTrackCommand(this, ix, trackinfo, false, true, deleteTrack);
+    new AddTrackCommand(this, ix, trackinfo, false, deleteTrack);
     m_commandStack->push(deleteTrack);
 }
 
 void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo)
 {
     TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
-    ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true);
+    ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo);
     m_commandStack->push(changeTrack);
 }
 
@@ -4236,7 +4236,7 @@ void CustomTrackView::splitAudio()
                 if (clip->parentItem()) {
                     emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage);
                 } else {
-                    new SplitAudioCommand(this, clip->track(), clip->startPos(), true, splitCommand);
+                    new SplitAudioCommand(this, clip->track(), clip->startPos(), splitCommand);
                 }
             }
         }
@@ -4330,7 +4330,7 @@ void CustomTrackView::setVideoOnly()
                 if (clip->parentItem()) {
                     emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
                 } else {
-                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand);
                 }
             }
         }
@@ -4355,7 +4355,7 @@ void CustomTrackView::setAudioOnly()
                 if (clip->parentItem()) {
                     emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
                 } else {
-                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand);
                 }
             }
         }
@@ -4380,7 +4380,7 @@ void CustomTrackView::setAudioAndVideo()
                 if (clip->parentItem()) {
                     emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
                 } else {
-                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, false, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+                    new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand);
                 }
             }
         }

diff --git a/src/groupclipscommand.cpp b/src/groupclipscommand.cpp
index 66e565d554104a4d40d63fe615597691d23b345f..dc46fcff7768d670bf0ffcdb9a662b61b8a0caa5 100644 (file)
--- a/src/groupclipscommand.cpp
+++ b/src/groupclipscommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clips(clipInfos), m_transitions(transitionInfos), m_group(group), m_doIt(doIt)
+GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clips(clipInfos), m_transitions(transitionInfos), m_group(group)
 {
     if (m_group) setText(i18n("Group clips"));
     else setText(i18n("Ungroup clips"));
@@ -34,15 +34,12 @@ GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList <ItemInf
 void GroupClipsCommand::undo()
 {
 // kDebug()<<"----  undoing action";
-    m_doIt = true;
     m_view->doGroupClips(m_clips, m_transitions, !m_group);
 }
 // virtual
 void GroupClipsCommand::redo()
 {
     kDebug() << "----  redoing action";
-    if (m_doIt)
         m_view->doGroupClips(m_clips, m_transitions, m_group);
-    m_doIt = true;
 }
 

diff --git a/src/groupclipscommand.h b/src/groupclipscommand.h
index 5595a9b541296b56f6519f01f529734539d50235..1a8ef7edb190fba30e38c03bec0cf8148c400793 100644 (file)
--- a/src/groupclipscommand.h
+++ b/src/groupclipscommand.h
@@ -34,7 +34,7 @@ class CustomTrackView;
 class GroupClipsCommand : public QUndoCommand
 {
 public:
-    GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, bool doIt, QUndoCommand * parent = 0);
+    GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
@@ -42,7 +42,6 @@ private:
     CustomTrackView *m_view;
     const QList <ItemInfo> m_clips;
     const QList <ItemInfo> m_transitions;
-    bool m_doIt;
     bool m_group;
 };
 

diff --git a/src/locktrackcommand.cpp b/src/locktrackcommand.cpp
index e8571d89a6102f9e857d6da833b74376a64d2104..4eb8cc08d0cfc742e02f3405178d26d60474aeaf 100644 (file)
--- a/src/locktrackcommand.cpp
+++ b/src/locktrackcommand.cpp
@@ -22,7 +22,7 @@
 
 #include <KLocale>
 
-LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_lock(lock), m_doIt(doIt)
+LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_lock(lock)
 {
     if (lock) setText(i18n("Lock track"));
     else setText(i18n("Unlock track"));
@@ -37,10 +37,7 @@ void LockTrackCommand::undo()
 // virtual
 void LockTrackCommand::redo()
 {
-    if (m_doIt) {
         m_view->lockTrack(m_ix, m_lock);
-    }
-    m_doIt = true;
 }
 
 

diff --git a/src/locktrackcommand.h b/src/locktrackcommand.h
index 6d40a24c74f34ce7f4e4b9c1a5f10b7f0f0610f3..1d17a634fceb07e19629c0e4167c58286e9f772a 100644 (file)
--- a/src/locktrackcommand.h
+++ b/src/locktrackcommand.h
@@ -29,14 +29,13 @@ class CustomTrackView;
 class LockTrackCommand : public QUndoCommand
 {
 public:
-    LockTrackCommand(CustomTrackView *view, int ix, bool lock, bool doIt, QUndoCommand * parent = 0);
+    LockTrackCommand(CustomTrackView *view, int ix, bool lock, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
 private:
     CustomTrackView *m_view;
     int m_ix;
-    bool m_doIt;
     bool m_lock;
 };
 

diff --git a/src/moveeffectcommand.cpp b/src/moveeffectcommand.cpp
index 74f8939f1b933871493548138f865949eb03351e..1d1c34e8b3b8d3e731a614042cbf090c82cf2de4 100644 (file)
--- a/src/moveeffectcommand.cpp
+++ b/src/moveeffectcommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos), m_doIt(doIt)
+MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos)
 {
     /*    QString effectName;
         QDomNode namenode = effect.elementsByTagName("name").item(0);

diff --git a/src/moveeffectcommand.h b/src/moveeffectcommand.h
index 0a75e71db332e54290640403875082b8546377ba..790390ac2a9f1d8cf80b9335bf97df5ec42782d3 100644 (file)
--- a/src/moveeffectcommand.h
+++ b/src/moveeffectcommand.h
@@ -31,7 +31,7 @@ class CustomTrackView;
 class MoveEffectCommand : public QUndoCommand
 {
 public:
-    MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt, QUndoCommand * parent = 0);
+    MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, QUndoCommand * parent = 0);
 
     virtual int id() const;
     virtual bool mergeWith(const QUndoCommand * command);
@@ -44,7 +44,6 @@ private:
     int m_oldindex;
     int m_newindex;
     GenTime m_pos;
-    bool m_doIt;
 };
 
 #endif

diff --git a/src/razorclipcommand.cpp b/src/razorclipcommand.cpp
index 4b6a50c658988668c0801ab6c288e1e6183e79e6..32f4194dacfc16bdfd77342a83f32e19ca02e4a6 100644 (file)
--- a/src/razorclipcommand.cpp
+++ b/src/razorclipcommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_cutTime(cutTime), m_doIt(doIt)
+RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_cutTime(cutTime)
 {
     setText(i18n("Razor clip"));
 }
@@ -32,15 +32,12 @@ RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, c
 void RazorClipCommand::undo()
 {
     // kDebug()<<"----  undoing action";
-    m_doIt = true;
     m_view->cutClip(m_info, m_cutTime, false);
 }
 // virtual
 void RazorClipCommand::redo()
 {
     // kDebug() << "----  redoing action cut: " << m_cutTime.frames(25);
-    if (m_doIt)
         m_view->cutClip(m_info, m_cutTime, true);
-    m_doIt = true;
 }
 

diff --git a/src/razorclipcommand.h b/src/razorclipcommand.h
index afaa2425304d5711d5000df936fedbb8c2cedf08..4bfc9e9378159fa932685344f0132f632e7f27c6 100644 (file)
--- a/src/razorclipcommand.h
+++ b/src/razorclipcommand.h
@@ -32,7 +32,7 @@ class CustomTrackView;
 class RazorClipCommand : public QUndoCommand
 {
 public:
-    RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt, QUndoCommand * parent = 0);
+    RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
@@ -40,7 +40,6 @@ private:
     CustomTrackView *m_view;
     ItemInfo m_info;
     GenTime m_cutTime;
-    bool m_doIt;
 };
 
 #endif

diff --git a/src/splitaudiocommand.cpp b/src/splitaudiocommand.cpp
index 9fa61ffaa86e38768c02203be619bae8d18fbdbf..5a81b03d807c7f05bef8f9c380520a887e04b91a 100644 (file)
--- a/src/splitaudiocommand.cpp
+++ b/src/splitaudiocommand.cpp
@@ -23,7 +23,7 @@
 
 #include <KLocale>
 
-SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_doIt(doIt)
+SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos)
 {
     setText(i18n("Split audio"));
 }
@@ -32,15 +32,12 @@ SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, con
 void SplitAudioCommand::undo()
 {
 // kDebug()<<"----  undoing action";
-    m_doIt = true;
     m_view->doSplitAudio(m_pos, m_track, false);
 }
 // virtual
 void SplitAudioCommand::redo()
 {
     kDebug() << "----  redoing action";
-    if (m_doIt)
         m_view->doSplitAudio(m_pos, m_track, true);
-    m_doIt = true;
 }
 

diff --git a/src/splitaudiocommand.h b/src/splitaudiocommand.h
index e833a91b53ece9c260be94b7622fde62336fc0eb..6922d7838999133beaca56cc6fbafd91e6940833 100644 (file)
--- a/src/splitaudiocommand.h
+++ b/src/splitaudiocommand.h
@@ -34,7 +34,7 @@ class CustomTrackView;
 class SplitAudioCommand : public QUndoCommand
 {
 public:
-    SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, bool doIt, QUndoCommand * parent = 0);
+    SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
@@ -42,7 +42,6 @@ private:
     CustomTrackView *m_view;
     const GenTime m_pos;
     const int m_track;
-    bool m_doIt;
 };
 
 #endif