diff options
author | est31 <MTest31@outlook.com> | 2015-07-07 05:55:07 +0200 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2015-07-08 10:12:44 +0200 |
commit | b0784ba87168e24b0533fc8718a0157cda5ea405 (patch) | |
tree | 24ca04bbfe2a13193400493e1bde5e520c589e03 /src/guiEngine.cpp | |
parent | e234d8b3786d5adfbdf3d1a2123c3e8d91c21880 (diff) | |
download | minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.gz minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.bz2 minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.zip |
Use UTF-8 instead of narrow
Use wide_to_utf8 and utf8_to_wide instead of wide_to_narrow and narrow_to_wide at almost all places.
Only exceptions: test functions for narrow conversion, and chat, which is done in a separate commit.
Diffstat (limited to 'src/guiEngine.cpp')
-rw-r--r-- | src/guiEngine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index 3248ef112..eac9db0c6 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -61,7 +61,7 @@ void TextDestGuiEngine::gotText(const StringMap &fields) /******************************************************************************/ void TextDestGuiEngine::gotText(std::wstring text) { - m_engine->getScriptIface()->handleMainMenuEvent(wide_to_narrow(text)); + m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(text)); } /******************************************************************************/ @@ -172,7 +172,7 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_sound_manager = &dummySoundManager; //create topleft header - std::wstring t = narrow_to_wide(std::string(PROJECT_NAME_C " ") + + std::wstring t = utf8_to_wide(std::string(PROJECT_NAME_C " ") + g_version_hash); core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight()); @@ -572,13 +572,13 @@ bool GUIEngine::downloadFile(std::string url, std::string target) /******************************************************************************/ void GUIEngine::setTopleftText(std::string append) { - std::wstring toset = narrow_to_wide(std::string(PROJECT_NAME_C " ") + - g_version_hash); + std::wstring toset = utf8_to_wide(std::string(PROJECT_NAME_C " ") + + g_version_hash); if (append != "") { toset += L" / "; - toset += narrow_to_wide(append); + toset += utf8_to_wide(append); } m_irr_toplefttext->setText(toset.c_str()); |