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

3 files changed, 15 insertions, 15 deletions

diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index 2ba528ed18..f3b98a5c16 100644
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -65,7 +65,7 @@ using namespace Lua;
 // Constructor / Destructor
 // -----------------------------------------------------------------------------
 
-LuaScriptEngine::LuaScriptEngine(BS_Kernel *KernelPtr) :
+LuaScriptEngine::LuaScriptEngine(Kernel *KernelPtr) :
 	ScriptEngine(KernelPtr),
 	m_State(0),
 	m_PcallErrorhandlerRegistryIndex(0) {
@@ -81,7 +81,7 @@ LuaScriptEngine::~LuaScriptEngine() {
 
 // -----------------------------------------------------------------------------
 
-BS_Service *LuaScriptEngine_CreateObject(BS_Kernel *KernelPtr) {
+Service *LuaScriptEngine_CreateObject(Kernel *KernelPtr) {
 	return new LuaScriptEngine(KernelPtr);
 }
 
@@ -153,7 +153,7 @@ bool LuaScriptEngine::ExecuteFile(const Common::String &FileName) {
 	debug(2, "ExecuteFile(%s)", FileName.c_str());
 
 	// Get a pointer to the package manager
-	PackageManager *pPackage = static_cast<PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
+	PackageManager *pPackage = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package"));
 	BS_ASSERT(pPackage);
 
 	// File read
@@ -424,7 +424,7 @@ int Chunkwriter(lua_State *L, const void *p, size_t sz, void *ud) {
 }
 }
 
-bool LuaScriptEngine::Persist(BS_OutputPersistenceBlock &Writer) {
+bool LuaScriptEngine::Persist(OutputPersistenceBlock &Writer) {
 	// Empty the Lua stack. pluto_persist() xepects that the stack is empty except for its parameters
 	lua_settop(m_State, 0);
 
@@ -516,7 +516,7 @@ void ClearGlobalTable(lua_State *L, const char **Exceptions) {
 
 // -----------------------------------------------------------------------------
 
-bool LuaScriptEngine::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool LuaScriptEngine::Unpersist(InputPersistenceBlock &Reader) {
 	// Empty the Lua stack. pluto_persist() xepects that the stack is empty except for its parameters
 	lua_settop(m_State, 0);
 
diff --git a/engines/sword25/script/luascript.h b/engines/sword25/script/luascript.h
index f7cc152f3f..31038b97e9 100644
--- a/engines/sword25/script/luascript.h
+++ b/engines/sword25/script/luascript.h
@@ -58,7 +58,7 @@ using namespace Lua;
 
 namespace Sword25 {
 
-class BS_Kernel;
+class Kernel;
 
 // -----------------------------------------------------------------------------
 // Class declaration
@@ -70,7 +70,7 @@ public:
 	// Constructor / Destructor
 	// -----------------------------------------------------------------------------
 
-	LuaScriptEngine(BS_Kernel *KernelPtr);
+	LuaScriptEngine(Kernel *KernelPtr);
 	virtual ~LuaScriptEngine();
 
 	/**
@@ -112,11 +112,11 @@ public:
 	/**
 	 * @remark              The Lua stack is cleared by this method
 	 */
-	virtual bool Persist(BS_OutputPersistenceBlock &Writer);
+	virtual bool Persist(OutputPersistenceBlock &Writer);
 	/**
 	 * @remark              The Lua stack is cleared by this method
 	 */
-	virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+	virtual bool Unpersist(InputPersistenceBlock &Reader);
 
 private:
 	lua_State *m_State;
diff --git a/engines/sword25/script/script.h b/engines/sword25/script/script.h
index b7d550a163..e2750dbd5d 100644
--- a/engines/sword25/script/script.h
+++ b/engines/sword25/script/script.h
@@ -51,21 +51,21 @@ namespace Sword25 {
 // Forward declarations
 // -----------------------------------------------------------------------------
 
-class BS_Kernel;
-class BS_OutputPersistenceBlock;
+class Kernel;
+class OutputPersistenceBlock;
 class BS_InputPersistenceBlock;
 
 // -----------------------------------------------------------------------------
 // Class declaration
 // -----------------------------------------------------------------------------
 
-class ScriptEngine : public BS_Service, public BS_Persistable {
+class ScriptEngine : public Service, public Persistable {
 public:
 	// -----------------------------------------------------------------------------
 	// Constructor / destructor
 	// -----------------------------------------------------------------------------
 
-	ScriptEngine(BS_Kernel *KernelPtr) : BS_Service(KernelPtr) {};
+	ScriptEngine(Kernel *KernelPtr) : Service(KernelPtr) {};
 	virtual ~ScriptEngine() {};
 
 	// -----------------------------------------------------------------------------
@@ -103,8 +103,8 @@ public:
 	*/
 	virtual void SetCommandLine(const Common::Array<Common::String> &CommandLineParameters) = 0;
 
-	virtual bool Persist(BS_OutputPersistenceBlock &Writer) = 0;
-	virtual bool Unpersist(BS_InputPersistenceBlock &Reader) = 0;
+	virtual bool Persist(OutputPersistenceBlock &Writer) = 0;
+	virtual bool Unpersist(InputPersistenceBlock &Reader) = 0;
 };
 
 } // End of namespace Sword25