[vlmc-devel] Commands: Don't take QUndoCommand as an argument

[Yikai Lu]

vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Wed May 31 15:05:20 2017 +0900| [5f9f2a09d6a6a9f16820ec57d376aa77307c3ba6] | committer: Yikai Lu

Commands: Don't take QUndoCommand as an argument

> https://code.videolan.org/videolan/vlmc/commit/5f9f2a09d6a6a9f16820ec57d376aa77307c3ba6
---

 src/Commands/Commands.cpp | 6 +++---
 src/Commands/Commands.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Commands/Commands.cpp b/src/Commands/Commands.cpp
index dfe194d9..09ea8e8e 100644
--- a/src/Commands/Commands.cpp
+++ b/src/Commands/Commands.cpp
@@ -166,7 +166,7 @@ Commands::Clip::Move::id() const
 }
 
 bool
-Commands::Clip::Move::mergeWith( const QUndoCommand* command )
+Commands::Clip::Move::mergeWith( const Generic* command )
 {
     auto cmd = static_cast<const Move*>( command );
     if ( cmd->m_infos.count() > 1 )
@@ -221,7 +221,7 @@ Commands::Clip::Remove::id() const
 }
 
 bool
-Commands::Clip::Remove::mergeWith(const QUndoCommand* command)
+Commands::Clip::Remove::mergeWith( const Generic* command )
 {
     auto cmd = static_cast<const Remove*>( command );
     if ( cmd->m_clips.count() > 1 )
@@ -280,7 +280,7 @@ Commands::Clip::Resize::retranslate()
 }
 
 bool
-Commands::Clip::Resize::mergeWith( const QUndoCommand* command )
+Commands::Clip::Resize::mergeWith( const Generic* command )
 {
     auto cmd = static_cast<const Resize*>( command );
     if ( cmd->m_infos.count() > 1 )
diff --git a/src/Commands/Commands.h b/src/Commands/Commands.h
index 7fbfaf30..345c897e 100644
--- a/src/Commands/Commands.h
+++ b/src/Commands/Commands.h
@@ -110,7 +110,7 @@ namespace Commands
                 virtual void    internalUndo();
                 virtual void    retranslate();
                 virtual int     id() const;
-                virtual bool    mergeWith( const QUndoCommand* command );
+                virtual bool    mergeWith( const Generic* command );
 
             private:
                 std::shared_ptr<SequenceWorkflow> m_workflow;
@@ -133,7 +133,7 @@ namespace Commands
                 virtual void internalUndo();
                 virtual void    retranslate();
                 virtual int     id() const;
-                virtual bool    mergeWith( const QUndoCommand* command );
+                virtual bool    mergeWith( const Generic* command );
 
             private:
                 std::shared_ptr<SequenceWorkflow>       m_workflow;
@@ -155,7 +155,7 @@ namespace Commands
                 virtual void    internalRedo();
                 virtual void    internalUndo();
                 virtual void    retranslate();
-                virtual bool    mergeWith( const QUndoCommand* cmd );
+                virtual bool    mergeWith( const Generic* cmd );
                 virtual int     id() const;
 
             private: