From 2c56b31996de7a1deaf6f4ed3e5802cfcf024e7c Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sun, 8 Jul 2012 23:15:05 +0200
Subject: WINTERMUTE: Rename FuncName/VarName -> funcName/varName in UIText

---
 engines/wintermute/UI/UIText.cpp | 20 ++++++++++----------
 engines/wintermute/UI/UIText.h   |  5 +++--
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'engines/wintermute')

diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index 82f7701b80..d5f44391ab 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -62,29 +62,29 @@ CUIText::~CUIText() {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::display(int OffsetX, int OffsetY) {
+HRESULT CUIText::display(int offsetX, int offsetY) {
 	if (!_visible) return S_OK;
 
 
 	CBFont *font = _font;
 	if (!font) font = Game->_systemFont;
 
-	if (_back) _back->display(OffsetX + _posX, OffsetY + _posY, _width, _height);
-	if (_image) _image->draw(OffsetX + _posX, OffsetY + _posY, NULL);
+	if (_back) _back->display(offsetX + _posX, offsetY + _posY, _width, _height);
+	if (_image) _image->draw(offsetX + _posX, offsetY + _posY, NULL);
 
 	if (font && _text) {
-		int text_offset;
+		int textOffset;
 		switch (_verticalAlign) {
 		case VAL_TOP:
-			text_offset = 0;
+			textOffset = 0;
 			break;
 		case VAL_BOTTOM:
-			text_offset = _height - font->getTextHeight((byte *)_text, _width);
+			textOffset = _height - font->getTextHeight((byte *)_text, _width);
 			break;
 		default:
-			text_offset = (_height - font->getTextHeight((byte *)_text, _width)) / 2;
+			textOffset = (_height - font->getTextHeight((byte *)_text, _width)) / 2;
 		}
-		font->drawText((byte *)_text, OffsetX + _posX, OffsetY + _posY + text_offset, _width, _textAlign, _height);
+		font->drawText((byte *)_text, offsetX + _posX, offsetY + _posY + textOffset, _width, _textAlign, _height);
 	}
 
 	//Game->_renderer->_rectList.Add(new CBActiveRect(Game, this, NULL, OffsetX + _posX, OffsetY + _posY, _width, _height, 100, 100, false));
@@ -382,7 +382,7 @@ HRESULT CUIText::scCallMethod(CScScript *script, CScStack *stack, CScStack *this
 	//////////////////////////////////////////////////////////////////////////
 	if (strcmp(name, "SizeToFit") == 0) {
 		stack->correctParams(0);
-		SizeToFit();
+		sizeToFit();
 		stack->pushNULL();
 		return S_OK;
 	}
@@ -478,7 +478,7 @@ HRESULT CUIText::persist(CBPersistMgr *persistMgr) {
 
 
 //////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::SizeToFit() {
+HRESULT CUIText::sizeToFit() {
 	if (_font && _text) {
 		_width = _font->getTextWidth((byte *)_text);
 		_height = _font->getTextHeight((byte *)_text, _width);
diff --git a/engines/wintermute/UI/UIText.h b/engines/wintermute/UI/UIText.h
index 876b6762f7..383f15f47d 100644
--- a/engines/wintermute/UI/UIText.h
+++ b/engines/wintermute/UI/UIText.h
@@ -35,9 +35,10 @@
 namespace WinterMute {
 
 class CUIText : public CUIObject {
+private:
+	HRESULT sizeToFit();
 public:
-	HRESULT SizeToFit();
-	virtual HRESULT display(int OffsetX, int OffsetY);
+	virtual HRESULT display(int offsetX, int offsetY);
 	DECLARE_PERSISTENT(CUIText, CUIObject)
 	CUIText(CBGame *inGame = NULL);
 	virtual ~CUIText();
-- 
cgit v1.2.3