From 2457d3860470a757ccf7f008c5638c6a7b5af1de Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Tue, 3 Jul 2012 06:20:09 +0200 Subject: WINTERMUTE: Rename FuncName->funcName in PathUtil and StringUtil --- engines/wintermute/UI/UIEdit.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/wintermute/UI') diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp index c17bd405ab..2dec9c139f 100644 --- a/engines/wintermute/UI/UIEdit.cpp +++ b/engines/wintermute/UI/UIEdit.cpp @@ -444,8 +444,8 @@ CScValue *CUIEdit::scGetProperty(const char *name) { ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "Text") == 0) { if (Game->_textEncoding == TEXT_UTF8) { - WideString wstr = StringUtil::AnsiToWide(_text); - _scValue->setString(StringUtil::WideToUtf8(wstr).c_str()); + WideString wstr = StringUtil::ansiToWide(_text); + _scValue->setString(StringUtil::wideToUtf8(wstr).c_str()); } else { _scValue->setString(_text); } @@ -515,8 +515,8 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) { ////////////////////////////////////////////////////////////////////////// else if (strcmp(name, "Text") == 0) { if (Game->_textEncoding == TEXT_UTF8) { - WideString wstr = StringUtil::Utf8ToWide(value->getString()); - setText(StringUtil::WideToAnsi(wstr).c_str()); + WideString wstr = StringUtil::utf8ToWide(value->getString()); + setText(StringUtil::wideToAnsi(wstr).c_str()); } else { setText(value->getString()); } @@ -775,7 +775,7 @@ bool CUIEdit::handleKeypress(Common::Event *event, bool printable) { //WideString wstr = StringUtil::Utf8ToWide(event->kbd.ascii); WideString wstr; wstr += (char)event->kbd.ascii; - _selEnd += insertChars(_selEnd, (byte *)StringUtil::WideToAnsi(wstr).c_str(), 1); + _selEnd += insertChars(_selEnd, (byte *)StringUtil::wideToAnsi(wstr).c_str(), 1); if (Game->_textRTL) _selEnd = _selStart; else _selStart = _selEnd; -- cgit v1.2.3