Fix encoding problem in renderer:

[kdenlive] / src / editguidecommand.cpp

diff --git a/src/editguidecommand.cpp b/src/editguidecommand.cpp
index 946d61686dd0122bfb7cc9c9d5707d6fc9a84905..20933a3c8e760fe06e0b7b04b4e8cdd7cd765ae5 100644 (file)
--- a/src/editguidecommand.cpp
+++ b/src/editguidecommand.cpp
@@ -14,29 +14,40 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
+
 
 #include "editguidecommand.h"
 #include "customtrackview.h"
 
-EditGuideCommand::EditGuideCommand(CustomTrackView *view, const GenTime oldPos, const QString &oldcomment, const GenTime pos, const QString &comment, bool doIt) : m_view(view), m_oldPos(oldPos), m_oldcomment(oldcomment), m_pos(pos), m_comment(comment), m_doIt(doIt) {
+#include <KLocale>
+
+EditGuideCommand::EditGuideCommand(CustomTrackView *view, const GenTime oldPos, const QString &oldcomment, const GenTime pos, const QString &comment, bool doIt, QUndoCommand * parent) :
+        QUndoCommand(parent),
+        m_view(view),
+        m_oldcomment(oldcomment),
+        m_comment(comment),
+        m_oldPos(oldPos),
+        m_pos(pos),
+        m_doIt(doIt)
+{
     if (m_oldcomment.isEmpty()) setText(i18n("Add guide"));
     else if (m_oldPos == m_pos) setText(i18n("Edit guide"));
+    else if (m_pos <= GenTime()) setText(i18n("Delete guide"));
     else setText(i18n("Move guide"));
-    kDebug() << "///  CREATE GUIDE COMMAND, TIMES: " << m_oldPos.frames(25) << "x" << m_pos.frames(25);
 }
 
 
 // virtual
-void EditGuideCommand::undo() {
+void EditGuideCommand::undo()
+{
     m_view->editGuide(m_pos, m_oldPos, m_oldcomment);
 }
 // virtual
-void EditGuideCommand::redo() {
+void EditGuideCommand::redo()
+{
     if (m_doIt) {
         m_view->editGuide(m_oldPos, m_pos, m_comment);
     }
     m_doIt = true;
 }
 
-#include "editguidecommand.moc"