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, 17 insertions, 17 deletions

diff --git a/engines/sword25/input/inputengine.cpp b/engines/sword25/input/inputengine.cpp
index cd678d2d38..a893152934 100644
--- a/engines/sword25/input/inputengine.cpp
+++ b/engines/sword25/input/inputengine.cpp
@@ -44,7 +44,7 @@
 
 namespace Sword25 {
 
-InputEngine::InputEngine(BS_Kernel *pKernel) : BS_Service(pKernel) {
+InputEngine::InputEngine(Kernel *pKernel) : Service(pKernel) {
 	if (!_RegisterScriptBindings())
 		BS_LOG_ERRORLN("Script bindings could not be registered.");
 	else
diff --git a/engines/sword25/input/inputengine.h b/engines/sword25/input/inputengine.h
index c3113e0319..a951f93f40 100644
--- a/engines/sword25/input/inputengine.h
+++ b/engines/sword25/input/inputengine.h
@@ -55,9 +55,9 @@ namespace Sword25 {
 
 /// Class definitions
 
-class InputEngine : public BS_Service, public BS_Persistable {
+class InputEngine : public Service, public Persistable {
 public:
-	InputEngine(BS_Kernel *pKernel);
+	InputEngine(Kernel *pKernel);
 	virtual ~InputEngine() {};
 
 	// NOTE: These codes are registered in inputengine_script.cpp
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp
index 440955b7c0..d80cc93698 100644
--- a/engines/sword25/input/inputengine_script.cpp
+++ b/engines/sword25/input/inputengine_script.cpp
@@ -107,7 +107,7 @@ static CallbackfunctionRegisterer Instance;
 // -----------------------------------------------------------------------------
 
 static InputEngine *GetIE() {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 	InputEngine *pIE = static_cast<InputEngine *>(pKernel->GetService("input"));
 	BS_ASSERT(pIE);
@@ -245,7 +245,7 @@ static int SetMouseY(lua_State *L) {
 
 static void TheCharacterCallback(int Character) {
 	CharacterCallbackPtr->Character = static_cast<unsigned char>(Character);
-	lua_State *L = static_cast<lua_State *>(BS_Kernel::GetInstance()->GetScript()->GetScriptObject());
+	lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
 	CharacterCallbackPtr->InvokeCallbackFunctions(L, 1);
 }
 
@@ -271,7 +271,7 @@ static int UnregisterCharacterCallback(lua_State *L) {
 
 static void TheCommandCallback(int Command) {
 	CommandCallbackPtr->Command = static_cast<InputEngine::KEY_COMMANDS>(Command);
-	lua_State *L = static_cast<lua_State *>(BS_Kernel::GetInstance()->GetScript()->GetScriptObject());
+	lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
 	CommandCallbackPtr->InvokeCallbackFunctions(L, 1);
 }
 
@@ -336,7 +336,7 @@ static const lua_constant_reg PACKAGE_CONSTANTS[] = {
 // -----------------------------------------------------------------------------
 
 bool InputEngine::_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/input/scummvminput.cpp b/engines/sword25/input/scummvminput.cpp
index 295b1bbf40..0492b010d4 100644
--- a/engines/sword25/input/scummvminput.cpp
+++ b/engines/sword25/input/scummvminput.cpp
@@ -53,7 +53,7 @@ namespace Sword25 {
 // Constructor / Destructor
 // -----------------------------------------------------------------------------
 
-ScummVMInput::ScummVMInput(BS_Kernel *pKernel) :
+ScummVMInput::ScummVMInput(Kernel *pKernel) :
 	m_CurrentState(0),
 	m_LeftMouseDown(false),
 	m_RightMouseDown(false),
@@ -80,7 +80,7 @@ ScummVMInput::~ScummVMInput() {
 
 // -----------------------------------------------------------------------------
 
-BS_Service *ScummVMInput_CreateObject(BS_Kernel *pKernel) {
+Service *ScummVMInput_CreateObject(Kernel *pKernel) {
 	return new ScummVMInput(pKernel);
 }
 
@@ -127,7 +127,7 @@ void ScummVMInput::Update() {
 			break;
 
 		case Common::EVENT_QUIT:
-			BS_Kernel::GetInstance()->GetWindow()->SetWindowAlive(false);
+			Kernel::GetInstance()->GetWindow()->SetWindowAlive(false);
 			break;
 
 		default:
@@ -161,7 +161,7 @@ void ScummVMInput::TestForLeftDoubleClick() {
 	// Only bother checking for a double click if the left mouse button was clicked
 	if (WasLeftMouseDown()) {
 		// Get the time now
-		unsigned int Now = BS_Kernel::GetInstance()->GetMilliTicks();
+		unsigned int Now = Kernel::GetInstance()->GetMilliTicks();
 
 		// A double click is signalled if
 		// 1. The two clicks are close enough together
@@ -335,7 +335,7 @@ void ScummVMInput::ReportCommand(KEY_COMMANDS Command) {
 // Persistenz
 // -----------------------------------------------------------------------------
 
-bool ScummVMInput::Persist(BS_OutputPersistenceBlock &Writer) {
+bool ScummVMInput::Persist(OutputPersistenceBlock &Writer) {
 	// Anzahl an Command-Callbacks persistieren.
 	Writer.Write(m_CommandCallbacks.size());
 
@@ -365,7 +365,7 @@ bool ScummVMInput::Persist(BS_OutputPersistenceBlock &Writer) {
 
 // -----------------------------------------------------------------------------
 
-bool ScummVMInput::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool ScummVMInput::Unpersist(InputPersistenceBlock &Reader) {
 	// Command-Callbackliste leeren.
 	m_CommandCallbacks.clear();
 
diff --git a/engines/sword25/input/scummvminput.h b/engines/sword25/input/scummvminput.h
index d89248f7fb..c336dbf515 100644
--- a/engines/sword25/input/scummvminput.h
+++ b/engines/sword25/input/scummvminput.h
@@ -44,12 +44,12 @@
 namespace Sword25 {
 
 /// Forward class definitions
-class BS_Kernel;
+class Kernel;
 
 /// Class definitions
 class ScummVMInput : public InputEngine {
 public:
-	ScummVMInput(BS_Kernel *pKernel);
+	ScummVMInput(Kernel *pKernel);
 	virtual ~ScummVMInput();
 
 	virtual bool Init();
@@ -72,8 +72,8 @@ public:
 	virtual void ReportCharacter(unsigned char Character);
 	virtual void ReportCommand(KEY_COMMANDS Command);
 
-	bool Persist(BS_OutputPersistenceBlock &Writer);
-	bool Unpersist(BS_InputPersistenceBlock &Reader);
+	bool Persist(OutputPersistenceBlock &Writer);
+	bool Unpersist(InputPersistenceBlock &Reader);
 
 private:
 	void TestForLeftDoubleClick();