SWORD25: eliminated BS_ prefix in all but kernel/

svn-id: r53259

5 files changed, 42 insertions, 42 deletions

diff --git a/engines/sword25/package/packagemanager.cpp b/engines/sword25/package/packagemanager.cpp
index 329061a6b3..4bf25936bb 100644
--- a/engines/sword25/package/packagemanager.cpp
+++ b/engines/sword25/package/packagemanager.cpp
@@ -44,7 +44,7 @@
 
 namespace Sword25 {
 
-BS_PackageManager::BS_PackageManager(BS_Kernel *pKernel) : BS_Service(pKernel) {
+PackageManager::PackageManager(BS_Kernel *pKernel) : BS_Service(pKernel) {
 	if (!_RegisterScriptBindings())
 		BS_LOG_ERRORLN("Script bindings could not be registered.");
 	else
diff --git a/engines/sword25/package/packagemanager.h b/engines/sword25/package/packagemanager.h
index 9ef3ab066a..739ed9e644 100644
--- a/engines/sword25/package/packagemanager.h
+++ b/engines/sword25/package/packagemanager.h
@@ -69,10 +69,10 @@ namespace Sword25 {
  * 3. LoadDirectoryAsPackage should only be used for testing. The final release will be
  *    have all files in packages.
  */
-class BS_PackageManager : public BS_Service {
+class PackageManager : public BS_Service {
 public:
-	BS_PackageManager(BS_Kernel *pKernel);
-	virtual ~BS_PackageManager() {};
+	PackageManager(BS_Kernel *pKernel);
+	virtual ~PackageManager() {};
 
 	enum FILE_TYPES {
 		FT_DIRECTORY    = (1 << 0),
diff --git a/engines/sword25/package/packagemanager_script.cpp b/engines/sword25/package/packagemanager_script.cpp
index 83d0ae7580..943770f074 100644
--- a/engines/sword25/package/packagemanager_script.cpp
+++ b/engines/sword25/package/packagemanager_script.cpp
@@ -49,10 +49,10 @@ using namespace Lua;
 
 // -----------------------------------------------------------------------------
 
-static BS_PackageManager *GetPM() {
+static PackageManager *GetPM() {
 	BS_Kernel *pKernel = BS_Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_PackageManager *pPM = static_cast<BS_PackageManager *>(pKernel->GetService("package"));
+	PackageManager *pPM = static_cast<PackageManager *>(pKernel->GetService("package"));
 	BS_ASSERT(pPM);
 	return pPM;
 }
@@ -60,7 +60,7 @@ static BS_PackageManager *GetPM() {
 // -----------------------------------------------------------------------------
 
 static int LoadPackage(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	lua_pushbooleancpp(L, pPM->LoadPackage(luaL_checkstring(L, 1), luaL_checkstring(L, 2)));
 
@@ -70,7 +70,7 @@ static int LoadPackage(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int LoadDirectoryAsPackage(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	lua_pushbooleancpp(L, pPM->LoadDirectoryAsPackage(luaL_checkstring(L, 1), luaL_checkstring(L, 2)));
 
@@ -80,7 +80,7 @@ static int LoadDirectoryAsPackage(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetCurrentDirectory(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	lua_pushstring(L, pPM->GetCurrentDirectory().c_str());
 
@@ -90,7 +90,7 @@ static int GetCurrentDirectory(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int ChangeDirectory(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	lua_pushbooleancpp(L, pPM->ChangeDirectory(luaL_checkstring(L, 1)));
 
@@ -100,7 +100,7 @@ static int ChangeDirectory(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetAbsolutePath(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	lua_pushstring(L, pPM->GetAbsolutePath(luaL_checkstring(L, 1)).c_str());
 
@@ -110,7 +110,7 @@ static int GetAbsolutePath(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetFileSize(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	lua_pushnumber(L, pPM->GetFileSize(luaL_checkstring(L, 1)));
 
@@ -120,7 +120,7 @@ static int GetFileSize(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetFileType(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	lua_pushnumber(L, pPM->GetFileType(luaL_checkstring(L, 1)));
 
@@ -147,7 +147,7 @@ static void SplitSearchPath(const Common::String &Path, Common::String &Director
 // -----------------------------------------------------------------------------
 
 static void DoSearch(lua_State *L, const Common::String &path, unsigned int type) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	// Der Packagemanager-Service muss den Suchstring und den Pfad getrennt übergeben bekommen.
 	// Um die Benutzbarkeit zu verbessern sollen Skriptprogrammierer dieses als ein Pfad übergeben können.
@@ -179,21 +179,21 @@ static void DoSearch(lua_State *L, const Common::String &path, unsigned int type
 // -----------------------------------------------------------------------------
 
 static int FindFiles(lua_State *L) {
-	DoSearch(L, luaL_checkstring(L, 1), BS_PackageManager::FT_FILE);
+	DoSearch(L, luaL_checkstring(L, 1), PackageManager::FT_FILE);
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int FindDirectories(lua_State *L) {
-	DoSearch(L, luaL_checkstring(L, 1), BS_PackageManager::FT_DIRECTORY);
+	DoSearch(L, luaL_checkstring(L, 1), PackageManager::FT_DIRECTORY);
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int GetFileAsString(lua_State *L) {
-	BS_PackageManager *pPM = GetPM();
+	PackageManager *pPM = GetPM();
 
 	unsigned int FileSize;
 	char *FileData = (char *)pPM->GetFile(luaL_checkstring(L, 1), &FileSize);
@@ -234,15 +234,15 @@ static const luaL_reg PACKAGE_FUNCTIONS[] = {
 
 // -----------------------------------------------------------------------------
 
-bool BS_PackageManager::_RegisterScriptBindings() {
+bool PackageManager::_RegisterScriptBindings() {
 	BS_Kernel *pKernel = BS_Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ScriptEngine *pScript = static_cast<BS_ScriptEngine *>(pKernel->GetService("script"));
+	ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script"));
 	BS_ASSERT(pScript);
 	lua_State *L = static_cast<lua_State *>(pScript->GetScriptObject());
 	BS_ASSERT(L);
 
-	if (!BS_LuaBindhelper::AddFunctionsToLib(L, PACKAGE_LIBRARY_NAME, PACKAGE_FUNCTIONS)) return false;
+	if (!LuaBindhelper::AddFunctionsToLib(L, PACKAGE_LIBRARY_NAME, PACKAGE_FUNCTIONS)) return false;
 
 	return true;
 }
diff --git a/engines/sword25/package/scummvmpackagemanager.cpp b/engines/sword25/package/scummvmpackagemanager.cpp
index 0792116a4b..0962bc407a 100644
--- a/engines/sword25/package/scummvmpackagemanager.cpp
+++ b/engines/sword25/package/scummvmpackagemanager.cpp
@@ -52,23 +52,23 @@ static Common::String normalizePath(const Common::String &path, const Common::St
 	return Common::normalizePath(wholePath, PATH_SEPARATOR);
 }
 
-BS_ScummVMPackageManager::BS_ScummVMPackageManager(BS_Kernel *kernelPtr) :
-	BS_PackageManager(kernelPtr),
+ScummVMPackageManager::ScummVMPackageManager(BS_Kernel *kernelPtr) :
+	PackageManager(kernelPtr),
 	_currentDirectory(PATH_SEPARATOR),
 	_rootFolder(ConfMan.get("path")) {
 }
 
-BS_ScummVMPackageManager::~BS_ScummVMPackageManager() {
+ScummVMPackageManager::~ScummVMPackageManager() {
 }
 
-BS_Service *BS_ScummVMPackageManager_CreateObject(BS_Kernel *kernelPtr) {
-	return new BS_ScummVMPackageManager(kernelPtr);
+BS_Service *ScummVMPackageManager_CreateObject(BS_Kernel *kernelPtr) {
+	return new ScummVMPackageManager(kernelPtr);
 }
 
 /**
  * Scans through the archive list for a specified file
  */
-Common::ArchiveMemberPtr BS_ScummVMPackageManager::GetArchiveMember(const Common::String &fileName) {
+Common::ArchiveMemberPtr ScummVMPackageManager::GetArchiveMember(const Common::String &fileName) {
 	// Loop through checking each archive
 	Common::List<ArchiveEntry *>::iterator i;
 	for (i = _archiveList.begin(); i != _archiveList.end(); ++i) {
@@ -91,7 +91,7 @@ Common::ArchiveMemberPtr BS_ScummVMPackageManager::GetArchiveMember(const Common
 	return Common::ArchiveMemberPtr();
 }
 
-bool BS_ScummVMPackageManager::LoadPackage(const Common::String &fileName, const Common::String &mountPosition) {
+bool ScummVMPackageManager::LoadPackage(const Common::String &fileName, const Common::String &mountPosition) {
 	Common::Archive *zipFile = Common::makeZipArchive(fileName);
 	if (zipFile == NULL) {
 		BS_LOG_ERRORLN("Unable to mount file \"%s\" to \"%s\"", fileName.c_str(), mountPosition.c_str());
@@ -111,7 +111,7 @@ bool BS_ScummVMPackageManager::LoadPackage(const Common::String &fileName, const
 	}
 }
 
-bool BS_ScummVMPackageManager::LoadDirectoryAsPackage(const Common::String &directoryName, const Common::String &mountPosition) {
+bool ScummVMPackageManager::LoadDirectoryAsPackage(const Common::String &directoryName, const Common::String &mountPosition) {
 	Common::FSNode directory(directoryName);
 	Common::Archive *folderArchive = new Common::FSDirectory(directory, 6);
 	if (!directory.exists() || (folderArchive == NULL)) {
@@ -130,7 +130,7 @@ bool BS_ScummVMPackageManager::LoadDirectoryAsPackage(const Common::String &dire
 	}
 }
 
-byte *BS_ScummVMPackageManager::GetFile(const Common::String &fileName, unsigned int *fileSizePtr) {
+byte *ScummVMPackageManager::GetFile(const Common::String &fileName, unsigned int *fileSizePtr) {
 	Common::SeekableReadStream *in;
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(normalizePath(fileName, _currentDirectory));
 	if (!fileNode)
@@ -152,21 +152,21 @@ byte *BS_ScummVMPackageManager::GetFile(const Common::String &fileName, unsigned
 	return buffer;
 }
 
-Common::String BS_ScummVMPackageManager::GetCurrentDirectory() {
+Common::String ScummVMPackageManager::GetCurrentDirectory() {
 	return _currentDirectory;
 }
 
-bool BS_ScummVMPackageManager::ChangeDirectory(const Common::String &directory) {
+bool ScummVMPackageManager::ChangeDirectory(const Common::String &directory) {
 	// Get the path elements for the file
 	_currentDirectory = normalizePath(directory, _currentDirectory);
 	return true;
 }
 
-Common::String BS_ScummVMPackageManager::GetAbsolutePath(const Common::String &fileName) {
+Common::String ScummVMPackageManager::GetAbsolutePath(const Common::String &fileName) {
 	return normalizePath(fileName, _currentDirectory);
 }
 
-unsigned int BS_ScummVMPackageManager::GetFileSize(const Common::String &fileName) {
+unsigned int ScummVMPackageManager::GetFileSize(const Common::String &fileName) {
 	Common::SeekableReadStream *in;
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(normalizePath(fileName, _currentDirectory));
 	if (!fileNode)
@@ -179,19 +179,19 @@ unsigned int BS_ScummVMPackageManager::GetFileSize(const Common::String &fileNam
 	return fileSize;
 }
 
-unsigned int BS_ScummVMPackageManager::GetFileType(const Common::String &fileName) {
+unsigned int 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;
-	return BS_PackageManager::FT_FILE;
+	return PackageManager::FT_FILE;
 }
 
-bool BS_ScummVMPackageManager::FileExists(const Common::String &fileName) {
+bool ScummVMPackageManager::FileExists(const Common::String &fileName) {
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(normalizePath(fileName, _currentDirectory));
 	return fileNode;
 }
 
-int BS_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, unsigned int typeFilter) {
 	Common::String normalizedFilter = normalizePath(filter, _currentDirectory);
 	int num = 0;
 
@@ -216,8 +216,8 @@ int BS_ScummVMPackageManager::doSearch(Common::ArchiveMemberList &list, const Co
 
 		// Create a list of the matching names
 		for (Common::ArchiveMemberList::iterator it = memberList.begin(); it != memberList.end(); ++it) {
-			if (((typeFilter &  BS_PackageManager::FT_DIRECTORY) && (*it)->getName().hasSuffix("/")) ||
-				((typeFilter & BS_PackageManager::FT_FILE) && !(*it)->getName().hasSuffix("/"))) {
+			if (((typeFilter & PackageManager::FT_DIRECTORY) && (*it)->getName().hasSuffix("/")) ||
+				((typeFilter & PackageManager::FT_FILE) && !(*it)->getName().hasSuffix("/"))) {
 				list.push_back(*it);
 				num++;
 			}
diff --git a/engines/sword25/package/scummvmpackagemanager.h b/engines/sword25/package/scummvmpackagemanager.h
index 8ad454d0eb..b70df2528a 100644
--- a/engines/sword25/package/scummvmpackagemanager.h
+++ b/engines/sword25/package/scummvmpackagemanager.h
@@ -45,7 +45,7 @@ namespace Sword25 {
 
 class BS_Kernel;
 
-class BS_ScummVMPackageManager : public BS_PackageManager {
+class ScummVMPackageManager : public PackageManager {
 private:
 	class ArchiveEntry {
 	public:
@@ -67,8 +67,8 @@ private:
 	Common::ArchiveMemberPtr GetArchiveMember(const Common::String &fileName);
 
 public:
-	BS_ScummVMPackageManager(BS_Kernel *kernelPtr);
-	virtual ~BS_ScummVMPackageManager();
+	ScummVMPackageManager(BS_Kernel *kernelPtr);
+	virtual ~ScummVMPackageManager();
 
 	virtual bool LoadPackage(const Common::String &fileName, const Common::String &mountPosition);
 	virtual bool LoadDirectoryAsPackage(const Common::String &directoryName, const Common::String &mountPosition);