[Scummvm-git-logs] scummvm master -> 48615cb83e1889166503b9d3bef7c50203cc441a

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
48615cb83e BACKENDS: Move implementation of OSystem::quit() out of ModularBackend


Commit: 48615cb83e1889166503b9d3bef7c50203cc441a
    https://github.com/scummvm/scummvm/commit/48615cb83e1889166503b9d3bef7c50203cc441a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-12-01T01:04:06+02:00

Commit Message:
BACKENDS: Move implementation of OSystem::quit() out of ModularBackend

Changed paths:
    backends/modular-backend.cpp
    backends/modular-backend.h
    backends/platform/null/null.cpp
    backends/platform/tizen/system.cpp
    backends/platform/tizen/system.h


diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index a06448d..963e987 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -20,8 +20,6 @@
  *
  */
 
-#define FORBIDDEN_SYMBOL_EXCEPTION_exit
-
 #include "backends/modular-backend.h"
 
 #include "backends/graphics/graphics.h"
@@ -277,7 +275,3 @@ void ModularBackend::displayMessageOnOSD(const char *msg) {
 void ModularBackend::displayActivityIconOnOSD(const Graphics::Surface *icon) {
 	_graphicsManager->displayActivityIconOnOSD(icon);
 }
-
-void ModularBackend::quit() {
-	exit(0);
-}
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index 580e992..a89df7d 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -40,6 +40,7 @@ class MutexManager;
  *   OSystem::getMillis()
  *   OSystem::delayMillis()
  *   OSystem::getTimeAndDate()
+ *   OSystem::quit()
  *
  * And, it should also initialize all the managers variables
  * declared in this class, or override their related functions.
@@ -133,7 +134,6 @@ public:
 	/** @name Miscellaneous */
 	//@{
 
-	virtual void quit() override;
 	virtual void displayMessageOnOSD(const char *msg) override;
 	virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override;
 
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 6261212..4117982 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -27,6 +27,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_stdout
 #define FORBIDDEN_SYMBOL_EXCEPTION_stderr
 #define FORBIDDEN_SYMBOL_EXCEPTION_fputs
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
 
 #include "backends/modular-backend.h"
 #include "base/main.h"
@@ -67,6 +68,8 @@ public:
 	virtual void delayMillis(uint msecs);
 	virtual void getTimeAndDate(TimeDate &t) const {}
 
+	virtual void quit();
+
 	virtual void logMessage(LogMessageType::Type type, const char *message);
 };
 
@@ -115,6 +118,10 @@ uint32 OSystem_NULL::getMillis(bool skipRecord) {
 void OSystem_NULL::delayMillis(uint msecs) {
 }
 
+void OSystem_NULL::quit() {
+	exit(0);
+}
+
 void OSystem_NULL::logMessage(LogMessageType::Type type, const char *message) {
 	FILE *output = 0;
 
diff --git a/backends/platform/tizen/system.cpp b/backends/platform/tizen/system.cpp
index 23b0718..7fe45f5 100644
--- a/backends/platform/tizen/system.cpp
+++ b/backends/platform/tizen/system.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+
 #include <FUiCtrlMessageBox.h>
 #include <FLocales.h>
 
@@ -454,6 +456,10 @@ void TizenSystem::exitSystem() {
 	}
 }
 
+void TizenSystem::quit() {
+	exit(0);
+}
+
 void TizenSystem::logMessage(LogMessageType::Type type, const char *message) {
 	if (type == LogMessageType::kError) {
 		systemError(message);
diff --git a/backends/platform/tizen/system.h b/backends/platform/tizen/system.h
index 3f668ba..f788280 100644
--- a/backends/platform/tizen/system.h
+++ b/backends/platform/tizen/system.h
@@ -86,6 +86,7 @@ private:
 	void delayMillis(uint msecs);
 	void getTimeAndDate(TimeDate &t) const;
 	void fatalError();
+	void quit();
 	void logMessage(LogMessageType::Type type, const char *message);
 	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);