diff options
author | Chris Wilson <chris+github@qwirx.com> | 2008-12-30 18:30:12 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2008-12-30 18:30:12 +0000 |
commit | c13f1bfdc3673ba1d1b79284d834e9248c20e8ef (patch) | |
tree | 45901c677494a08728b3ef4d35d3302a2bd64826 /lib | |
parent | f5a529cfd4a9f1920c0b1d75375258dab2d71be1 (diff) |
Change ConvertTo/FromUtf8 to take a std::string instead of a const char
*, for convenience and C++ style.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/win32/emu.cpp | 18 | ||||
-rw-r--r-- | lib/win32/emu.h | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/win32/emu.cpp b/lib/win32/emu.cpp index 84246c67..189bf587 100644 --- a/lib/win32/emu.cpp +++ b/lib/win32/emu.cpp @@ -468,24 +468,26 @@ bool ConvertEncoding(const std::string& rSource, int sourceCodePage, return true; } -bool ConvertToUtf8(const char* pString, std::string& rDest, int sourceCodePage) +bool ConvertToUtf8(const std::string& rSource, std::string& rDest, + int sourceCodePage) { - return ConvertEncoding(pString, sourceCodePage, rDest, CP_UTF8); + return ConvertEncoding(rSource, sourceCodePage, rDest, CP_UTF8); } -bool ConvertFromUtf8(const char* pString, std::string& rDest, int destCodePage) +bool ConvertFromUtf8(const std::string& rSource, std::string& rDest, + int destCodePage) { - return ConvertEncoding(pString, CP_UTF8, rDest, destCodePage); + return ConvertEncoding(rSource, CP_UTF8, rDest, destCodePage); } -bool ConvertConsoleToUtf8(const char* pString, std::string& rDest) +bool ConvertConsoleToUtf8(const std::string& rSource, std::string& rDest) { - return ConvertEncoding(pString, GetConsoleCP(), rDest, CP_UTF8); + return ConvertToUtf8(rSource, rDest, GetConsoleCP()); } -bool ConvertUtf8ToConsole(const char* pString, std::string& rDest) +bool ConvertUtf8ToConsole(const std::string& rSource, std::string& rDest) { - return ConvertEncoding(pString, CP_UTF8, rDest, GetConsoleOutputCP()); + return ConvertFromUtf8(rSource, rDest, GetConsoleOutputCP()); } // -------------------------------------------------------------------------- diff --git a/lib/win32/emu.h b/lib/win32/emu.h index 1d3fd150..67921264 100644 --- a/lib/win32/emu.h +++ b/lib/win32/emu.h @@ -384,8 +384,8 @@ bool ConvertToUtf8 (const std::string& rSource, std::string& rDest, int sourceCodePage); bool ConvertFromUtf8 (const std::string& rSource, std::string& rDest, int destCodePage); -bool ConvertUtf8ToConsole(const char* pString, std::string& rDest); -bool ConvertConsoleToUtf8(const char* pString, std::string& rDest); +bool ConvertUtf8ToConsole(const std::string& rSource, std::string& rDest); +bool ConvertConsoleToUtf8(const std::string& rSource, std::string& rDest); // Utility function which returns a default config file name, // based on the path of the current executable. |