undo framework: protected members now private

jmeidow · jmeidow · commit 65390b558903 · 2026-02-26T09:23:50.000+01:00
diff --git a/src/commands.cpp b/src/commands.cpp
@@ -32,8 +32,13 @@ namespace Cmd {
 
 GUI::MainScene * Undo::s_scene = nullptr;
 
-Undo::Undo( QUndoCommand *parent, State *st)
-    : QUndoCommand(parent), current_state_(st)
+Undo::Undo( QUndoCommand *parent,
+            std::unique_ptr<State> &p,
+            std::unique_ptr<State> &n, State *st)
+    : QUndoCommand(parent),
+      next_state_(std::move(n)),
+      prev_state_(std::move(p)),
+      current_state_(st)
 {
     // qDebug() << Q_FUNC_INFO;
 }
@@ -70,42 +75,37 @@ void Undo::redo()
 AddStroke::AddStroke( State *curr,
                       std::unique_ptr<State> &p,
                       std::unique_ptr<State> &n,
-                      QUndoCommand *parent) : Undo(parent, curr)
+                      QUndoCommand *parent) : Undo(parent, p, n, curr)
 {
     // qDebug() << Q_FUNC_INFO;
-    setText( QStringLiteral("add stroke") );
-
-    prev_state_ = std::move(p);
-    next_state_ = std::move(n);
+    setText( "add stroke" );
 }
 
 
 DeleteSelection::DeleteSelection( State *st,
                                   std::unique_ptr<State> & p,
                                   std::unique_ptr<State> & n,
-                                  QUndoCommand *parent) : Undo(parent, st)
+                                  QUndoCommand *parent) : Undo(parent, p,n, st)
 {
     // qDebug() << Q_FUNC_INFO ;
     auto *scn = scene();
     if (scn==nullptr) {
         return;
     }
 
-    const QString suffix = scn->selectedItems().size()==1 ? QStringLiteral("") : QStringLiteral("s");
-    setText( QStringLiteral("delete selected item%1").arg(suffix) );
-
-    prev_state_ = std::move(p);
-    next_state_ = std::move(n);
+    setText( QString( scn->selectedItems().size()==1 ?
+                        "delete selected item" : "delete selected items") );
 }
 
 
-TabulaRasa::TabulaRasa( State *st, QUndoCommand *parent ) : Undo(parent, st)
+TabulaRasa::TabulaRasa( State *st,
+                        std::unique_ptr<State> &p,
+                        std::unique_ptr<State> &n,
+                        QUndoCommand *parent )
+    : Undo(parent, p,n,  st)
 {
     // qDebug() << Q_FUNC_INFO ;
-    setText( QStringLiteral("clear all") );
-
-    prev_state_ = std::make_unique<State>(*st);   // copy
-    next_state_ = std::make_unique<State>();
+    setText( "clear all" );
 }
 
 
@@ -114,13 +114,10 @@ ReplaceStateWithFileContent::ReplaceStateWithFileContent( const QString & fileNa
                                                           std::unique_ptr<State> & p,
                                                           std::unique_ptr<State> & n,
                                                           QUndoCommand *parent)
-    : Undo(parent, curr)
+    : Undo(parent, p,n, curr)
 {
     // qDebug() << Q_FUNC_INFO;
     setText( fileName );
-
-    prev_state_ = std::move(p);  // copy
-    next_state_ = std::move(n);
 }
 
 } // namespace Cmd
diff --git a/src/commands.h b/src/commands.h
@@ -49,13 +49,15 @@ class Undo : public QUndoCommand
     static GUI::MainScene * scene() { return s_scene;  }
 
 protected:
-    explicit Undo(QUndoCommand *parent, State *st); //!< Standard constructor
+    explicit Undo(QUndoCommand *parent,
+                  std::unique_ptr<State> &p,
+                  std::unique_ptr<State> &n,
+                  State *st); //!< Standard constructor
     ~Undo() override = default;
 
+private:
     std::unique_ptr<State> next_state_;  //!< Pointer to next state (redo)
     std::unique_ptr<State> prev_state_;  //!< Pointer to previous state (undo)
-
-private:
     State *current_state_{};             //!< Pointer to current state
 
     static GUI::MainScene *s_scene;
@@ -99,7 +101,10 @@ class TabulaRasa : public Undo
 {
 public:
     //! Value constructor
-    TabulaRasa( State *st, QUndoCommand *parent);
+    TabulaRasa( State *st,
+                std::unique_ptr<State> &p,
+                std::unique_ptr<State> &n,
+                QUndoCommand *parent);
 };
 
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -821,8 +821,12 @@ void MainWindow::readBinaryFile( const QString & fileName)
 
 void MainWindow::slotCmdTabulaRasa()
 {
+
+    std::unique_ptr<State> p = std::make_unique<State>(curr_state);
+    std::unique_ptr<State> n = std::make_unique<State>();
+
     m_undoStack->push(
-                new Cmd::TabulaRasa( &curr_state, nullptr )
+                new Cmd::TabulaRasa( &curr_state, p, n, nullptr )
                 );
 
     setWindowModified( true );
@@ -875,7 +879,7 @@ void MainWindow::slotCmdDeleteSelection()
     if ( next_state_->reduce() )
     {
         std::unique_ptr<State> prev_state_
-                = std::make_unique<State>(curr_state); // copy
+            = std::make_unique<State>(curr_state);
 
         m_undoStack->push(
                     new Cmd::DeleteSelection( &curr_state,
