SWORD25: unsigned int -> uint

svn-id: r53309

4 files changed, 16 insertions, 16 deletions

diff --git a/engines/sword25/package/packagemanager.h b/engines/sword25/package/packagemanager.h
index 4aaa05c589..996c94cd8b 100644
--- a/engines/sword25/package/packagemanager.h
+++ b/engines/sword25/package/packagemanager.h
@@ -100,7 +100,7 @@ public:
 	 * @return              Specifies a pointer to the loaded data of the file
 	 * @remark              The client must not forget to release the data of the file using BE_DELETE_A.
 	 */
-	virtual byte *GetFile(const Common::String &FileName, unsigned int *pFileSize = NULL) = 0;
+	virtual byte *GetFile(const Common::String &FileName, uint *pFileSize = NULL) = 0;
 
 	/**
 	 * Returns a stream from file file from the virtual directory tree
@@ -116,9 +116,9 @@ public:
 	 * @return              Specifies a pointer to the loaded data of the file
 	 * @remark              The client must not forget to release the data of the file using BE_DELETE_A.
 	 */
-	char *GetXmlFile(const Common::String &FileName, unsigned int *pFileSize = NULL) {
+	char *GetXmlFile(const Common::String &FileName, uint *pFileSize = NULL) {
 		const char *versionStr = "<?xml version=\"1.0\"?>";
-		unsigned int fileSize;
+		uint fileSize;
 		char *data = (char *)GetFile(FileName, &fileSize);
 		char *result = (char *)malloc(fileSize + strlen(versionStr) + 1);
 		strcpy(result, versionStr);
@@ -162,7 +162,7 @@ public:
 	 * @return              Specifies a pointer to a BS_PackageManager::FileSearch object, or NULL if no file was found.
 	 * @remark              Do not forget to delete the object after use.
 	*/
-	virtual int doSearch(Common::ArchiveMemberList &list, const Common::String &Filter, const Common::String &Path, unsigned int TypeFilter = FT_DIRECTORY | FT_FILE) = 0;
+	virtual int doSearch(Common::ArchiveMemberList &list, const Common::String &Filter, const Common::String &Path, uint TypeFilter = FT_DIRECTORY | FT_FILE) = 0;
 
 	/**
 	 * Returns a file's size
@@ -170,7 +170,7 @@ public:
 	 * @return              The file size. If an error occurs, then 0xffffffff is returned.
 	 * @remarks             For files in packages, then uncompressed size is returned.
 	 **/
-	virtual unsigned int GetFileSize(const Common::String &FileName) = 0;
+	virtual uint GetFileSize(const Common::String &FileName) = 0;
 
 	/**
 	 * Returns the type of a file.
@@ -179,7 +179,7 @@ public:
 	 * or BS_PackageManager::FT_FILE).
 	 * If the file was not found, then 0 is returned.
 	 */
-	virtual unsigned int GetFileType(const Common::String &FileName) = 0;
+	virtual uint GetFileType(const Common::String &FileName) = 0;
 
 	/**
 	 * Determines whether a file exists
diff --git a/engines/sword25/package/packagemanager_script.cpp b/engines/sword25/package/packagemanager_script.cpp
index dd4a32e2c7..e82f0fba63 100644
--- a/engines/sword25/package/packagemanager_script.cpp
+++ b/engines/sword25/package/packagemanager_script.cpp
@@ -146,7 +146,7 @@ static void SplitSearchPath(const Common::String &Path, Common::String &Director
 
 // -----------------------------------------------------------------------------
 
-static void DoSearch(lua_State *L, const Common::String &path, unsigned int type) {
+static void DoSearch(lua_State *L, const Common::String &path, uint type) {
 	PackageManager *pPM = GetPM();
 
 	// Der Packagemanager-Service muss den Suchstring und den Pfad getrennt übergeben bekommen.
@@ -195,7 +195,7 @@ static int FindDirectories(lua_State *L) {
 static int GetFileAsString(lua_State *L) {
 	PackageManager *pPM = GetPM();
 
-	unsigned int FileSize;
+	uint FileSize;
 	char *FileData = (char *)pPM->GetFile(luaL_checkstring(L, 1), &FileSize);
 	if (FileData) {
 		lua_pushlstring(L, FileData, FileSize);
diff --git a/engines/sword25/package/scummvmpackagemanager.cpp b/engines/sword25/package/scummvmpackagemanager.cpp
index ee4e100b32..1a98bee91c 100644
--- a/engines/sword25/package/scummvmpackagemanager.cpp
+++ b/engines/sword25/package/scummvmpackagemanager.cpp
@@ -130,7 +130,7 @@ bool ScummVMPackageManager::LoadDirectoryAsPackage(const Common::String &directo
 	}
 }
 
-byte *ScummVMPackageManager::GetFile(const Common::String &fileName, unsigned int *fileSizePtr) {
+byte *ScummVMPackageManager::GetFile(const Common::String &fileName, uint *fileSizePtr) {
 	Common::SeekableReadStream *in;
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(normalizePath(fileName, _currentDirectory));
 	if (!fileNode)
@@ -177,7 +177,7 @@ Common::String ScummVMPackageManager::GetAbsolutePath(const Common::String &file
 	return normalizePath(fileName, _currentDirectory);
 }
 
-unsigned int ScummVMPackageManager::GetFileSize(const Common::String &fileName) {
+uint ScummVMPackageManager::GetFileSize(const Common::String &fileName) {
 	Common::SeekableReadStream *in;
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(normalizePath(fileName, _currentDirectory));
 	if (!fileNode)
@@ -190,7 +190,7 @@ unsigned int ScummVMPackageManager::GetFileSize(const Common::String &fileName)
 	return fileSize;
 }
 
-unsigned int ScummVMPackageManager::GetFileType(const Common::String &fileName) {
+uint ScummVMPackageManager::GetFileType(const Common::String &fileName) {
 	warning("STUB: BS_ScummVMPackageManager::GetFileType(%s)", fileName.c_str());
 
 	//return fileNode.isDirectory() ? BS_PackageManager::FT_DIRECTORY : BS_PackageManager::FT_FILE;
@@ -202,7 +202,7 @@ bool ScummVMPackageManager::FileExists(const Common::String &fileName) {
 	return fileNode;
 }
 
-int ScummVMPackageManager::doSearch(Common::ArchiveMemberList &list, const Common::String &filter, const Common::String &path, unsigned int typeFilter) {
+int ScummVMPackageManager::doSearch(Common::ArchiveMemberList &list, const Common::String &filter, const Common::String &path, uint typeFilter) {
 	Common::String normalizedFilter = normalizePath(filter, _currentDirectory);
 	int num = 0;
 
diff --git a/engines/sword25/package/scummvmpackagemanager.h b/engines/sword25/package/scummvmpackagemanager.h
index 6ffc10264a..bc8545d563 100644
--- a/engines/sword25/package/scummvmpackagemanager.h
+++ b/engines/sword25/package/scummvmpackagemanager.h
@@ -72,14 +72,14 @@ public:
 
 	virtual bool LoadPackage(const Common::String &fileName, const Common::String &mountPosition);
 	virtual bool LoadDirectoryAsPackage(const Common::String &directoryName, const Common::String &mountPosition);
-	virtual byte *GetFile(const Common::String &fileName, unsigned int *fileSizePtr = 0);
+	virtual byte *GetFile(const Common::String &fileName, uint *fileSizePtr = 0);
 	virtual Common::SeekableReadStream *GetStream(const Common::String &fileName);
 	virtual Common::String GetCurrentDirectory();
 	virtual bool ChangeDirectory(const Common::String &directory);
 	virtual Common::String GetAbsolutePath(const Common::String &fileName);
-	virtual int doSearch(Common::ArchiveMemberList &list, const Common::String &filter, const Common::String &path, unsigned int typeFilter = FT_DIRECTORY | FT_FILE);
-	virtual unsigned int GetFileSize(const Common::String &fileName);
-	virtual unsigned int GetFileType(const Common::String &fileName);
+	virtual int doSearch(Common::ArchiveMemberList &list, const Common::String &filter, const Common::String &path, uint typeFilter = FT_DIRECTORY | FT_FILE);
+	virtual uint GetFileSize(const Common::String &fileName);
+	virtual uint GetFileType(const Common::String &fileName);
 	virtual bool FileExists(const Common::String &fileName);
 };