From 4955e177c64b1a7c1c60c91e477bd4135f703a5f Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Wed, 24 Apr 2024 23:21:01 -0500
Subject: [PATCH] [jasper/world/studio] Fixes for Ox update

---
 .../world/src/studio/worldeditor/commands/addrmobjectset.cpp  | 4 ++--
 .../src/studio/worldobjectseteditor/commands/addobject.cpp    | 2 +-
 .../src/studio/worldobjectseteditor/commands/addpalette.cpp   | 2 +-
 .../src/studio/worldobjectseteditor/commands/rmobject.cpp     | 2 +-
 .../src/studio/worldobjectseteditor/commands/rmpalette.cpp    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jasper/modules/world/src/studio/worldeditor/commands/addrmobjectset.cpp b/src/jasper/modules/world/src/studio/worldeditor/commands/addrmobjectset.cpp
index 631b9e1..c5ce28a 100644
--- a/src/jasper/modules/world/src/studio/worldeditor/commands/addrmobjectset.cpp
+++ b/src/jasper/modules/world/src/studio/worldeditor/commands/addrmobjectset.cpp
@@ -30,7 +30,7 @@ void AddObjectSet::redo() noexcept {
 void AddObjectSet::undo() noexcept {
 	m_path = std::move(m_doc.objSets[m_insertIdx].path);
 	--m_doc.objSetIdIdx;
-	oxIgnoreError(m_doc.objSets.erase(m_insertIdx));
+	std::ignore = m_doc.objSets.erase(m_insertIdx);
 }
 
 int AddObjectSet::commandId() const noexcept {
@@ -45,7 +45,7 @@ RmObjectSet::RmObjectSet(WorldDoc &doc, size_t idx):
 
 void RmObjectSet::redo() noexcept {
 	m_entry = std::move(m_doc.objSets[m_idx]);
-	oxIgnoreError(m_doc.objSets.erase(m_idx));
+	std::ignore = m_doc.objSets.erase(m_idx);
 }
 
 void RmObjectSet::undo() noexcept {
diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addobject.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addobject.cpp
index 514b7ad..bf0ab83 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addobject.cpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addobject.cpp
@@ -26,7 +26,7 @@ void AddObject::redo() noexcept {
 
 void AddObject::undo() noexcept {
 	m_obj = std::move(m_doc.objects[m_insertIdx]);
-	oxIgnoreError(m_doc.objects.erase(m_insertIdx));
+	std::ignore = m_doc.objects.erase(m_insertIdx);
 	--m_doc.objIdIdx;
 }
 
diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addpalette.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addpalette.cpp
index e1c8d3e..592cffb 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addpalette.cpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addpalette.cpp
@@ -27,7 +27,7 @@ void AddPalette::undo() noexcept {
 	auto const idx = std::find_if(m_doc.palettes.begin(), m_doc.palettes.end(), [this](PaletteCycle const&v) {
 		return v.palette == m_palAddr;
 	});
-	oxIgnoreError(m_doc.palettes.erase(idx));
+	std::ignore = m_doc.palettes.erase(idx);
 }
 
 int AddPalette::commandId() const noexcept {
diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmobject.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmobject.cpp
index 0645511..189711a 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmobject.cpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmobject.cpp
@@ -14,7 +14,7 @@ RmObject::RmObject(WorldObjectSet &doc, size_t const rmIdx) noexcept:
 
 void RmObject::redo() noexcept {
 	m_obj = std::move(m_doc.objects[m_rmIdx]);
-	oxIgnoreError(m_doc.objects.erase(m_rmIdx));
+	std::ignore = m_doc.objects.erase(m_rmIdx);
 }
 
 void RmObject::undo() noexcept {
diff --git a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp
index 0f12ece..296a2de 100644
--- a/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp
+++ b/src/jasper/modules/world/src/studio/worldobjectseteditor/commands/rmpalette.cpp
@@ -16,7 +16,7 @@ RmPalette::RmPalette(WorldObjectSet &doc, size_t rmIdx) noexcept:
 
 void RmPalette::redo() noexcept {
 	m_pal = std::move(m_doc.palettes[m_rmIdx]);
-	oxIgnoreError(m_doc.palettes.erase(m_rmIdx));
+	std::ignore = m_doc.palettes.erase(m_rmIdx);
 }
 
 void RmPalette::undo() noexcept {