SWORD25: removed BS_ prefix from rest of the classes.

The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.

svn-id: r53261

5 files changed, 9 insertions, 9 deletions

diff --git a/engines/sword25/package/packagemanager.cpp b/engines/sword25/package/packagemanager.cpp
index 4bf25936bb..92ba307b96 100644
--- a/engines/sword25/package/packagemanager.cpp
+++ b/engines/sword25/package/packagemanager.cpp
@@ -44,7 +44,7 @@
 
 namespace Sword25 {
 
-PackageManager::PackageManager(BS_Kernel *pKernel) : BS_Service(pKernel) {
+PackageManager::PackageManager(Kernel *pKernel) : 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 739ed9e644..04f863bef8 100644
--- a/engines/sword25/package/packagemanager.h
+++ b/engines/sword25/package/packagemanager.h
@@ -69,9 +69,9 @@ namespace Sword25 {
  * 3. LoadDirectoryAsPackage should only be used for testing. The final release will be
  *    have all files in packages.
  */
-class PackageManager : public BS_Service {
+class PackageManager : public Service {
 public:
-	PackageManager(BS_Kernel *pKernel);
+	PackageManager(Kernel *pKernel);
 	virtual ~PackageManager() {};
 
 	enum FILE_TYPES {
diff --git a/engines/sword25/package/packagemanager_script.cpp b/engines/sword25/package/packagemanager_script.cpp
index 943770f074..dd4a32e2c7 100644
--- a/engines/sword25/package/packagemanager_script.cpp
+++ b/engines/sword25/package/packagemanager_script.cpp
@@ -50,7 +50,7 @@ using namespace Lua;
 // -----------------------------------------------------------------------------
 
 static PackageManager *GetPM() {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 	PackageManager *pPM = static_cast<PackageManager *>(pKernel->GetService("package"));
 	BS_ASSERT(pPM);
@@ -235,7 +235,7 @@ static const luaL_reg PACKAGE_FUNCTIONS[] = {
 // -----------------------------------------------------------------------------
 
 bool PackageManager::_RegisterScriptBindings() {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 	ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script"));
 	BS_ASSERT(pScript);
diff --git a/engines/sword25/package/scummvmpackagemanager.cpp b/engines/sword25/package/scummvmpackagemanager.cpp
index 0962bc407a..7a38e8d22a 100644
--- a/engines/sword25/package/scummvmpackagemanager.cpp
+++ b/engines/sword25/package/scummvmpackagemanager.cpp
@@ -52,7 +52,7 @@ static Common::String normalizePath(const Common::String &path, const Common::St
 	return Common::normalizePath(wholePath, PATH_SEPARATOR);
 }
 
-ScummVMPackageManager::ScummVMPackageManager(BS_Kernel *kernelPtr) :
+ScummVMPackageManager::ScummVMPackageManager(Kernel *kernelPtr) :
 	PackageManager(kernelPtr),
 	_currentDirectory(PATH_SEPARATOR),
 	_rootFolder(ConfMan.get("path")) {
@@ -61,7 +61,7 @@ ScummVMPackageManager::ScummVMPackageManager(BS_Kernel *kernelPtr) :
 ScummVMPackageManager::~ScummVMPackageManager() {
 }
 
-BS_Service *ScummVMPackageManager_CreateObject(BS_Kernel *kernelPtr) {
+Service *ScummVMPackageManager_CreateObject(Kernel *kernelPtr) {
 	return new ScummVMPackageManager(kernelPtr);
 }
 
diff --git a/engines/sword25/package/scummvmpackagemanager.h b/engines/sword25/package/scummvmpackagemanager.h
index b70df2528a..140347000b 100644
--- a/engines/sword25/package/scummvmpackagemanager.h
+++ b/engines/sword25/package/scummvmpackagemanager.h
@@ -43,7 +43,7 @@ namespace Sword25 {
 // Forward declarations
 // -----------------------------------------------------------------------------
 
-class BS_Kernel;
+class Kernel;
 
 class ScummVMPackageManager : public PackageManager {
 private:
@@ -67,7 +67,7 @@ private:
 	Common::ArchiveMemberPtr GetArchiveMember(const Common::String &fileName);
 
 public:
-	ScummVMPackageManager(BS_Kernel *kernelPtr);
+	ScummVMPackageManager(Kernel *kernelPtr);
 	virtual ~ScummVMPackageManager();
 
 	virtual bool LoadPackage(const Common::String &fileName, const Common::String &mountPosition);