Merge branch 'main' into SDL3

src/modules/event/Event.cpp

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2023 LOVE Development Team
+ * Copyright (c) 2006-2024 LOVE Development Team
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -38,6 +38,11 @@ Message::~Message()
 {
 }
 
+Event::Event(const char *name)
+	: Module(M_EVENT, name)
+{
+}
+
 Event::~Event()
 {
 }

src/modules/event/Event.h

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2023 LOVE Development Team
+ * Copyright (c) 2006-2024 LOVE Development Team
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -54,10 +54,8 @@ public:
 class Event : public Module
 {
 public:
-	virtual ~Event();
 
-	// Implements Module.
-	virtual ModuleType getModuleType() const { return M_EVENT; }
+	virtual ~Event();
 
 	void push(Message *msg);
 	bool poll(Message *&msg);
@@ -67,6 +65,9 @@ public:
 	virtual Message *wait() = 0;
 
 protected:
+
+	Event(const char *name);
+
 	love::thread::MutexRef mutex;
 	std::queue<Message *> queue;
 

src/modules/event/sdl/Event.cpp

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2023 LOVE Development Team
+ * Copyright (c) 2006-2024 LOVE Development Team
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -156,12 +156,8 @@ static int SDLCALL watchAppEvents(void * /*udata*/, SDL_Event *event)
 	return 1;
 }
 
-const char *Event::getName() const
-{
-	return "love.event.sdl";
-}
-
 Event::Event()
+	: love::event::Event("love.event.sdl")
 {
 	if (SDL_InitSubSystem(SDL_INIT_EVENTS) < 0)
 		throw love::Exception("Could not initialize SDL events subsystem (%s)", SDL_GetError());

src/modules/event/sdl/Event.h

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2023 LOVE Development Team
+ * Copyright (c) 2006-2024 LOVE Development Team
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -42,9 +42,6 @@ class Event : public love::event::Event
 {
 public:
 
-	// Implements Module.
-	const char *getName() const;
-
 	Event();
 	virtual ~Event();
 

src/modules/event/wrap_Event.cpp

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2023 LOVE Development Team
+ * Copyright (c) 2006-2024 LOVE Development Team
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages

src/modules/event/wrap_Event.h

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2023 LOVE Development Team
+ * Copyright (c) 2006-2024 LOVE Development Team
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages

src/modules/event/wrap_Event.lua

@@ -3,7 +3,7 @@ R"luastring"--(
 -- There is a matching delimiter at the bottom of the file.
 
 --[[
-Copyright (c) 2006-2023 LOVE Development Team
+Copyright (c) 2006-2024 LOVE Development Team
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages