parent as argument

jmeidow · jmeidow · commit 3f2637271e36 · 2022-05-05T11:31:31.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 build/
 
-# docs/
+docs/
 
 bin/
diff --git a/src/commands.cpp b/src/commands.cpp
@@ -20,7 +20,7 @@
 #include "global.h"
 #include "mainscene.h"
 #include "mainwindow.h"
-#include "uncertain.h"
+// #include "uncertain.h"
 
 #include <QDebug>
 #include <QGraphicsItem>
@@ -29,15 +29,16 @@ namespace Cmd {
 
 GUI::MainScene * Cmd::Undo::s_scene = nullptr;
 
-Undo::Undo()
+Undo::Undo( QUndoCommand *parent) : QUndoCommand(parent)
 {
     qDebug() << Q_FUNC_INFO;
 }
 
 
 AddStroke::AddStroke( State *curr,
                       std::unique_ptr<State> &p,
-                      std::unique_ptr<State> &n)
+                      std::unique_ptr<State> &n,
+                      QUndoCommand *parent) : Undo(parent)
 {
     qDebug() << Q_FUNC_INFO;
     setText( "add stroke" );
@@ -65,7 +66,8 @@ void AddStroke::undo()
 
 DeleteSelection::DeleteSelection( State *st,
                                   std::unique_ptr<State> & p,
-                                  std::unique_ptr<State> & n)
+                                  std::unique_ptr<State> & n,
+                                  QUndoCommand *parent) : Undo(parent)
 {
     setText( QString("delete selected item%1")
              .arg( scene()->selectedItems().size()==1 ? "" : "s") );
@@ -90,7 +92,7 @@ void DeleteSelection::undo()
 }
 
 
-TabulaRasa::TabulaRasa( State *st )
+TabulaRasa::TabulaRasa( State *st, QUndoCommand *parent ) : Undo(parent)
 {
     qDebug() << Q_FUNC_INFO ;
     setText( "clear all" );
@@ -119,7 +121,9 @@ void TabulaRasa::undo()
 ReplaceStateWithFileContent::ReplaceStateWithFileContent( const QString & fileName,
                                                           State *curr,
                                                           std::unique_ptr<State> & p,
-                                                          std::unique_ptr<State> & n)
+                                                          std::unique_ptr<State> & n,
+                                                          QUndoCommand *parent)
+    : Undo(parent)
 {
     qDebug() << Q_FUNC_INFO;
     setText( fileName );
diff --git a/src/commands.h b/src/commands.h
@@ -42,7 +42,7 @@ class Undo : public QUndoCommand
     Undo & operator= (Undo && other) = delete;
 
 protected:
-    Undo();
+    Undo(QUndoCommand *parent=nullptr);
     ~Undo() override = default;
 
     State *current_state_{};
@@ -61,9 +61,10 @@ class Undo : public QUndoCommand
 class AddStroke : public Undo
 {
 public:
-    AddStroke( State *curr,
+    AddStroke(State *curr,
                std::unique_ptr<State> & p,
-               std::unique_ptr<State> & n);
+               std::unique_ptr<State> & n,
+              QUndoCommand *parent=nullptr);
     AddStroke( const AddStroke &) = delete;
     AddStroke( AddStroke &&) = delete;
     AddStroke operator= (const AddStroke &) = delete;
@@ -78,9 +79,10 @@ class AddStroke : public Undo
 class DeleteSelection : public Undo
 {
 public:
-    DeleteSelection( State *st,
+    DeleteSelection(State *st,
                      std::unique_ptr<State> &p,
-                     std::unique_ptr<State> &n);
+                     std::unique_ptr<State> &n,
+                    QUndoCommand *parent=nullptr);
 
 private:
     void redo() override;
@@ -91,7 +93,8 @@ class DeleteSelection : public Undo
 class TabulaRasa : public Undo
 {
 public:
-    TabulaRasa( State *st);
+    TabulaRasa( State *st,
+                QUndoCommand *parent=nullptr);
 private:
     void redo() override;
     void undo() override;
@@ -103,7 +106,8 @@ class ReplaceStateWithFileContent : public Undo
     ReplaceStateWithFileContent( const QString &fileName,
                                  State *curr,
                                  std::unique_ptr<State> &p,
-                                 std::unique_ptr<State> &n);
+                                 std::unique_ptr<State> &n,
+                                 QUndoCommand *parent=nullptr);
 private:
     void redo() override;
     void undo() override;

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 build/
 -# docs/
 +docs/
 bin/