From 3cb4058ae11448abe7758ac762cea7009c18e4c5 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Mon, 30 Sep 2024 23:08:08 -0500
Subject: [PATCH] [jasper/world/studio] Fixes for Studio update

---
 .../src/studio/worldobjectseteditor/commands/editobject.cpp   | 4 ++--
 .../src/studio/worldobjectseteditor/commands/editobject.hpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.cpp
index 20dc822..673a6a0 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.cpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.cpp
@@ -33,7 +33,7 @@ int EditObjectName::commandId() const noexcept {
 	return static_cast<int>(WorldObjCommand::EditObjectName);
 }
 
-bool EditObjectName::mergeWith(UndoCommand const&cmd) noexcept {
+bool EditObjectName::mergeWith(UndoCommand &cmd) noexcept {
 	auto const en = dynamic_cast<EditObjectName const*>(&cmd);
 	if (en && m_objIdx == en->m_objIdx) {
 		m_newVal = en->m_newVal;
@@ -65,7 +65,7 @@ int EditObjectInterval::commandId() const noexcept {
 	return static_cast<int>(WorldObjCommand::EditObjectInterval);
 }
 
-bool EditObjectInterval::mergeWith(UndoCommand const&cmd) noexcept {
+bool EditObjectInterval::mergeWith(UndoCommand &cmd) noexcept {
 	auto const en = dynamic_cast<EditObjectInterval const*>(&cmd);
 	if (en && m_objIdx == en->m_objIdx) {
 		m_newVal = en->m_newVal;
diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
index b659580..2fbcf1f 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
@@ -24,7 +24,7 @@ class EditObjectName: public studio::UndoCommand {
 		ox::Error undo() noexcept override;
 		[[nodiscard]]
 		int commandId() const noexcept override;
-		bool mergeWith(UndoCommand const&cmd) noexcept override;
+		bool mergeWith(UndoCommand &cmd) noexcept override;
 };
 
 class EditObjectInterval: public studio::UndoCommand {
@@ -39,7 +39,7 @@ class EditObjectInterval: public studio::UndoCommand {
 		ox::Error undo() noexcept override;
 		[[nodiscard]]
 		int commandId() const noexcept override;
-		bool mergeWith(UndoCommand const&cmd) noexcept override;
+		bool mergeWith(UndoCommand &cmd) noexcept override;
 };
 
 class EditObjectSubSheet: public studio::UndoCommand {