From f2dfb94b88f3ec696fb5221f7ae97352d3dfe23c Mon Sep 17 00:00:00 2001
From: phosit <phosit@autistici.org>
Date: Wed, 25 Jun 2025 20:13:18 +0200
Subject: [PATCH] Return void from CGUI::Xeromyces_ReadObject

The returned value was never used.
Now all CGUI::Xeromyces_Read* functions return void.
---
 source/gui/CGUI.cpp | 9 +++------
 source/gui/CGUI.h   | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index 84260f59e0..426d4deb62 100644
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -656,7 +656,8 @@ void CGUI::Xeromyces_ReadRootSetup(const XMBData& xmb, XMBElement element)
 	}
 }
 
-IGUIObject* CGUI::Xeromyces_ReadObject(const XMBData& xmb, XMBElement element, IGUIObject* pParent, std::vector<std::pair<CStr, CStr> >& NameSubst, std::unordered_set<VfsPath>& Paths, u32 nesting_depth)
+void CGUI::Xeromyces_ReadObject(const XMBData& xmb, XMBElement element, IGUIObject* pParent,
+	std::vector<std::pair<CStr, CStr> >& NameSubst, std::unordered_set<VfsPath>& Paths, u32 nesting_depth)
 {
 	ENSURE(pParent);
 
@@ -674,7 +675,7 @@ IGUIObject* CGUI::Xeromyces_ReadObject(const XMBData& xmb, XMBElement element, I
 	if (!object)
 	{
 		LOGERROR("GUI: Unrecognized object type \"%s\"", type.c_str());
-		return nullptr;
+		return;
 	}
 
 	// Cache some IDs for element attribute names, to avoid string comparisons
@@ -952,11 +953,7 @@ IGUIObject* CGUI::Xeromyces_ReadObject(const XMBData& xmb, XMBElement element, I
 	}
 
 	if (!AddObject(*pParent, *object))
-	{
 		delete object;
-		return nullptr;
-	}
-	return object;
 }
 
 void CGUI::Xeromyces_ReadRepeat(const XMBData& xmb, XMBElement element, IGUIObject* pParent, std::vector<std::pair<CStr, CStr> >& NameSubst, std::unordered_set<VfsPath>& Paths, u32 nesting_depth)
diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h
index b77afca19e..c292d02588 100644
--- a/source/gui/CGUI.h
+++ b/source/gui/CGUI.h
@@ -455,7 +455,7 @@ private:
 	 *
 	 * @see LoadXmlFile()
 	 */
-	IGUIObject* Xeromyces_ReadObject(const XMBData& xmb, XMBElement element, IGUIObject* pParent,
+	void Xeromyces_ReadObject(const XMBData& xmb, XMBElement element, IGUIObject* pParent,
 		std::vector<std::pair<CStr, CStr> >& NameSubst, std::unordered_set<VfsPath>& Paths,
 		u32 nesting_depth);