[Scummvm-cvs-logs] SF.net SVN: scummvm:[53408] scummvm/trunk/engines/sword25/gfx

[thebluegr at users.sourceforge.net]

Revision: 53408
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53408&view=rev
Author:   thebluegr
Date:     2010-10-13 11:20:49 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SWORD25: Stop using class names as variable names

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
    scummvm/trunk/engines/sword25/gfx/text.cpp
    scummvm/trunk/engines/sword25/gfx/text.h

Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-13 11:18:34 UTC (rev 53407)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-13 11:20:49 UTC (rev 53408)
@@ -400,8 +400,8 @@
 }
 
 namespace {
-bool DoSaveScreenshot(GraphicEngine &GraphicEngine, const Common::String &Filename) {
-	Graphics::Surface *data = GraphicEngine.GetScreenshot();
+bool DoSaveScreenshot(GraphicEngine &graphicEngine, const Common::String &Filename) {
+	Graphics::Surface *data = graphicEngine.GetScreenshot();
 	if (!data) {
 		BS_LOG_ERRORLN("Call to GetScreenshot() failed. Cannot save screenshot.");
 		return false;

Modified: scummvm/trunk/engines/sword25/gfx/text.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.cpp	2010-10-13 11:18:34 UTC (rev 53407)
+++ scummvm/trunk/engines/sword25/gfx/text.cpp	2010-10-13 11:20:49 UTC (rev 53408)
@@ -317,14 +317,14 @@
 
 // -----------------------------------------------------------------------------
 
-void Text::UpdateMetrics(FontResource &FontResource) {
+void Text::UpdateMetrics(FontResource &fontResource) {
 	_width = 0;
 	_height = 0;
 
 	for (uint i = 0; i < m_Text.size(); ++i) {
-		const Common::Rect &CurRect = FontResource.GetCharacterRect((byte)m_Text[i]);
+		const Common::Rect &CurRect = fontResource.GetCharacterRect((byte)m_Text[i]);
 		_width += CurRect.width();
-		if (i != m_Text.size() - 1) _width += FontResource.GetGapWidth();
+		if (i != m_Text.size() - 1) _width += fontResource.GetGapWidth();
 		if (_height < CurRect.height()) _height = CurRect.height();
 	}
 }

Modified: scummvm/trunk/engines/sword25/gfx/text.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.h	2010-10-13 11:18:34 UTC (rev 53407)
+++ scummvm/trunk/engines/sword25/gfx/text.h	2010-10-13 11:20:49 UTC (rev 53408)
@@ -171,7 +171,7 @@
 	Common::Array<LINE> m_Lines;
 
 	void UpdateFormat();
-	void UpdateMetrics(FontResource &FontResource);
+	void UpdateMetrics(FontResource &fontResource);
 	ResourceManager *GetResourceManager();
 	FontResource *LockFontResource();
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.