SWORD25: unsigned int -> uint

svn-id: r53309

4 files changed, 16 insertions, 16 deletions

diff --git a/engines/sword25/script/luacallback.cpp b/engines/sword25/script/luacallback.cpp
index 4e9d4dd06c..bbf6fa6ab1 100644
--- a/engines/sword25/script/luacallback.cpp
+++ b/engines/sword25/script/luacallback.cpp
@@ -72,7 +72,7 @@ LuaCallback::~LuaCallback() {
 
 // -----------------------------------------------------------------------------
 
-void LuaCallback::RegisterCallbackFunction(lua_State *L, unsigned int ObjectHandle) {
+void LuaCallback::RegisterCallbackFunction(lua_State *L, uint ObjectHandle) {
 	BS_ASSERT(lua_isfunction(L, -1));
 	EnsureObjectCallbackTableExists(L, ObjectHandle);
 
@@ -86,7 +86,7 @@ void LuaCallback::RegisterCallbackFunction(lua_State *L, unsigned int ObjectHand
 
 // -----------------------------------------------------------------------------
 
-void LuaCallback::UnregisterCallbackFunction(lua_State *L, unsigned int ObjectHandle) {
+void LuaCallback::UnregisterCallbackFunction(lua_State *L, uint ObjectHandle) {
 	BS_ASSERT(lua_isfunction(L, -1));
 	EnsureObjectCallbackTableExists(L, ObjectHandle);
 
@@ -116,7 +116,7 @@ void LuaCallback::UnregisterCallbackFunction(lua_State *L, unsigned int ObjectHa
 
 // -----------------------------------------------------------------------------
 
-void LuaCallback::RemoveAllObjectCallbacks(lua_State *L, unsigned int ObjectHandle) {
+void LuaCallback::RemoveAllObjectCallbacks(lua_State *L, uint ObjectHandle) {
 	PushCallbackTable(L);
 
 	// Remove the object callback from the callback table
@@ -129,7 +129,7 @@ void LuaCallback::RemoveAllObjectCallbacks(lua_State *L, unsigned int ObjectHand
 
 // -----------------------------------------------------------------------------
 
-void LuaCallback::InvokeCallbackFunctions(lua_State *L, unsigned int ObjectHandle) {
+void LuaCallback::InvokeCallbackFunctions(lua_State *L, uint ObjectHandle) {
 	EnsureObjectCallbackTableExists(L, ObjectHandle);
 
 	// Iterate through the table and perform all the callbacks
@@ -161,7 +161,7 @@ void LuaCallback::InvokeCallbackFunctions(lua_State *L, unsigned int ObjectHandl
 
 // -----------------------------------------------------------------------------
 
-void LuaCallback::EnsureObjectCallbackTableExists(lua_State *L, unsigned int ObjectHandle) {
+void LuaCallback::EnsureObjectCallbackTableExists(lua_State *L, uint ObjectHandle) {
 	PushObjectCallbackTable(L, ObjectHandle);
 
 	// If the table is nil, it must first be created
@@ -190,7 +190,7 @@ void LuaCallback::PushCallbackTable(lua_State *L) {
 
 // -----------------------------------------------------------------------------
 
-void LuaCallback::PushObjectCallbackTable(lua_State *L, unsigned int ObjectHandle) {
+void LuaCallback::PushObjectCallbackTable(lua_State *L, uint ObjectHandle) {
 	PushCallbackTable(L);
 
 	// Push Object Callback table onto the stack
diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h
index 89ab67a52e..e8f4a9cf02 100644
--- a/engines/sword25/script/luacallback.h
+++ b/engines/sword25/script/luacallback.h
@@ -65,14 +65,14 @@ public:
 	virtual ~LuaCallback();
 
 	// Funktion muss auf dem Lua-Stack liegen.
-	void RegisterCallbackFunction(lua_State *L, unsigned int ObjectHandle);
+	void RegisterCallbackFunction(lua_State *L, uint ObjectHandle);
 
 	// Funktion muss auf dem Lua-Stack liegen.
-	void UnregisterCallbackFunction(lua_State *L, unsigned int ObjectHandle);
+	void UnregisterCallbackFunction(lua_State *L, uint ObjectHandle);
 
-	void RemoveAllObjectCallbacks(lua_State *L, unsigned int ObjectHandle);
+	void RemoveAllObjectCallbacks(lua_State *L, uint ObjectHandle);
 
-	void InvokeCallbackFunctions(lua_State *L, unsigned int ObjectHandle);
+	void InvokeCallbackFunctions(lua_State *L, uint ObjectHandle);
 
 protected:
 	virtual int PreFunctionInvokation(lua_State *L) {
@@ -80,9 +80,9 @@ protected:
 	}
 
 private:
-	void EnsureObjectCallbackTableExists(lua_State *L, unsigned int ObjectHandle);
+	void EnsureObjectCallbackTableExists(lua_State *L, uint ObjectHandle);
 	void PushCallbackTable(lua_State *L);
-	void PushObjectCallbackTable(lua_State *L, unsigned int ObjectHandle);
+	void PushObjectCallbackTable(lua_State *L, uint ObjectHandle);
 };
 
 } // End of namespace Sword25
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index ce63a1512d..4055c5fc06 100644
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -181,7 +181,7 @@ bool LuaScriptEngine::ExecuteFile(const Common::String &FileName) {
 	BS_ASSERT(pPackage);
 
 	// File read
-	unsigned int FileSize;
+	uint FileSize;
 	byte *FileData = pPackage->GetFile(FileName, &FileSize);
 	if (!FileData) {
 		BS_LOG_ERRORLN("Couldn't read \"%s\".", FileName.c_str());
@@ -244,7 +244,7 @@ bool LuaScriptEngine::RegisterStandardLibs() {
 
 // -----------------------------------------------------------------------------
 
-bool LuaScriptEngine::ExecuteBuffer(const byte *Data, unsigned int Size, const Common::String &Name) const {
+bool LuaScriptEngine::ExecuteBuffer(const byte *Data, uint Size, const Common::String &Name) const {
 	// Compile buffer
 	if (luaL_loadbuffer(m_State, (const char *)Data, Size, Name.c_str()) != 0) {
 		BS_LOG_ERRORLN("Couldn't compile \"%s\":\n%s", Name.c_str(), lua_tostring(m_State, -1));
@@ -361,7 +361,7 @@ bool PushPermanentsTable(lua_State *L, PERMANENT_TABLE_TYPE TableType) {
 	lua_newtable(L);
 
 	// All standard permanents are inserted into this table
-	unsigned int Index = 0;
+	uint Index = 0;
 	while (STANDARD_PERMANENTS[Index]) {
 		// Permanents are placed onto the stack; if it does not exist, it is simply ignored
 		lua_getglobal(L, STANDARD_PERMANENTS[Index]);
diff --git a/engines/sword25/script/luascript.h b/engines/sword25/script/luascript.h
index 31038b97e9..f2773eef06 100644
--- a/engines/sword25/script/luascript.h
+++ b/engines/sword25/script/luascript.h
@@ -124,7 +124,7 @@ private:
 
 	bool RegisterStandardLibs();
 	bool RegisterStandardLibExtensions();
-	bool ExecuteBuffer(const byte *Data, unsigned int Size, const Common::String &Name) const;
+	bool ExecuteBuffer(const byte *Data, uint Size, const Common::String &Name) const;
 };
 
 } // End of namespace Sword25