SWORD25: Enforced code formatting rules in rest of the engine

svn-id: r53626

2 files changed, 14 insertions, 14 deletions

diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index 8152b7d949..a0dda3d7cc 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -65,11 +65,11 @@ MoviePlayer::~MoviePlayer() {
 
 bool MoviePlayer::loadMovie(const Common::String &filename, uint z) {
 	// Get the file and load it into the decoder
-	Common::SeekableReadStream *in = Kernel::GetInstance()->GetPackage()->getStream(filename);
+	Common::SeekableReadStream *in = Kernel::getInstance()->getPackage()->getStream(filename);
 	_decoder.load(in);
 
 	// Ausgabebitmap erstellen
-	GraphicEngine *pGfx = Kernel::GetInstance()->GetGfx();
+	GraphicEngine *pGfx = Kernel::getInstance()->getGfx();
 
 #if INDIRECTRENDERING
 	_outputBitmap = pGfx->getMainPanel()->addDynamicBitmap(_decoder.getWidth(), _decoder.getHeight());
@@ -167,7 +167,7 @@ void MoviePlayer::setScaleFactor(float scaleFactor) {
 		_outputBitmap->setScaleFactor(scaleFactor);
 
 		// Ausgabebitmap auf dem Bildschirm zentrieren
-		GraphicEngine *gfxPtr = Kernel::GetInstance()->GetGfx();
+		GraphicEngine *gfxPtr = Kernel::getInstance()->getGfx();
 		_outputBitmap->setX((gfxPtr->getDisplayWidth() - _outputBitmap->getWidth()) / 2);
 		_outputBitmap->setY((gfxPtr->getDisplayHeight() - _outputBitmap->getHeight()) / 2);
 	}
diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp
index ea1a9c3a6b..aa854448ff 100644
--- a/engines/sword25/fmv/movieplayer_script.cpp
+++ b/engines/sword25/fmv/movieplayer_script.cpp
@@ -44,7 +44,7 @@
 namespace Sword25 {
 
 int loadMovie(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->loadMovie(luaL_checkstring(L, 1), lua_gettop(L) == 2 ? static_cast<uint>(luaL_checknumber(L, 2)) : 10));
@@ -53,7 +53,7 @@ int loadMovie(lua_State *L) {
 }
 
 int unloadMovie(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->unloadMovie());
@@ -62,7 +62,7 @@ int unloadMovie(lua_State *L) {
 }
 
 int play(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->play());
@@ -71,7 +71,7 @@ int play(lua_State *L) {
 }
 
 int pause(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->pause());
@@ -80,7 +80,7 @@ int pause(lua_State *L) {
 }
 
 int update(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	FMVPtr->update();
@@ -89,7 +89,7 @@ int update(lua_State *L) {
 }
 
 int isMovieLoaded(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->isMovieLoaded());
@@ -98,7 +98,7 @@ int isMovieLoaded(lua_State *L) {
 }
 
 int isPaused(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushbooleancpp(L, FMVPtr->isPaused());
@@ -107,7 +107,7 @@ int isPaused(lua_State *L) {
 }
 
 int getScaleFactor(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushnumber(L, FMVPtr->getScaleFactor());
@@ -116,7 +116,7 @@ int getScaleFactor(lua_State *L) {
 }
 
 int setScaleFactor(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	FMVPtr->setScaleFactor(static_cast<float>(luaL_checknumber(L, 1)));
@@ -125,7 +125,7 @@ int setScaleFactor(lua_State *L) {
 }
 
 int getTime(lua_State *L) {
-	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
+	MoviePlayer *FMVPtr = Kernel::getInstance()->getFMV();
 	BS_ASSERT(FMVPtr);
 
 	lua_pushnumber(L, FMVPtr->getTime());
@@ -150,7 +150,7 @@ const luaL_reg LIBRARY_FUNCTIONS[] = {
 };
 
 bool MoviePlayer::registerScriptBindings() {
-	ScriptEngine *pScript = Kernel::GetInstance()->GetScript();
+	ScriptEngine *pScript = Kernel::getInstance()->getScript();
 	BS_ASSERT(pScript);
 	lua_State *L = static_cast<lua_State *>(pScript->getScriptObject());
 	BS_ASSERT(L);