Use namespaced enum instead of defines for undo handler

Hopsan · May 23, 2024 · b48af80 · b48af80
1 parent 39a2962
commit b48af80
Show file tree

Hide file tree

Showing 8 changed files with 204 additions and 200 deletions.
diff --git a/HopsanGUI/Dialogs/ComponentPropertiesDialog3.cpp b/HopsanGUI/Dialogs/ComponentPropertiesDialog3.cpp
@@ -1189,7 +1189,7 @@ bool VariableTableWidget::setStartValues()
                     // Add an undo post (but only one for all values changed this time
                     if(!addedUndoPost)
                     {
-                        mpModelObject->getParentSystemObject()->getUndoStackPtr()->newPost(UNDO_CHANGEDPARAMETERS);
+                        mpModelObject->getParentSystemObject()->getUndoStackPtr()->newPost(undo::changedparameters);
                         addedUndoPost = true;
                     }
                     // Register the change in undo stack

diff --git a/HopsanGUI/GUIObjects/GUIContainerObject.cpp b/HopsanGUI/GUIObjects/GUIContainerObject.cpp
@@ -1475,7 +1475,7 @@ void SystemObject::cutSelected(CopyStack *xmlStack)
     }
 
     this->copySelected(xmlStack);
-    this->mpUndoStack->newPost(UNDO_CUT);
+    this->mpUndoStack->newPost(undo::cut);
     emit deleteSelected();
     mpModelWidget->getGraphicsView()->updateViewPort();
 }
@@ -1604,7 +1604,7 @@ void SystemObject::paste(CopyStack *xmlStack)
     }
 
     bool didPaste = false;
-    mpUndoStack->newPost(UNDO_PASTE);
+    mpUndoStack->newPost(undo::paste);
 
     QDomElement *copyRoot;
     if(xmlStack == nullptr) {
@@ -1798,7 +1798,7 @@ void SystemObject::alignX()
 
     if(mSelectedModelObjectsList.size()+mSelectedWidgetsList.size() > 1)
     {
-        mpUndoStack->newPost(UNDO_ALIGNX);
+        mpUndoStack->newPost(undo::alignx);
         for(int i=0; i<mSelectedModelObjectsList.size()-1; ++i)
         {
             QPointF oldPos = mSelectedModelObjectsList.at(i)->pos();
@@ -1841,7 +1841,7 @@ void SystemObject::alignY()
 
     if(mSelectedModelObjectsList.size()+mSelectedWidgetsList.size() > 1)
     {
-        mpUndoStack->newPost(UNDO_ALIGNY);
+        mpUndoStack->newPost(undo::aligny);
         for(int i=0; i<mSelectedModelObjectsList.size()-1; ++i)
         {
             QPointF oldPos = mSelectedModelObjectsList.at(i)->pos();
@@ -1886,7 +1886,7 @@ void SystemObject::distributeX()
         double max = tempList.last()->getCenterPos().x();
         double diff = (max-min)/(tempList.size()-1.0);
 
-        mpUndoStack->newPost(UNDO_DISTRIBUTEX);
+        mpUndoStack->newPost(undo::distributex);
         double pos = min+diff;
         for(int i=1; i<tempList.size()-1; ++i)
         {
@@ -1928,7 +1928,7 @@ void SystemObject::distributeY()
         double max = tempList.last()->getCenterPos().y();
         double diff = (max-min)/(tempList.size()-1.0);
 
-        mpUndoStack->newPost(UNDO_DISTRIBUTEY);
+        mpUndoStack->newPost(undo::distributey);
         double pos = min+diff;
         for(int i=1; i<tempList.size()-1; ++i)
         {
@@ -2115,7 +2115,7 @@ void SystemObject::deselectAll()
 //! @see showNames()
 void SystemObject::hideNames()
 {
-    mpUndoStack->newPost(UNDO_HIDEALLNAMES);
+    mpUndoStack->newPost(undo::hideallnames);
     emit deselectAllNameText();
     emit hideAllNameText();
 }
@@ -2125,7 +2125,7 @@ void SystemObject::hideNames()
 //! @see hideNames()
 void SystemObject::showNames()
 {
-    mpUndoStack->newPost(UNDO_SHOWALLNAMES);
+    mpUndoStack->newPost(undo::showallnames);
     emit showAllNameText();
 }
 

diff --git a/HopsanGUI/GUIObjects/GUIModelObject.cpp b/HopsanGUI/GUIObjects/GUIModelObject.cpp
@@ -1297,7 +1297,7 @@ void ModelObject::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 if(mpParentSystemObject->getSelectedModelObjectPtrs().size() > 1)
                 {
-                    mpParentSystemObject->getUndoStackPtr()->newPost(UNDO_MOVEDMULTIPLE);
+                    mpParentSystemObject->getUndoStackPtr()->newPost(undo::movedmultiple);
                 }
                 else
                 {

diff --git a/HopsanGUI/GUIObjects/GUIWidgets.cpp b/HopsanGUI/GUIObjects/GUIWidgets.cpp
@@ -123,7 +123,7 @@ void Widget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 if(mpParentSystemObject->getSelectedGUIWidgetPtrs().size() > 1)
                 {
-                    mpParentSystemObject->getUndoStackPtr()->newPost(UNDO_MOVEDMULTIPLEWIDGETS);
+                    mpParentSystemObject->getUndoStackPtr()->newPost(undo::movedmultiplewidgets);
                 }
                 else
                 {

diff --git a/HopsanGUI/GraphicsView.cpp b/HopsanGUI/GraphicsView.cpp
@@ -761,7 +761,7 @@ void GraphicsView::mouseReleaseEvent(QMouseEvent *event)
             mpParentModelWidget->hasChanged();
             if(!createdUndoPost)
             {
-                mpContainerObject->getUndoStackPtr()->newPost(UNDO_MOVEDMULTIPLE);
+                mpContainerObject->getUndoStackPtr()->newPost(undo::movedmultiple);
                 createdUndoPost = true;
             }
             mpContainerObject->getUndoStackPtr()->registerMovedObject(pSelectedMO->getPreviousPos(), pSelectedMO->pos(), pSelectedMO->getName());
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     if(mpParentSystemObject->getSelectedModelObjectPtrs().size() > 1)
                     {
-                        mpParentSystemObject->getUndoStackPtr()->newPost(UNDO_MOVEDMULTIPLE);
+                        mpParentSystemObject->getUndoStackPtr()->newPost(undo::movedmultiple);
                     }
                     else
                     {
@@ Expand Down @@