[Scummvm-git-logs] scummvm master -> fb175a893ea8ef711ee20930ffbf54794e6b5d97

bluegr noreply at scummvm.org
Mon Apr 13 17:11:49 UTC 2026 

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

Summary:
fb175a893e BACKENDS: Remove EventsBaseBackend


Commit: fb175a893ea8ef711ee20930ffbf54794e6b5d97
    https://github.com/scummvm/scummvm/commit/fb175a893ea8ef711ee20930ffbf54794e6b5d97
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-04-13T20:11:43+03:00

Commit Message:
BACKENDS: Remove EventsBaseBackend

Changed paths:
    backends/base-backend.cpp
    backends/base-backend.h
    backends/platform/3ds/osystem.cpp
    backends/platform/3ds/osystem.h
    backends/platform/dc/dc.h
    backends/platform/dc/dcmain.cpp
    backends/platform/libretro/include/libretro-os.h
    backends/platform/libretro/src/libretro-os-base.cpp
    backends/platform/n64/osys_n64.h
    backends/platform/n64/osys_n64_base.cpp
    backends/platform/psp/osys_psp.cpp
    backends/platform/psp/osys_psp.h
    backends/platform/wii/osystem.cpp
    backends/platform/wii/osystem.h
    common/system.h
    test/system/null_osystem.cpp


diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index 7b8fc994f93..cd58088bc27 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -23,10 +23,6 @@
 
 #include "graphics/scalerplugin.h"
 
-#ifndef DISABLE_DEFAULT_EVENT_MANAGER
-#include "backends/events/default/default-events.h"
-#endif
-
 #ifndef DISABLE_DEFAULT_AUDIOCD_MANAGER
 #include "backends/audiocd/default/default-audiocd.h"
 #endif
@@ -85,13 +81,3 @@ void BaseBackend::fillScreen(const Common::Rect &r, uint32 col) {
 		screen->fillRect(r, col);
 	unlockScreen();
 }
-
-void EventsBaseBackend::initBackend() {
-	// Init Event manager
-#ifndef DISABLE_DEFAULT_EVENT_MANAGER
-	if (!_eventManager)
-		_eventManager = new DefaultEventManager(this);
-#endif
-
-	BaseBackend::initBackend();
-}
diff --git a/backends/base-backend.h b/backends/base-backend.h
index 36cab351686..c5c462421a0 100644
--- a/backends/base-backend.h
+++ b/backends/base-backend.h
@@ -23,7 +23,6 @@
 #define BACKENDS_BASE_BACKEND_H
 
 #include "common/system.h"
-#include "common/events.h"
 
 /**
  * Subclass of OSystem that contains default implementations of functions that would
@@ -41,10 +40,4 @@ public:
 	void fillScreen(const Common::Rect &r, uint32 col) override;
 };
 
-class EventsBaseBackend : virtual public BaseBackend, Common::EventSource {
-public:
-	virtual void initBackend();
-};
-
-
 #endif
diff --git a/backends/platform/3ds/osystem.cpp b/backends/platform/3ds/osystem.cpp
index c9883f53e46..06183d3559d 100644
--- a/backends/platform/3ds/osystem.cpp
+++ b/backends/platform/3ds/osystem.cpp
@@ -151,12 +151,13 @@ void OSystem_3DS::initBackend() {
 		ConfMan.set("vkeybd_pack_name", "vkeybd_small");
 	}
 
+	_eventManager = new DefaultEventManager(this);
 	_timerManager = new DefaultTimerManager();
 	_savefileManager = new DefaultSaveFileManager("sdmc:/3ds/scummvm/saves/");
 
 	init3DSGraphics();
 	initAudio();
-	EventsBaseBackend::initBackend();
+	BaseBackend::initBackend();
 	initEvents();
 }
 
diff --git a/backends/platform/3ds/osystem.h b/backends/platform/3ds/osystem.h
index 2bada3221c3..b167d1720a6 100644
--- a/backends/platform/3ds/osystem.h
+++ b/backends/platform/3ds/osystem.h
@@ -100,7 +100,7 @@ struct GfxState {
 };
 
 
-class OSystem_3DS : public EventsBaseBackend, public PaletteManager, public Common::EventObserver {
+class OSystem_3DS : virtual public BaseBackend, public Common::EventSource, public PaletteManager, public Common::EventObserver {
 public:
 	OSystem_3DS();
 	virtual ~OSystem_3DS();
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index 75c11cfe167..dfa58914c50 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -68,7 +68,7 @@ public:
 	void stop() override;
 };
 
-class OSystem_Dreamcast : private DCHardware, public EventsBaseBackend, public PaletteManager, public FilesystemFactory
+class OSystem_Dreamcast : virtual public BaseBackend, public Common::EventSource, private DCHardware, public PaletteManager, public FilesystemFactory
 #ifdef DYNAMIC_MODULES
   , public FilePluginProvider
 #endif
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index d9b926b712e..c92665769aa 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -29,6 +29,7 @@
 #include "dcutils.h"
 #include "icon.h"
 #include "DCLauncherDialog.h"
+#include "backends/events/default/default-events.h"
 #include "backends/mutex/null/null-mutex.h"
 #include <common/config-manager.h>
 #include <common/memstream.h>
@@ -56,6 +57,7 @@ OSystem_Dreamcast::OSystem_Dreamcast()
 void OSystem_Dreamcast::initBackend()
 {
   ConfMan.setInt("autosave_period", 0);
+  _eventManager = new DefaultEventManager(this);
   _savefileManager = createSavefileManager();
   _timerManager = new DefaultTimerManager();
 
@@ -65,7 +67,7 @@ void OSystem_Dreamcast::initBackend()
 
   _audiocdManager = new DCCDManager();
 
-  EventsBaseBackend::initBackend();
+  BaseBackend::initBackend();
 }
 
 
diff --git a/backends/platform/libretro/include/libretro-os.h b/backends/platform/libretro/include/libretro-os.h
index 83571c16dbf..c83c460e965 100644
--- a/backends/platform/libretro/include/libretro-os.h
+++ b/backends/platform/libretro/include/libretro-os.h
@@ -51,7 +51,7 @@ public:
 	};
 };
 
-class OSystem_libretro : public EventsBaseBackend, public ModularGraphicsBackend {
+class OSystem_libretro : virtual public BaseBackend, public Common::EventSource, public ModularGraphicsBackend {
 private:
 	int _relMouseX;
 	int _relMouseY;
diff --git a/backends/platform/libretro/src/libretro-os-base.cpp b/backends/platform/libretro/src/libretro-os-base.cpp
index d9e7625f438..47a22223ba9 100644
--- a/backends/platform/libretro/src/libretro-os-base.cpp
+++ b/backends/platform/libretro/src/libretro-os-base.cpp
@@ -30,6 +30,7 @@
 #include "common/system.h"
 #include "graphics/surface.h"
 
+#include "backends/events/default/default-events.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/platform/libretro/include/libretro-defs.h"
 #include "backends/platform/libretro/include/libretro-core.h"
@@ -70,6 +71,7 @@ void OSystem_libretro::initBackend() {
 	if (! ConfMan.hasKey("libretro_hooks_clear"))
 		ConfMan.set("libretro_hooks_clear", 0);
 
+	_eventManager = new DefaultEventManager(this);
 	_savefileManager = new DefaultSaveFileManager();
 
 	_mixer = new Audio::MixerImpl(retro_setting_get_sample_rate(), true, retro_setting_get_audio_samples_buffer_size());
@@ -81,7 +83,7 @@ void OSystem_libretro::initBackend() {
 
 	resetGraphicsManager();
 
-	EventsBaseBackend::initBackend();
+	BaseBackend::initBackend();
 	refreshRetroSettings();
 }
 
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index 729fe95d5d5..6d306656ee7 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -69,7 +69,7 @@ enum GraphicModeID {
 	OVERS_MPAL_340X240
 };
 
-class OSystem_N64 : public EventsBaseBackend, public PaletteManager {
+class OSystem_N64 : virtual public BaseBackend, public Common::EventSource, public PaletteManager {
 protected:
 	Audio::MixerImpl *_mixer;
 
diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 33477bed65a..abb8af64576 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -28,6 +28,7 @@
 #include "osys_n64.h"
 #include "pakfs_save_manager.h"
 #include "framfs_save_manager.h"
+#include "backends/events/default/default-events.h"
 #include "backends/fs/n64/n64-fs-factory.h"
 #include "backends/mutex/null/null-mutex.h"
 #include "backends/saves/default/default-saves.h"
@@ -188,13 +189,14 @@ void OSystem_N64::initBackend() {
 		_savefileManager = new PAKSaveManager();
 	}
 
+	_eventManager = new DefaultEventManager(this);
 	_timerManager = new DefaultTimerManager();
 
 	setTimerCallback(&timer_handler, 10);
 
 	setupMixer();
 
-	EventsBaseBackend::initBackend();
+	BaseBackend::initBackend();
 }
 
 bool OSystem_N64::hasFeature(Feature f) {
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 6c8454555b1..8a294b94286 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -37,6 +37,7 @@
 #include "backends/platform/psp/powerman.h"
 #include "backends/platform/psp/rtc.h"
 
+#include "backends/events/default/default-events.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/psp/timer.h"
 #include "graphics/surface.h"
@@ -88,6 +89,7 @@ void OSystem_PSP::initBackend() {
 	_imageViewer.setInputHandler(&_inputHandler);
 	_imageViewer.setDisplayManager(&_displayManager);
 
+	_eventManager = new DefaultEventManager(this);
 	_savefileManager = new DefaultSaveFileManager(PSP_DEFAULT_SAVE_PATH);
 
 	_timerManager = new PspTimerManager();
@@ -97,7 +99,7 @@ void OSystem_PSP::initBackend() {
 
 	setupMixer();
 
-	EventsBaseBackend::initBackend();
+	BaseBackend::initBackend();
 }
 
 // Let's us know an engine
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index c8a3735581b..17bc8ff40da 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -39,7 +39,7 @@
 #include "backends/platform/psp/audio.h"
 #include "backends/platform/psp/thread.h"
 
-class OSystem_PSP : public EventsBaseBackend, public PaletteManager {
+class OSystem_PSP : virtual public BaseBackend, public Common::EventSource, public PaletteManager {
 private:
 
 	Audio::MixerImpl *_mixer;
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index 282718e5cbd..2bf4d50911b 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -28,6 +28,7 @@
 
 #include "common/config-manager.h"
 #include "common/textconsole.h"
+#include "backends/events/default/default-events.h"
 #include "backends/fs/wii/wii-fs-factory.h"
 #include "backends/mutex/wii/wii-mutex.h"
 #include "backends/saves/default/default-saves.h"
@@ -134,6 +135,7 @@ void OSystem_Wii::initBackend() {
 	if (!getcwd(buf, MAXPATHLEN))
 		Common::strcpy_s(buf, "/");
 
+	_eventManager = new DefaultEventManager(this);
 	_savefileManager = new DefaultSaveFileManager(buf);
 	_timerManager = new DefaultTimerManager();
 
@@ -141,7 +143,7 @@ void OSystem_Wii::initBackend() {
 	initSfx();
 	initEvents();
 
-	EventsBaseBackend::initBackend();
+	BaseBackend::initBackend();
 }
 
 void OSystem_Wii::quit() {
@@ -343,7 +345,7 @@ Common::String OSystem_Wii::getSystemLanguage() const {
 	} else {
 		// This will only happen when new languages are added to the API.
 		warning("WII: Unknown system language: %d", langID);
-		return EventsBaseBackend::getSystemLanguage();
+		return BaseBackend::getSystemLanguage();
 	}
 }
 #endif // !GAMECUBE
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index a68d7d2ae85..74feb130c6f 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -51,7 +51,7 @@ extern void wii_memstats(void);
 }
 #endif
 
-class OSystem_Wii final : public EventsBaseBackend, public PaletteManager {
+class OSystem_Wii final : virtual public BaseBackend, public Common::EventSource, public PaletteManager {
 private:
 	s64 _startup_time;
 
diff --git a/common/system.h b/common/system.h
index 3581ad89b22..3eb1514ba1b 100644
--- a/common/system.h
+++ b/common/system.h
@@ -199,8 +199,6 @@ protected:
 
 	/**
 	 * No default value is provided for _eventManager by OSystem.
-	 * However, EventsBaseBackend::initBackend() does set a default value
-	 * if none has been set before.
 	 *
 	 * @note _eventManager is deleted by the OSystem destructor.
 	 */
diff --git a/test/system/null_osystem.cpp b/test/system/null_osystem.cpp
index f3f774ef5b2..089755b5ed8 100644
--- a/test/system/null_osystem.cpp
+++ b/test/system/null_osystem.cpp
@@ -47,7 +47,3 @@ void BaseBackend::fillScreen(uint32 col) {
 
 void BaseBackend::fillScreen(const Common::Rect &r, uint32 col) {
 }
-
-void EventsBaseBackend::initBackend() {
-	BaseBackend::initBackend();
-}

More information about the Scummvm-git-logs mailing list