From bbb101cbd5290d7b91d6442044b4ae655df4abd4 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 6 Aug 2013 22:03:20 +0300 Subject: [PATCH] Cosmetics --- Library/lua/LuaManager.cpp | 10 +++++----- Library/lua/LuaManager.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Library/lua/LuaManager.cpp b/Library/lua/LuaManager.cpp index 4f35946c..6afde4c8 100644 --- a/Library/lua/LuaManager.cpp +++ b/Library/lua/LuaManager.cpp @@ -24,7 +24,7 @@ int LuaManager::c_RefCount = 0; lua_State* LuaManager::c_State = 0; -bool LuaManager::s_UnicodeState = false; +bool LuaManager::c_UnicodeState = false; void LuaManager::Initialize() { @@ -73,14 +73,14 @@ void LuaManager::ReportErrors(const std::wstring& file) } std::wstring str(file, file.find_last_of(L'\\') + 1); - str += s_UnicodeState ? StringUtil::WidenUTF8(error) : StringUtil::Widen(error); + str += c_UnicodeState ? StringUtil::WidenUTF8(error) : StringUtil::Widen(error); LogErrorF(L"Script: %s", str.c_str()); } void LuaManager::PushWide(const WCHAR* str) { lua_State* L = c_State; - const std::string narrowStr = s_UnicodeState ? + const std::string narrowStr = c_UnicodeState ? StringUtil::NarrowUTF8(str) : StringUtil::Narrow(str); lua_pushlstring(L, narrowStr.c_str(), narrowStr.length()); } @@ -88,7 +88,7 @@ void LuaManager::PushWide(const WCHAR* str) void LuaManager::PushWide(const std::wstring& str) { lua_State* L = c_State; - const std::string narrowStr = s_UnicodeState ? + const std::string narrowStr = c_UnicodeState ? StringUtil::NarrowUTF8(str) : StringUtil::Narrow(str); lua_pushlstring(L, narrowStr.c_str(), narrowStr.length()); } @@ -98,6 +98,6 @@ std::wstring LuaManager::ToWide(int narg) lua_State* L = c_State; size_t strLen = 0; const char* str = lua_tolstring(L, narg, &strLen); - return s_UnicodeState ? + return c_UnicodeState ? StringUtil::WidenUTF8(str, (int)strLen) : StringUtil::Widen(str, (int)strLen); } diff --git a/Library/lua/LuaManager.h b/Library/lua/LuaManager.h index 1b9be021..241f7187 100644 --- a/Library/lua/LuaManager.h +++ b/Library/lua/LuaManager.h @@ -32,7 +32,7 @@ public: static void Initialize(); static void Finalize(); - static lua_State* GetState(bool unicode) { s_UnicodeState = unicode; return c_State; } + static lua_State* GetState(bool unicode) { c_UnicodeState = unicode; return c_State; } static void ReportErrors(const std::wstring& file); @@ -53,7 +53,7 @@ private: // If set true |true|, Lua strings converted to/from as if they were encoded in UTF-8. Otherwise // Lua strings are treated as if they are encoded in the default system encoding. - static bool s_UnicodeState; + static bool c_UnicodeState; }; #endif