WINTERMUTE: Rename FuncName/VarName -> funcName/varName in BFontStorage

11 files changed, 77 insertions, 79 deletions

diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index f594f91100..b132bec46e 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -127,7 +127,7 @@ CAdObject::~CAdObject() {
 	_tempSprite2 = NULL; // reference only

 	_stickRegion = NULL;

 

-	if (_font) Game->_fontStorage->RemoveFont(_font);

+	if (_font) Game->_fontStorage->removeFont(_font);

 

 	if (_inventory) {

 		((CAdGame *)Game)->unregisterInventory(_inventory);

@@ -793,9 +793,9 @@ const char *CAdObject::scToString() {
 

 //////////////////////////////////////////////////////////////////////////

 HRESULT CAdObject::SetFont(const char *filename) {

-	if (_font) Game->_fontStorage->RemoveFont(_font);

+	if (_font) Game->_fontStorage->removeFont(_font);

 	if (filename) {

-		_font = Game->_fontStorage->AddFont(filename);

+		_font = Game->_fontStorage->addFont(filename);

 		return _font == NULL ? E_FAIL : S_OK;

 	} else {

 		_font = NULL;

diff --git a/engines/wintermute/Ad/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp
index 7c6a768c21..320f026863 100644
--- a/engines/wintermute/Ad/AdResponse.cpp
+++ b/engines/wintermute/Ad/AdResponse.cpp
@@ -60,7 +60,7 @@ CAdResponse::~CAdResponse() {
 	_icon = NULL;

 	_iconHover = NULL;

 	_iconPressed = NULL;

-	if (_font) Game->_fontStorage->RemoveFont(_font);

+	if (_font) Game->_fontStorage->removeFont(_font);

 }

 

 

@@ -86,8 +86,8 @@ HRESULT CAdResponse::setIcon(const char *filename) {
 

 //////////////////////////////////////////////////////////////////////////

 HRESULT CAdResponse::setFont(const char *filename) {

-	if (_font) Game->_fontStorage->RemoveFont(_font);

-	_font = Game->_fontStorage->AddFont(filename);

+	if (_font) Game->_fontStorage->removeFont(_font);

+	_font = Game->_fontStorage->addFont(filename);

 	if (!_font) {

 		Game->LOG(0, "CAdResponse::setFont failed for file '%s'", filename);

 		return E_FAIL;

diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index 9f498b49a5..6841705701 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -82,8 +82,8 @@ CAdResponseBox::~CAdResponseBox() {
 	delete[] _lastResponseTextOrig;

 	_lastResponseTextOrig = NULL;

 

-	if (_font) Game->_fontStorage->RemoveFont(_font);

-	if (_fontHover) Game->_fontStorage->RemoveFont(_fontHover);

+	if (_font) Game->_fontStorage->removeFont(_font);

+	if (_fontHover) Game->_fontStorage->removeFont(_fontHover);

 

 	clearResponses();

 	clearButtons();

@@ -269,14 +269,14 @@ HRESULT CAdResponseBox::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_FONT:

-			if (_font) Game->_fontStorage->RemoveFont(_font);

-			_font = Game->_fontStorage->AddFont((char *)params);

+			if (_font) Game->_fontStorage->removeFont(_font);

+			_font = Game->_fontStorage->addFont((char *)params);

 			if (!_font) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_FONT_HOVER:

-			if (_fontHover) Game->_fontStorage->RemoveFont(_fontHover);

-			_fontHover = Game->_fontStorage->AddFont((char *)params);

+			if (_fontHover) Game->_fontStorage->removeFont(_fontHover);

+			_fontHover = Game->_fontStorage->addFont((char *)params);

 			if (!_fontHover) cmd = PARSERR_GENERIC;

 			break;

 

diff --git a/engines/wintermute/Base/BFontStorage.cpp b/engines/wintermute/Base/BFontStorage.cpp
index 00aa67cb20..0ec51b1317 100644
--- a/engines/wintermute/Base/BFontStorage.cpp
+++ b/engines/wintermute/Base/BFontStorage.cpp
@@ -44,7 +44,7 @@ IMPLEMENT_PERSISTENT(CBFontStorage, true)
 //////////////////////////////////////////////////////////////////////////

 CBFontStorage::CBFontStorage(CBGame *inGame): CBBase(inGame) {

 //	_fTLibrary = NULL;

-	InitFreeType();

+	initFreeType();

 }

 

 

@@ -55,7 +55,7 @@ CBFontStorage::~CBFontStorage() {
 

 

 //////////////////////////////////////////////////////////////////////////

-void CBFontStorage::InitFreeType() {

+void CBFontStorage::initFreeType() {

 #if 0

 	FT_Error error = FT_Init_FreeType(&_fTLibrary);

 	if (error) {

@@ -65,11 +65,9 @@ void CBFontStorage::InitFreeType() {
 }

 

 //////////////////////////////////////////////////////////////////////////

-HRESULT CBFontStorage::cleanup(bool Warn) {

-	int i;

-

-	for (i = 0; i < _fonts.GetSize(); i++) {

-		if (Warn) Game->LOG(0, "Removing orphan font '%s'", _fonts[i]->_filename);

+HRESULT CBFontStorage::cleanup(bool warn) {

+	for (int i = 0; i < _fonts.GetSize(); i++) {

+		if (warn) Game->LOG(0, "Removing orphan font '%s'", _fonts[i]->_filename);

 		delete _fonts[i];

 	}

 	_fonts.RemoveAll();

@@ -82,7 +80,7 @@ HRESULT CBFontStorage::cleanup(bool Warn) {
 }

 

 //////////////////////////////////////////////////////////////////////////

-HRESULT CBFontStorage::InitLoop() {

+HRESULT CBFontStorage::initLoop() {

 	for (int i = 0; i < _fonts.GetSize(); i++) {

 		_fonts[i]->initLoop();

 	}

@@ -90,7 +88,7 @@ HRESULT CBFontStorage::InitLoop() {
 }

 

 //////////////////////////////////////////////////////////////////////////

-CBFont *CBFontStorage::AddFont(const char *filename) {

+CBFont *CBFontStorage::addFont(const char *filename) {

 	if (!filename) return NULL;

 

 	for (int i = 0; i < _fonts.GetSize(); i++) {

@@ -124,11 +122,11 @@ CBFont *CBFontStorage::AddFont(const char *filename) {
 

 

 //////////////////////////////////////////////////////////////////////////

-HRESULT CBFontStorage::RemoveFont(CBFont *Font) {

-	if (!Font) return E_FAIL;

+HRESULT CBFontStorage::removeFont(CBFont *font) {

+	if (!font) return E_FAIL;

 

 	for (int i = 0; i < _fonts.GetSize(); i++) {

-		if (_fonts[i] == Font) {

+		if (_fonts[i] == font) {

 			_fonts[i]->_refCount--;

 			if (_fonts[i]->_refCount <= 0) {

 				delete _fonts[i];

@@ -149,7 +147,7 @@ HRESULT CBFontStorage::persist(CBPersistMgr *persistMgr) {
 	persistMgr->transfer(TMEMBER(Game));

 	_fonts.persist(persistMgr);

 

-	if (!persistMgr->_saving) InitFreeType();

+	if (!persistMgr->_saving) initFreeType();

 

 	return S_OK;

 }

diff --git a/engines/wintermute/Base/BFontStorage.h b/engines/wintermute/Base/BFontStorage.h
index b337d2d6d5..bbbcf529c2 100644
--- a/engines/wintermute/Base/BFontStorage.h
+++ b/engines/wintermute/Base/BFontStorage.h
@@ -41,20 +41,20 @@ class CBFont;
 class CBFontStorage : public CBBase {

 public:

 	DECLARE_PERSISTENT(CBFontStorage, CBBase)

-	HRESULT cleanup(bool Warn = false);

-	HRESULT RemoveFont(CBFont *Font);

-	CBFont *AddFont(const char *filename);

+	HRESULT cleanup(bool warn = false);

+	HRESULT removeFont(CBFont *font);

+	CBFont *addFont(const char *filename);

 	CBFontStorage(CBGame *inGame);

 	virtual ~CBFontStorage();

 	CBArray<CBFont *, CBFont *> _fonts;

-	HRESULT InitLoop();

+	HRESULT initLoop();

 

 	/*  FT_Library GetFTLibrary() const {

 	        return _fTLibrary;

 	    }*/

 

 private:

-	void InitFreeType();

+	void initFreeType();

 	//FT_Library _fTLibrary;

 };

 

diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index 9f8a67490e..eeb50e4f0d 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -394,10 +394,10 @@ HRESULT CBGame::cleanup() {
 	}

 	_scripts.RemoveAll();

 

-	_fontStorage->RemoveFont(_systemFont);

+	_fontStorage->removeFont(_systemFont);

 	_systemFont = NULL;

 

-	_fontStorage->RemoveFont(_videoFont);

+	_fontStorage->removeFont(_videoFont);

 	_videoFont = NULL;

 

 	for (int i = 0; i < _quickMessages.GetSize(); i++) delete _quickMessages[i];

@@ -615,7 +615,7 @@ HRESULT CBGame::initLoop() {
 	updateMusicCrossfade();

 

 	_surfaceStorage->initLoop();

-	_fontStorage->InitLoop();

+	_fontStorage->initLoop();

 

 

 	//_activeObject = NULL;

@@ -820,17 +820,17 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_SYSTEM_FONT:

-			if (_systemFont) _fontStorage->RemoveFont(_systemFont);

+			if (_systemFont) _fontStorage->removeFont(_systemFont);

 			_systemFont = NULL;

 

-			_systemFont = Game->_fontStorage->AddFont((char *)params);

+			_systemFont = Game->_fontStorage->addFont((char *)params);

 			break;

 

 		case TOKEN_VIDEO_FONT:

-			if (_videoFont) _fontStorage->RemoveFont(_videoFont);

+			if (_videoFont) _fontStorage->removeFont(_videoFont);

 			_videoFont = NULL;

 

-			_videoFont = Game->_fontStorage->AddFont((char *)params);

+			_videoFont = Game->_fontStorage->addFont((char *)params);

 			break;

 

 

@@ -958,7 +958,7 @@ HRESULT CBGame::loadBuffer(byte *buffer, bool complete) {
 		}

 	}

 

-	if (!_systemFont) _systemFont = Game->_fontStorage->AddFont("system_font.fnt");

+	if (!_systemFont) _systemFont = Game->_fontStorage->addFont("system_font.fnt");

 

 

 	if (cmd == PARSERR_TOKENNOTFOUND) {

diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 0131f0bd02..1504796378 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -79,10 +79,10 @@ CUIButton::~CUIButton() {
 	if (_backFocus) delete _backFocus;

 

 	if (!_sharedFonts) {

-		if (_fontHover)   Game->_fontStorage->RemoveFont(_fontHover);

-		if (_fontPress)   Game->_fontStorage->RemoveFont(_fontPress);

-		if (_fontDisable) Game->_fontStorage->RemoveFont(_fontDisable);

-		if (_fontFocus)   Game->_fontStorage->RemoveFont(_fontFocus);

+		if (_fontHover)   Game->_fontStorage->removeFont(_fontHover);

+		if (_fontPress)   Game->_fontStorage->removeFont(_fontPress);

+		if (_fontDisable) Game->_fontStorage->removeFont(_fontDisable);

+		if (_fontFocus)   Game->_fontStorage->removeFont(_fontFocus);

 	}

 

 	if (!_sharedImages) {

@@ -322,32 +322,32 @@ HRESULT CUIButton::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_FONT:

-			if (_font) Game->_fontStorage->RemoveFont(_font);

-			_font = Game->_fontStorage->AddFont((char *)params);

+			if (_font) Game->_fontStorage->removeFont(_font);

+			_font = Game->_fontStorage->addFont((char *)params);

 			if (!_font) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_FONT_HOVER:

-			if (_fontHover) Game->_fontStorage->RemoveFont(_fontHover);

-			_fontHover = Game->_fontStorage->AddFont((char *)params);

+			if (_fontHover) Game->_fontStorage->removeFont(_fontHover);

+			_fontHover = Game->_fontStorage->addFont((char *)params);

 			if (!_fontHover) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_FONT_PRESS:

-			if (_fontPress) Game->_fontStorage->RemoveFont(_fontPress);

-			_fontPress = Game->_fontStorage->AddFont((char *)params);

+			if (_fontPress) Game->_fontStorage->removeFont(_fontPress);

+			_fontPress = Game->_fontStorage->addFont((char *)params);

 			if (!_fontPress) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_FONT_DISABLE:

-			if (_fontDisable) Game->_fontStorage->RemoveFont(_fontDisable);

-			_fontDisable = Game->_fontStorage->AddFont((char *)params);

+			if (_fontDisable) Game->_fontStorage->removeFont(_fontDisable);

+			_fontDisable = Game->_fontStorage->addFont((char *)params);

 			if (!_fontDisable) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_FONT_FOCUS:

-			if (_fontFocus) Game->_fontStorage->RemoveFont(_fontFocus);

-			_fontFocus = Game->_fontStorage->AddFont((char *)params);

+			if (_fontFocus) Game->_fontStorage->removeFont(_fontFocus);

+			_fontFocus = Game->_fontStorage->addFont((char *)params);

 			if (!_fontFocus) cmd = PARSERR_GENERIC;

 			break;

 

@@ -674,12 +674,12 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		stack->correctParams(1);

 		CScValue *Val = stack->pop();

 

-		if (_fontDisable) Game->_fontStorage->RemoveFont(_fontDisable);

+		if (_fontDisable) Game->_fontStorage->removeFont(_fontDisable);

 		if (Val->isNULL()) {

 			_fontDisable = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontDisable = Game->_fontStorage->AddFont(Val->getString());

+			_fontDisable = Game->_fontStorage->addFont(Val->getString());

 			stack->pushBool(_fontDisable != NULL);

 		}

 		return S_OK;

@@ -692,12 +692,12 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		stack->correctParams(1);

 		CScValue *Val = stack->pop();

 

-		if (_fontHover) Game->_fontStorage->RemoveFont(_fontHover);

+		if (_fontHover) Game->_fontStorage->removeFont(_fontHover);

 		if (Val->isNULL()) {

 			_fontHover = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontHover = Game->_fontStorage->AddFont(Val->getString());

+			_fontHover = Game->_fontStorage->addFont(Val->getString());

 			stack->pushBool(_fontHover != NULL);

 		}

 		return S_OK;

@@ -710,12 +710,12 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		stack->correctParams(1);

 		CScValue *Val = stack->pop();

 

-		if (_fontPress) Game->_fontStorage->RemoveFont(_fontPress);

+		if (_fontPress) Game->_fontStorage->removeFont(_fontPress);

 		if (Val->isNULL()) {

 			_fontPress = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontPress = Game->_fontStorage->AddFont(Val->getString());

+			_fontPress = Game->_fontStorage->addFont(Val->getString());

 			stack->pushBool(_fontPress != NULL);

 		}

 		return S_OK;

@@ -728,12 +728,12 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		stack->correctParams(1);

 		CScValue *Val = stack->pop();

 

-		if (_fontFocus) Game->_fontStorage->RemoveFont(_fontFocus);

+		if (_fontFocus) Game->_fontStorage->removeFont(_fontFocus);

 		if (Val->isNULL()) {

 			_fontFocus = NULL;

 			stack->pushBool(true);

 		} else {

-			_fontFocus = Game->_fontStorage->AddFont(Val->getString());

+			_fontFocus = Game->_fontStorage->addFont(Val->getString());

 			stack->pushBool(_fontFocus != NULL);

 		}

 		return S_OK;

diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index 5ad3c3fcdf..4bb3684b3c 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -85,7 +85,7 @@ CUIEdit::CUIEdit(CBGame *inGame): CUIObject(inGame) {
 //////////////////////////////////////////////////////////////////////////

 CUIEdit::~CUIEdit() {

 	if (!_sharedFonts) {

-		if (_fontSelected)   Game->_fontStorage->RemoveFont(_fontSelected);

+		if (_fontSelected)   Game->_fontStorage->removeFont(_fontSelected);

 	}

 

 	delete[] _cursorChar;

@@ -208,14 +208,14 @@ HRESULT CUIEdit::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_FONT:

-			if (_font) Game->_fontStorage->RemoveFont(_font);

-			_font = Game->_fontStorage->AddFont((char *)params);

+			if (_font) Game->_fontStorage->removeFont(_font);

+			_font = Game->_fontStorage->addFont((char *)params);

 			if (!_font) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_FONT_SELECTED:

-			if (_fontSelected) Game->_fontStorage->RemoveFont(_fontSelected);

-			_fontSelected = Game->_fontStorage->AddFont((char *)params);

+			if (_fontSelected) Game->_fontStorage->removeFont(_fontSelected);

+			_fontSelected = Game->_fontStorage->addFont((char *)params);

 			if (!_fontSelected) cmd = PARSERR_GENERIC;

 			break;

 

@@ -368,8 +368,8 @@ HRESULT CUIEdit::scCallMethod(CScScript *script, CScStack *stack, CScStack *this
 	if (strcmp(name, "SetSelectedFont") == 0) {

 		stack->correctParams(1);

 

-		if (_fontSelected) Game->_fontStorage->RemoveFont(_fontSelected);

-		_fontSelected = Game->_fontStorage->AddFont(stack->pop()->getString());

+		if (_fontSelected) Game->_fontStorage->removeFont(_fontSelected);

+		_fontSelected = Game->_fontStorage->addFont(stack->pop()->getString());

 		stack->pushBool(_fontSelected != NULL);

 

 		return S_OK;

diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp
index aad8e23900..52a24aa79c 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -74,7 +74,7 @@ CUIObject::~CUIObject() {
 	if (!Game->_loadInProgress) CSysClassRegistry::getInstance()->enumInstances(CBGame::invalidateValues, "CScValue", (void *)this);

 

 	if (_back) delete _back;

-	if (_font && !_sharedFonts) Game->_fontStorage->RemoveFont(_font);

+	if (_font && !_sharedFonts) Game->_fontStorage->removeFont(_font);

 

 	if (_image && !_sharedImages) delete _image;

 

@@ -145,12 +145,12 @@ HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 		stack->correctParams(1);

 		CScValue *Val = stack->pop();

 

-		if (_font) Game->_fontStorage->RemoveFont(_font);

+		if (_font) Game->_fontStorage->removeFont(_font);

 		if (Val->isNULL()) {

 			_font = NULL;

 			stack->pushBool(true);

 		} else {

-			_font = Game->_fontStorage->AddFont(Val->getString());

+			_font = Game->_fontStorage->addFont(Val->getString());

 			stack->pushBool(_font != NULL);

 		}

 		return S_OK;

diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index dce7f48731..5f81a228c3 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -209,8 +209,8 @@ HRESULT CUIText::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_FONT:

-			if (_font) Game->_fontStorage->RemoveFont(_font);

-			_font = Game->_fontStorage->AddFont((char *)params);

+			if (_font) Game->_fontStorage->removeFont(_font);

+			_font = Game->_fontStorage->addFont((char *)params);

 			if (!_font) cmd = PARSERR_GENERIC;

 			break;

 

diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index c2eef79210..b4043a0d41 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -104,7 +104,7 @@ void CUIWindow::cleanup() {
 	_viewport = NULL;

 

 	if (_backInactive) delete _backInactive;

-	if (!_sharedFonts && _fontInactive) Game->_fontStorage->RemoveFont(_fontInactive);

+	if (!_sharedFonts && _fontInactive) Game->_fontStorage->removeFont(_fontInactive);

 	if (!_sharedImages && _imageInactive) delete _imageInactive;

 

 	for (int i = 0; i < _widgets.GetSize(); i++) delete _widgets[i];

@@ -369,14 +369,14 @@ HRESULT CUIWindow::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_FONT:

-			if (_font) Game->_fontStorage->RemoveFont(_font);

-			_font = Game->_fontStorage->AddFont((char *)params);

+			if (_font) Game->_fontStorage->removeFont(_font);

+			_font = Game->_fontStorage->addFont((char *)params);

 			if (!_font) cmd = PARSERR_GENERIC;

 			break;

 

 		case TOKEN_FONT_INACTIVE:

-			if (_fontInactive) Game->_fontStorage->RemoveFont(_fontInactive);

-			_fontInactive = Game->_fontStorage->AddFont((char *)params);

+			if (_fontInactive) Game->_fontStorage->removeFont(_fontInactive);

+			_fontInactive = Game->_fontStorage->addFont((char *)params);

 			if (!_fontInactive) cmd = PARSERR_GENERIC;

 			break;

 

@@ -720,8 +720,8 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 	else if (strcmp(name, "SetInactiveFont") == 0) {

 		stack->correctParams(1);

 

-		if (_fontInactive) Game->_fontStorage->RemoveFont(_fontInactive);

-		_fontInactive = Game->_fontStorage->AddFont(stack->pop()->getString());

+		if (_fontInactive) Game->_fontStorage->removeFont(_fontInactive);

+		_fontInactive = Game->_fontStorage->addFont(stack->pop()->getString());

 		stack->pushBool(_fontInactive != NULL);

 

 		return S_OK;