Browse Source

Code style fixes

Alex Szpakowski 11 years ago
parent
commit
3e9fcacf07

+ 77 - 76
src/libraries/luasocket/luasocket.cpp

@@ -39,82 +39,83 @@ namespace love
 {
 {
 namespace luasocket
 namespace luasocket
 {
 {
-	int __open(lua_State * L)
-	{
-
-		// Preload code from LuaSocket.
-		PRELOAD("socket.core", luaopen_socket_core);
-		PRELOAD("mime.core", luaopen_mime_core);
-
-		PRELOAD("socket", __open_luasocket_socket);
-		PRELOAD("socket.ftp", __open_luasocket_ftp)
-		PRELOAD("socket.http", __open_luasocket_http);
-		PRELOAD("ltn12", __open_luasocket_ltn12);
-		PRELOAD("mime", __open_luasocket_mime)
-		PRELOAD("socket.smtp", __open_luasocket_smtp);
-		PRELOAD("socket.tp", __open_luasocket_tp)
-		PRELOAD("socket.url", __open_luasocket_url)
-
-		// No need to register garbage collector function.
-
-		return 0;
-	}
-
-	int __open_luasocket_socket(lua_State * L)
-	{
-		#include "libluasocket/socket.lua.h"
-		lua_getglobal(L, "socket");
-		return 1;
-	}
-
-	int __open_luasocket_ftp(lua_State * L)
-	{
-		#include "libluasocket/ftp.lua.h"
-		lua_getglobal(L, "socket.ftp");
-		return 1;
-	}
-
-	int __open_luasocket_http(lua_State * L)
-	{
-		#include "libluasocket/http.lua.h"
-		lua_getglobal(L, "socket.http");
-		return 1;
-	}
-
-	int __open_luasocket_ltn12(lua_State * L)
-	{
-		#include "libluasocket/ltn12.lua.h"
-		lua_getglobal(L, "ltn12");
-		return 1;
-	}
-
-	int __open_luasocket_mime(lua_State * L)
-	{
-		#include "libluasocket/mime.lua.h"
-		lua_getglobal(L, "mime");
-		return 1;
-	}
-
-	int __open_luasocket_smtp(lua_State * L)
-	{
-		#include "libluasocket/smtp.lua.h"
-		lua_getglobal(L, "socket.smtp");
-		return 1;
-	}
-
-	int __open_luasocket_tp(lua_State * L)
-	{
-		#include "libluasocket/tp.lua.h"
-		lua_getglobal(L, "socket.tp");
-		return 1;
-	}
-
-	int __open_luasocket_url(lua_State * L)
-	{
-		#include "libluasocket/url.lua.h"
-		lua_getglobal(L, "socket.url");
-		return 1;
-	}
+
+int __open(lua_State * L)
+{
+
+	// Preload code from LuaSocket.
+	PRELOAD("socket.core", luaopen_socket_core);
+	PRELOAD("mime.core", luaopen_mime_core);
+
+	PRELOAD("socket", __open_luasocket_socket);
+	PRELOAD("socket.ftp", __open_luasocket_ftp)
+	PRELOAD("socket.http", __open_luasocket_http);
+	PRELOAD("ltn12", __open_luasocket_ltn12);
+	PRELOAD("mime", __open_luasocket_mime)
+	PRELOAD("socket.smtp", __open_luasocket_smtp);
+	PRELOAD("socket.tp", __open_luasocket_tp)
+	PRELOAD("socket.url", __open_luasocket_url)
+
+	// No need to register garbage collector function.
+
+	return 0;
+}
+
+int __open_luasocket_socket(lua_State * L)
+{
+	#include "libluasocket/socket.lua.h"
+	lua_getglobal(L, "socket");
+	return 1;
+}
+
+int __open_luasocket_ftp(lua_State * L)
+{
+	#include "libluasocket/ftp.lua.h"
+	lua_getglobal(L, "socket.ftp");
+	return 1;
+}
+
+int __open_luasocket_http(lua_State * L)
+{
+	#include "libluasocket/http.lua.h"
+	lua_getglobal(L, "socket.http");
+	return 1;
+}
+
+int __open_luasocket_ltn12(lua_State * L)
+{
+	#include "libluasocket/ltn12.lua.h"
+	lua_getglobal(L, "ltn12");
+	return 1;
+}
+
+int __open_luasocket_mime(lua_State * L)
+{
+	#include "libluasocket/mime.lua.h"
+	lua_getglobal(L, "mime");
+	return 1;
+}
+
+int __open_luasocket_smtp(lua_State * L)
+{
+	#include "libluasocket/smtp.lua.h"
+	lua_getglobal(L, "socket.smtp");
+	return 1;
+}
+
+int __open_luasocket_tp(lua_State * L)
+{
+	#include "libluasocket/tp.lua.h"
+	lua_getglobal(L, "socket.tp");
+	return 1;
+}
+
+int __open_luasocket_url(lua_State * L)
+{
+	#include "libluasocket/url.lua.h"
+	lua_getglobal(L, "socket.url");
+	return 1;
+}
 
 
 } // luasocket
 } // luasocket
 } // love
 } // love

+ 13 - 12
src/libraries/luasocket/luasocket.h

@@ -28,19 +28,20 @@ namespace love
 {
 {
 namespace luasocket
 namespace luasocket
 {
 {
-	int __open(lua_State * L);
 
 
-	// Loaders for all lua files. We want to be able
-	// to load these dynamically. (Identical in the LuaSocket 
-	// documentation. These functions wrap the parsing of code, etc).
-	int __open_luasocket_socket(lua_State * L);
-	int __open_luasocket_ftp(lua_State * L);
-	int __open_luasocket_http(lua_State * L);
-	int __open_luasocket_ltn12(lua_State * L);
-	int __open_luasocket_mime(lua_State * L);
-	int __open_luasocket_smtp(lua_State * L);
-	int __open_luasocket_tp(lua_State * L);
-	int __open_luasocket_url(lua_State * L);
+int __open(lua_State * L);
+
+// Loaders for all lua files. We want to be able
+// to load these dynamically. (Identical in the LuaSocket 
+// documentation. These functions wrap the parsing of code, etc).
+int __open_luasocket_socket(lua_State * L);
+int __open_luasocket_ftp(lua_State * L);
+int __open_luasocket_http(lua_State * L);
+int __open_luasocket_ltn12(lua_State * L);
+int __open_luasocket_mime(lua_State * L);
+int __open_luasocket_smtp(lua_State * L);
+int __open_luasocket_tp(lua_State * L);
+int __open_luasocket_url(lua_State * L);
 
 
 } // luasocket
 } // luasocket
 } // love
 } // love

+ 2 - 1
src/modules/audio/null/Audio.cpp

@@ -27,7 +27,8 @@ namespace audio
 namespace null
 namespace null
 {
 {
 
 
-Audio::Audio() : distanceModel(DISTANCE_NONE)
+Audio::Audio()
+	: distanceModel(DISTANCE_NONE)
 {
 {
 }
 }
 
 

+ 2 - 1
src/modules/audio/openal/Audio.cpp

@@ -68,7 +68,8 @@ void Audio::PoolThread::setFinish()
 	finish = true;
 	finish = true;
 }
 }
 
 
-Audio::Audio() : distanceModel(DISTANCE_INVERSE_CLAMPED)
+Audio::Audio()
+	: distanceModel(DISTANCE_INVERSE_CLAMPED)
 {
 {
 	// Passing zero for default device.
 	// Passing zero for default device.
 	device = alcOpenDevice(0);
 	device = alcOpenDevice(0);