SWORD25: Enforced code naming conventions in math/*

svn-id: r53392

1 files changed, 2 insertions, 28 deletions

diff --git a/engines/sword25/gfx/renderobjectmanager.cpp b/engines/sword25/gfx/renderobjectmanager.cpp
index d67e1c0361..ab4e606270 100644
--- a/engines/sword25/gfx/renderobjectmanager.cpp
+++ b/engines/sword25/gfx/renderobjectmanager.cpp
@@ -32,10 +32,6 @@
  *
  */
 
-// -----------------------------------------------------------------------------
-// Includes
-// -----------------------------------------------------------------------------
-
 #include "sword25/gfx/renderobjectmanager.h"
 
 #include "sword25/kernel/kernel.h"
@@ -52,27 +48,17 @@ namespace Sword25 {
 
 #define BS_LOG_PREFIX "RENDEROBJECTMANAGER"
 
-// -----------------------------------------------------------------------------
-// Konstruktion / Desktruktion
-// -----------------------------------------------------------------------------
-
 RenderObjectManager::RenderObjectManager(int width, int height, int framebufferCount) :
 	_frameStarted(false) {
 	// Wurzel des BS_RenderObject-Baumes erzeugen.
 	_rootPtr = (new RootRenderObject(this, width, height))->getHandle();
 }
 
-// -----------------------------------------------------------------------------
-
 RenderObjectManager::~RenderObjectManager() {
 	// Die Wurzel des Baumes löschen, damit werden alle BS_RenderObjects mitgelöscht.
 	_rootPtr.erase();
 }
 
-// -----------------------------------------------------------------------------
-// Interface
-// -----------------------------------------------------------------------------
-
 void RenderObjectManager::startFrame() {
 	_frameStarted = true;
 
@@ -85,8 +71,6 @@ void RenderObjectManager::startFrame() {
 		(*iter)->frameNotification(timeElapsed);
 }
 
-// -----------------------------------------------------------------------------
-
 bool RenderObjectManager::render() {
 	// Den Objekt-Status des Wurzelobjektes aktualisieren. Dadurch werden rekursiv alle Baumelemente aktualisiert.
 	// Beim aktualisieren des Objekt-Status werden auch die Update-Rects gefunden, so dass feststeht, was neu gezeichnet
@@ -100,14 +84,10 @@ bool RenderObjectManager::render() {
 	return _rootPtr->render();
 }
 
-// -----------------------------------------------------------------------------
-
 void RenderObjectManager::attatchTimedRenderObject(RenderObjectPtr<TimedRenderObject> renderObjectPtr) {
 	_timedRenderObjects.push_back(renderObjectPtr);
 }
 
-// -----------------------------------------------------------------------------
-
 void RenderObjectManager::detatchTimedRenderObject(RenderObjectPtr<TimedRenderObject> renderObjectPtr) {
 	for (uint i = 0; i < _timedRenderObjects.size(); i++)
 		if (_timedRenderObjects[i] == renderObjectPtr) {
@@ -116,10 +96,6 @@ void RenderObjectManager::detatchTimedRenderObject(RenderObjectPtr<TimedRenderOb
 		}
 }
 
-// -----------------------------------------------------------------------------
-// Persistenz
-// -----------------------------------------------------------------------------
-
 bool RenderObjectManager::persist(OutputPersistenceBlock &writer) {
 	bool result = true;
 
@@ -137,13 +113,11 @@ bool RenderObjectManager::persist(OutputPersistenceBlock &writer) {
 	}
 
 	// Alle BS_AnimationTemplates persistieren.
-	result &= AnimationTemplateRegistry::GetInstance().persist(writer);
+	result &= AnimationTemplateRegistry::getInstance().persist(writer);
 
 	return result;
 }
 
-// -----------------------------------------------------------------------------
-
 bool RenderObjectManager::unpersist(InputPersistenceBlock &reader) {
 	bool result = true;
 
@@ -169,7 +143,7 @@ bool RenderObjectManager::unpersist(InputPersistenceBlock &reader) {
 	}
 
 	// Alle BS_AnimationTemplates wieder herstellen.
-	result &= AnimationTemplateRegistry::GetInstance().unpersist(reader);
+	result &= AnimationTemplateRegistry::getInstance().unpersist(reader);
 
 	return result;
 }