From b4139ffab552b9aeaa72960e462d5568b7f07acf Mon Sep 17 00:00:00 2001
From: Bart van Strien <bart@bartbes.ath.cx>
Date: Sun, 13 Mar 2011 20:25:35 +0100
Subject: [PATCH] Rename loaders to fit their locations

--HG--
branch : minor
---
 src/love.cpp                                  | 26 +++++++++----------
 src/modules/audio/openal/wrap_Audio.cpp       |  2 +-
 src/modules/audio/openal/wrap_Audio.h         |  2 +-
 src/modules/event/sdl/wrap_Event.cpp          |  2 +-
 src/modules/event/sdl/wrap_Event.h            |  2 +-
 .../filesystem/physfs/wrap_Filesystem.cpp     |  2 +-
 .../filesystem/physfs/wrap_Filesystem.h       |  2 +-
 src/modules/font/freetype/wrap_Font.cpp       |  2 +-
 src/modules/font/freetype/wrap_Font.h         |  2 +-
 src/modules/graphics/opengl/wrap_Graphics.cpp |  2 +-
 src/modules/graphics/opengl/wrap_Graphics.h   |  2 +-
 src/modules/image/devil/wrap_Image.cpp        |  2 +-
 src/modules/image/devil/wrap_Image.h          |  2 +-
 src/modules/joystick/sdl/wrap_Joystick.cpp    |  2 +-
 src/modules/joystick/sdl/wrap_Joystick.h      |  2 +-
 src/modules/keyboard/sdl/wrap_Keyboard.cpp    |  2 +-
 src/modules/keyboard/sdl/wrap_Keyboard.h      |  2 +-
 src/modules/mouse/sdl/wrap_Mouse.cpp          |  2 +-
 src/modules/mouse/sdl/wrap_Mouse.h            |  2 +-
 src/modules/physics/box2d/wrap_Physics.cpp    |  2 +-
 src/modules/physics/box2d/wrap_Physics.h      |  2 +-
 src/modules/sound/lullaby/wrap_Sound.cpp      |  2 +-
 src/modules/sound/lullaby/wrap_Sound.h        |  2 +-
 src/modules/thread/sdl/Thread.cpp             |  4 +--
 src/modules/thread/sdl/wrap_Thread.cpp        |  2 +-
 src/modules/thread/sdl/wrap_Thread.h          |  2 +-
 src/modules/timer/sdl/wrap_Timer.cpp          |  2 +-
 src/modules/timer/sdl/wrap_Timer.h            |  2 +-
 28 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/love.cpp b/src/love.cpp
index 3806fa248..c38afbbce 100644
--- a/src/love.cpp
+++ b/src/love.cpp
@@ -66,19 +66,19 @@
 #ifdef LOVE_BUILD_STANDALONE
 
 static const luaL_Reg modules[] = {
-	{ "love.audio.openal", love::audio::openal::luaopen_love_audio },
-	{ "love.event.sdl", love::event::sdl::luaopen_love_event },
-	{ "love.filesystem.physfs", love::filesystem::physfs::luaopen_love_filesystem },
-	{ "love.font.freetype", love::font::freetype::luaopen_love_font },
-	{ "love.graphics.opengl", love::graphics::opengl::luaopen_love_graphics },
-	{ "love.image.devil", love::image::devil::luaopen_love_image },
-	{ "love.joystick.sdl", love::joystick::sdl::luaopen_love_joystick },
-	{ "love.keyboard.sdl", love::keyboard::sdl::luaopen_love_keyboard },
-	{ "love.mouse.sdl", love::mouse::sdl::luaopen_love_mouse },
-	{ "love.physics.box2d", love::physics::box2d::luaopen_love_physics },
-	{ "love.sound.lullaby", love::sound::lullaby::luaopen_love_sound },
-	{ "love.timer.sdl", love::timer::sdl::luaopen_love_timer },
-	{ "love.thread.sdl", love::thread::sdl::luaopen_love_thread },
+	{ "love.audio.openal", love::audio::openal::luaopen_love_audio_openal },
+	{ "love.event.sdl", love::event::sdl::luaopen_love_event_sdl },
+	{ "love.filesystem.physfs", love::filesystem::physfs::luaopen_love_filesystem_physfs },
+	{ "love.font.freetype", love::font::freetype::luaopen_love_font_freetype },
+	{ "love.graphics.opengl", love::graphics::opengl::luaopen_love_graphics_opengl },
+	{ "love.image.devil", love::image::devil::luaopen_love_image_devil },
+	{ "love.joystick.sdl", love::joystick::sdl::luaopen_love_joystick_sdl },
+	{ "love.keyboard.sdl", love::keyboard::sdl::luaopen_love_keyboard_sdl },
+	{ "love.mouse.sdl", love::mouse::sdl::luaopen_love_mouse_sdl },
+	{ "love.physics.box2d", love::physics::box2d::luaopen_love_physics_box2d },
+	{ "love.sound.lullaby", love::sound::lullaby::luaopen_love_sound_lullaby },
+	{ "love.timer.sdl", love::timer::sdl::luaopen_love_timer_sdl },
+	{ "love.thread.sdl", love::thread::sdl::luaopen_love_thread_sdl },
 	{ 0, 0 }
 };
 
diff --git a/src/modules/audio/openal/wrap_Audio.cpp b/src/modules/audio/openal/wrap_Audio.cpp
index 2a3f14103..831a36062 100644
--- a/src/modules/audio/openal/wrap_Audio.cpp
+++ b/src/modules/audio/openal/wrap_Audio.cpp
@@ -63,7 +63,7 @@ namespace openal
 		0
 	};
 
-	int luaopen_love_audio(lua_State * L)
+	int luaopen_love_audio_openal(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/audio/openal/wrap_Audio.h b/src/modules/audio/openal/wrap_Audio.h
index 8338ed287..1b463987c 100644
--- a/src/modules/audio/openal/wrap_Audio.h
+++ b/src/modules/audio/openal/wrap_Audio.h
@@ -30,7 +30,7 @@ namespace audio
 {
 namespace openal
 {
-	extern "C" LOVE_EXPORT int luaopen_love_audio(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_audio_openal(lua_State * L);
 
 } // openal
 } // audio
diff --git a/src/modules/event/sdl/wrap_Event.cpp b/src/modules/event/sdl/wrap_Event.cpp
index 77b4e6fe5..e309a87f8 100644
--- a/src/modules/event/sdl/wrap_Event.cpp
+++ b/src/modules/event/sdl/wrap_Event.cpp
@@ -186,7 +186,7 @@ namespace sdl
 		{ 0, 0 }
 	};
 
-	int luaopen_love_event(lua_State * L)
+	int luaopen_love_event_sdl(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/event/sdl/wrap_Event.h b/src/modules/event/sdl/wrap_Event.h
index 107a0ace9..6bbbb3095 100644
--- a/src/modules/event/sdl/wrap_Event.h
+++ b/src/modules/event/sdl/wrap_Event.h
@@ -36,7 +36,7 @@ namespace sdl
 	int w_wait(lua_State * L);
 	int w_push(lua_State * L);
 
-	extern "C" LOVE_EXPORT int luaopen_love_event(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_event_sdl(lua_State * L);
 
 } // sdl
 } // event
diff --git a/src/modules/filesystem/physfs/wrap_Filesystem.cpp b/src/modules/filesystem/physfs/wrap_Filesystem.cpp
index 9d1c2c15c..64d66ee52 100644
--- a/src/modules/filesystem/physfs/wrap_Filesystem.cpp
+++ b/src/modules/filesystem/physfs/wrap_Filesystem.cpp
@@ -318,7 +318,7 @@ namespace physfs
 		0
 	};
 
-	int luaopen_love_filesystem(lua_State * L)
+	int luaopen_love_filesystem_physfs(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/filesystem/physfs/wrap_Filesystem.h b/src/modules/filesystem/physfs/wrap_Filesystem.h
index 30d3e9b99..4667b3052 100644
--- a/src/modules/filesystem/physfs/wrap_Filesystem.h
+++ b/src/modules/filesystem/physfs/wrap_Filesystem.h
@@ -59,7 +59,7 @@ namespace physfs
 	int w_load(lua_State * L);
 	int w_getLastModified(lua_State * L);
 	int loader(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_filesystem(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_filesystem_physfs(lua_State * L);
 
 } // physfs
 } // filesystem
diff --git a/src/modules/font/freetype/wrap_Font.cpp b/src/modules/font/freetype/wrap_Font.cpp
index e04d52978..6f100a396 100644
--- a/src/modules/font/freetype/wrap_Font.cpp
+++ b/src/modules/font/freetype/wrap_Font.cpp
@@ -77,7 +77,7 @@ namespace freetype
 		0
 	};
 
-	int luaopen_love_font(lua_State * L)
+	int luaopen_love_font_freetype(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/font/freetype/wrap_Font.h b/src/modules/font/freetype/wrap_Font.h
index 5a7ca90c9..eb8fb7e62 100644
--- a/src/modules/font/freetype/wrap_Font.h
+++ b/src/modules/font/freetype/wrap_Font.h
@@ -34,7 +34,7 @@ namespace freetype
 	int w_newRasterizer(lua_State * L);
 	int w_newGlyphData(lua_State * L);
 	int w_newFontData(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_font(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_font_freetype(lua_State * L);
 
 } // freetype
 } // font
diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp
index 3e0124986..f2b377f0a 100644
--- a/src/modules/graphics/opengl/wrap_Graphics.cpp
+++ b/src/modules/graphics/opengl/wrap_Graphics.cpp
@@ -1000,7 +1000,7 @@ namespace opengl
 		0
 	};
 
-	int luaopen_love_graphics(lua_State * L)
+	int luaopen_love_graphics_opengl(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/graphics/opengl/wrap_Graphics.h b/src/modules/graphics/opengl/wrap_Graphics.h
index e6b1a635a..f2f1c1cb6 100644
--- a/src/modules/graphics/opengl/wrap_Graphics.h
+++ b/src/modules/graphics/opengl/wrap_Graphics.h
@@ -100,7 +100,7 @@ namespace opengl
 	int w_scale(lua_State * L);
 	int w_translate(lua_State * L);
 	int w_hasFocus(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_graphics(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_graphics_opengl(lua_State * L);
 
 } // opengl
 } // graphics
diff --git a/src/modules/image/devil/wrap_Image.cpp b/src/modules/image/devil/wrap_Image.cpp
index 569e4baa1..da370c705 100644
--- a/src/modules/image/devil/wrap_Image.cpp
+++ b/src/modules/image/devil/wrap_Image.cpp
@@ -43,7 +43,7 @@ namespace devil
 		0
 	};
 	
-	int luaopen_love_image(lua_State * L)
+	int luaopen_love_image_devil(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/image/devil/wrap_Image.h b/src/modules/image/devil/wrap_Image.h
index 66ec62762..3003ad871 100644
--- a/src/modules/image/devil/wrap_Image.h
+++ b/src/modules/image/devil/wrap_Image.h
@@ -31,7 +31,7 @@ namespace image
 {
 namespace devil
 {
-	extern "C" LOVE_EXPORT int luaopen_love_image(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_image_devil(lua_State * L);
 
 } //devil
 } // image
diff --git a/src/modules/joystick/sdl/wrap_Joystick.cpp b/src/modules/joystick/sdl/wrap_Joystick.cpp
index 29e0b9fd9..b746c98b6 100644
--- a/src/modules/joystick/sdl/wrap_Joystick.cpp
+++ b/src/modules/joystick/sdl/wrap_Joystick.cpp
@@ -151,7 +151,7 @@ namespace sdl
 		{ 0, 0 }
 	};
 
-	int luaopen_love_joystick(lua_State * L)
+	int luaopen_love_joystick_sdl(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/joystick/sdl/wrap_Joystick.h b/src/modules/joystick/sdl/wrap_Joystick.h
index 2c6002f49..564316ec0 100644
--- a/src/modules/joystick/sdl/wrap_Joystick.h
+++ b/src/modules/joystick/sdl/wrap_Joystick.h
@@ -45,7 +45,7 @@ namespace sdl
 	int w_isDown(lua_State * L);
 	int w_getHat(lua_State * L);
 	int w_close(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_joystick(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_joystick_sdl(lua_State * L);
 
 } // sdl
 } // joystick
diff --git a/src/modules/keyboard/sdl/wrap_Keyboard.cpp b/src/modules/keyboard/sdl/wrap_Keyboard.cpp
index 6987f6d81..d18a3b103 100644
--- a/src/modules/keyboard/sdl/wrap_Keyboard.cpp
+++ b/src/modules/keyboard/sdl/wrap_Keyboard.cpp
@@ -72,7 +72,7 @@ namespace sdl
 		{ 0, 0 }
 	};
 
-	int luaopen_love_keyboard(lua_State * L)
+	int luaopen_love_keyboard_sdl(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/keyboard/sdl/wrap_Keyboard.h b/src/modules/keyboard/sdl/wrap_Keyboard.h
index 798850e5f..9df5eccfe 100644
--- a/src/modules/keyboard/sdl/wrap_Keyboard.h
+++ b/src/modules/keyboard/sdl/wrap_Keyboard.h
@@ -37,7 +37,7 @@ namespace sdl
 	int w_isDown(lua_State * L);
 	int w_setKeyRepeat(lua_State * L);
 	int w_getKeyRepeat(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_keyboard(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_keyboard_sdl(lua_State * L);
 
 } // sdl
 } // keyboard
diff --git a/src/modules/mouse/sdl/wrap_Mouse.cpp b/src/modules/mouse/sdl/wrap_Mouse.cpp
index f5baef0f9..c77aeb77e 100644
--- a/src/modules/mouse/sdl/wrap_Mouse.cpp
+++ b/src/modules/mouse/sdl/wrap_Mouse.cpp
@@ -109,7 +109,7 @@ namespace sdl
 		{ 0, 0 }
 	};
 
-	int luaopen_love_mouse(lua_State * L)
+	int luaopen_love_mouse_sdl(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/mouse/sdl/wrap_Mouse.h b/src/modules/mouse/sdl/wrap_Mouse.h
index 6c3b9cdc7..0e65e31a7 100644
--- a/src/modules/mouse/sdl/wrap_Mouse.h
+++ b/src/modules/mouse/sdl/wrap_Mouse.h
@@ -40,7 +40,7 @@ namespace sdl
 	int w_isVisible(lua_State * L);
 	int w_setGrap(lua_State * L);
 	int w_isGrabbed(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_mouse(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_mouse_sdl(lua_State * L);
 
 } // sdl
 } // mouse
diff --git a/src/modules/physics/box2d/wrap_Physics.cpp b/src/modules/physics/box2d/wrap_Physics.cpp
index e94bf1e2b..72a720259 100644
--- a/src/modules/physics/box2d/wrap_Physics.cpp
+++ b/src/modules/physics/box2d/wrap_Physics.cpp
@@ -229,7 +229,7 @@ namespace box2d
 		0
 	};
 
-	int luaopen_love_physics(lua_State * L)
+	int luaopen_love_physics_box2d(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/physics/box2d/wrap_Physics.h b/src/modules/physics/box2d/wrap_Physics.h
index 46cbb55ff..ec51939cc 100644
--- a/src/modules/physics/box2d/wrap_Physics.h
+++ b/src/modules/physics/box2d/wrap_Physics.h
@@ -55,7 +55,7 @@ namespace box2d
 	int w_newPrismaticJoint(lua_State * L);
 	int w_newPulleyJoint(lua_State * L);
 	int w_newGearJoint(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_physics(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_physics_box2d(lua_State * L);
 
 } // box2d
 } // physics
diff --git a/src/modules/sound/lullaby/wrap_Sound.cpp b/src/modules/sound/lullaby/wrap_Sound.cpp
index 6aa5b6673..87ca75bdd 100644
--- a/src/modules/sound/lullaby/wrap_Sound.cpp
+++ b/src/modules/sound/lullaby/wrap_Sound.cpp
@@ -42,7 +42,7 @@ namespace lullaby
 		0
 	};
 
-	int luaopen_love_sound(lua_State * L)
+	int luaopen_love_sound_lullaby(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/sound/lullaby/wrap_Sound.h b/src/modules/sound/lullaby/wrap_Sound.h
index fb9cf58ac..eb9bac5e0 100644
--- a/src/modules/sound/lullaby/wrap_Sound.h
+++ b/src/modules/sound/lullaby/wrap_Sound.h
@@ -31,7 +31,7 @@ namespace sound
 {
 namespace lullaby
 {
-	extern "C" LOVE_EXPORT int luaopen_love_sound(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_sound_lullaby(lua_State * L);
 
 } // lullaby
 } // sound
diff --git a/src/modules/thread/sdl/Thread.cpp b/src/modules/thread/sdl/Thread.cpp
index e44e2738f..6a17f86c7 100644
--- a/src/modules/thread/sdl/Thread.cpp
+++ b/src/modules/thread/sdl/Thread.cpp
@@ -25,7 +25,7 @@
 #ifdef LOVE_BUILD_STANDALONE
 extern "C" int luaopen_love(lua_State * L);
 #endif // LOVE_BUILD_STANDALONE
-extern "C" int luaopen_love_thread(lua_State *L);
+extern "C" int luaopen_love_thread_sdl(lua_State *L);
 
 namespace love
 {
@@ -41,7 +41,7 @@ namespace sdl
 		love::luax_preload(L, luaopen_love, "love");
 		luaopen_love(L);
 	#endif // LOVE_BUILD_STANDALONE
-		luaopen_love_thread(L);
+		luaopen_love_thread_sdl(L);
 		{
 			size_t len;
 			const char *name = comm->getName(&len);
diff --git a/src/modules/thread/sdl/wrap_Thread.cpp b/src/modules/thread/sdl/wrap_Thread.cpp
index 37cd75f1f..c50c0595c 100644
--- a/src/modules/thread/sdl/wrap_Thread.cpp
+++ b/src/modules/thread/sdl/wrap_Thread.cpp
@@ -356,7 +356,7 @@ namespace sdl
 		0
 	};
 
-	int luaopen_love_thread(lua_State *L)
+	int luaopen_love_thread_sdl(lua_State *L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/thread/sdl/wrap_Thread.h b/src/modules/thread/sdl/wrap_Thread.h
index 186f92140..4a6201a14 100644
--- a/src/modules/thread/sdl/wrap_Thread.h
+++ b/src/modules/thread/sdl/wrap_Thread.h
@@ -48,7 +48,7 @@ namespace sdl
 	int w_getThreads(lua_State *L);
 	int w_getThread(lua_State *L);
 
-	extern "C" LOVE_EXPORT int luaopen_love_thread(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_thread_sdl(lua_State * L);
 } // sdl
 } // thread
 } // love
diff --git a/src/modules/timer/sdl/wrap_Timer.cpp b/src/modules/timer/sdl/wrap_Timer.cpp
index af945fbab..a76ccb8d4 100644
--- a/src/modules/timer/sdl/wrap_Timer.cpp
+++ b/src/modules/timer/sdl/wrap_Timer.cpp
@@ -78,7 +78,7 @@ namespace sdl
 	};
 
 
-	int luaopen_love_timer(lua_State * L)
+	int luaopen_love_timer_sdl(lua_State * L)
 	{
 		if(instance == 0)
 		{
diff --git a/src/modules/timer/sdl/wrap_Timer.h b/src/modules/timer/sdl/wrap_Timer.h
index 4863bd269..44792544a 100644
--- a/src/modules/timer/sdl/wrap_Timer.h
+++ b/src/modules/timer/sdl/wrap_Timer.h
@@ -37,7 +37,7 @@ namespace sdl
 	int w_sleep(lua_State * L);
 	int w_getTime(lua_State * L);
 	int w_getMicroTime(lua_State * L);
-	extern "C" LOVE_EXPORT int luaopen_love_timer(lua_State * L);
+	extern "C" LOVE_EXPORT int luaopen_love_timer_sdl(lua_State * L);
 
 } // sdl
 } // timer