From 941d22c047e1afb6b882114d2c7d3a1660cda5c0 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sat, 7 Jul 2018 01:05:54 +0100
Subject: BACKENDS: Use OSystem::destroy() instead of deleting directly the
 g_system instance

---
 backends/platform/3ds/main.cpp                   | 2 +-
 backends/platform/androidsdl/androidsdl-main.cpp | 2 +-
 backends/platform/dingux/main.cpp                | 2 +-
 backends/platform/gph/gph-main.cpp               | 2 +-
 backends/platform/linuxmoto/linuxmoto-main.cpp   | 2 +-
 backends/platform/maemo/main.cpp                 | 2 +-
 backends/platform/null/null.cpp                  | 2 +-
 backends/platform/openpandora/op-main.cpp        | 2 +-
 backends/platform/samsungtv/main.cpp             | 2 +-
 backends/platform/sdl/amigaos/amigaos-main.cpp   | 2 +-
 backends/platform/sdl/macosx/macosx-main.cpp     | 2 +-
 backends/platform/sdl/posix/posix-main.cpp       | 2 +-
 backends/platform/sdl/ps3/ps3-main.cpp           | 2 +-
 backends/platform/sdl/psp2/psp2-main.cpp         | 2 +-
 backends/platform/sdl/riscos/riscos-main.cpp     | 2 +-
 backends/platform/sdl/win32/win32-main.cpp       | 2 +-
 backends/platform/symbian/src/SymbianMain.cpp    | 2 +-
 backends/platform/webos/main.cpp                 | 2 +-
 backends/platform/wince/wince-sdl.cpp            | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/3ds/main.cpp b/backends/platform/3ds/main.cpp
index e9046d7c28..20983141c1 100644
--- a/backends/platform/3ds/main.cpp
+++ b/backends/platform/3ds/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
 // 		res = scummvm_main(argc, argv);
 	scummvm_main(0, nullptr);
 
-	delete dynamic_cast<_3DS::OSystem_3DS*>(g_system);
+	g_system->destroy();
 
 	// Turn on both screen backlights before exiting.
 	if (R_SUCCEEDED(gspLcdInit())) {
diff --git a/backends/platform/androidsdl/androidsdl-main.cpp b/backends/platform/androidsdl/androidsdl-main.cpp
index 364d686c1b..304bce11a9 100644
--- a/backends/platform/androidsdl/androidsdl-main.cpp
+++ b/backends/platform/androidsdl/androidsdl-main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_ANDROIDSDL *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/dingux/main.cpp b/backends/platform/dingux/main.cpp
index 98b5058c06..7ec90ab1ed 100644
--- a/backends/platform/dingux/main.cpp
+++ b/backends/platform/dingux/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char* argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_SDL_Dingux *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/gph/gph-main.cpp b/backends/platform/gph/gph-main.cpp
index 5fce37179e..3b829de0db 100644
--- a/backends/platform/gph/gph-main.cpp
+++ b/backends/platform/gph/gph-main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete(OSystem_GPH *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/linuxmoto/linuxmoto-main.cpp b/backends/platform/linuxmoto/linuxmoto-main.cpp
index 507be9fa95..2f14e3d53c 100644
--- a/backends/platform/linuxmoto/linuxmoto-main.cpp
+++ b/backends/platform/linuxmoto/linuxmoto-main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_LINUXMOTO *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp
index 4735ae30ed..9d8b0f2e84 100644
--- a/backends/platform/maemo/main.cpp
+++ b/backends/platform/maemo/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char* argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (Maemo::OSystem_SDL_Maemo *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index be50fde27c..2f34ae8f93 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
-	delete (OSystem_NULL *)g_system;
+	g_system->destroy();
 	return res;
 }
 
diff --git a/backends/platform/openpandora/op-main.cpp b/backends/platform/openpandora/op-main.cpp
index 99026b89f6..09da93a942 100644
--- a/backends/platform/openpandora/op-main.cpp
+++ b/backends/platform/openpandora/op-main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete(OSystem_OP *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/samsungtv/main.cpp b/backends/platform/samsungtv/main.cpp
index a390bd0f0b..7db2d90980 100644
--- a/backends/platform/samsungtv/main.cpp
+++ b/backends/platform/samsungtv/main.cpp
@@ -50,7 +50,7 @@ extern "C" int Game_Main(char *path, char *) {
 	int res = scummvm_main(0, 0);
 
 	// Free OSystem
-	delete (OSystem_SDL_SamsungTV *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index 7bbf8d1fff..ba1171751c 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_AmigaOS *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/sdl/macosx/macosx-main.cpp b/backends/platform/sdl/macosx/macosx-main.cpp
index 1b9fc1b82c..3053d30e55 100644
--- a/backends/platform/sdl/macosx/macosx-main.cpp
+++ b/backends/platform/sdl/macosx/macosx-main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_MacOSX *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp
index 92354b273e..7105ac69c3 100644
--- a/backends/platform/sdl/posix/posix-main.cpp
+++ b/backends/platform/sdl/posix/posix-main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_POSIX *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/sdl/ps3/ps3-main.cpp b/backends/platform/sdl/ps3/ps3-main.cpp
index 92c4a02865..2777497293 100644
--- a/backends/platform/sdl/ps3/ps3-main.cpp
+++ b/backends/platform/sdl/ps3/ps3-main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_PS3 *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/sdl/psp2/psp2-main.cpp b/backends/platform/sdl/psp2/psp2-main.cpp
index 70cc52388e..aca14832ae 100644
--- a/backends/platform/sdl/psp2/psp2-main.cpp
+++ b/backends/platform/sdl/psp2/psp2-main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_PSP2 *)g_system;
+	g_system->destroy();
 
 #ifdef __PSP2_DEBUG__
 	psp2shell_exit();
diff --git a/backends/platform/sdl/riscos/riscos-main.cpp b/backends/platform/sdl/riscos/riscos-main.cpp
index 3f7058e3b8..c075c2d097 100644
--- a/backends/platform/sdl/riscos/riscos-main.cpp
+++ b/backends/platform/sdl/riscos/riscos-main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_RISCOS *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/sdl/win32/win32-main.cpp b/backends/platform/sdl/win32/win32-main.cpp
index 4864347d81..4e9f6a49da 100644
--- a/backends/platform/sdl/win32/win32-main.cpp
+++ b/backends/platform/sdl/win32/win32-main.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_Win32 *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/symbian/src/SymbianMain.cpp b/backends/platform/symbian/src/SymbianMain.cpp
index d7ad26d769..03cf407138 100644
--- a/backends/platform/symbian/src/SymbianMain.cpp
+++ b/backends/platform/symbian/src/SymbianMain.cpp
@@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_SDL_Symbian *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/webos/main.cpp b/backends/platform/webos/main.cpp
index 70b3fe1674..48a265ca9f 100644
--- a/backends/platform/webos/main.cpp
+++ b/backends/platform/webos/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char* argv[]) {
 	int res = scummvm_main(argc, argv);
 
 	// Free OSystem
-	delete (OSystem_SDL_WebOS *)g_system;
+	g_system->destroy();
 
 	return res;
 }
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index f03068f6e3..8a19eac064 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -237,7 +237,7 @@ int SDL_main(int argc, char **argv) {
 		res = scummvm_main(argc, argv);
 
 		// Free OSystem
-		delete(OSystem_WINCE3 *)g_system;
+		g_system->destroy();
 #if !defined(DEBUG) && !defined(__GNUC__)
 	}
 	__except(handleException(GetExceptionInformation())) {
-- 
cgit v1.2.3