diff options
| author | Andrei Prykhodko | 2018-08-05 22:50:42 +0300 |
|---|---|---|
| committer | Andrei Prykhodko | 2018-08-05 22:50:42 +0300 |
| commit | 47130eceb3a059f342b54b678ce0839e01474dd2 (patch) | |
| tree | 22212d3599caec4733493ffae1383bc512fb739e | |
| parent | c255de107d3dc57e210857a7bf34847e36f3dc0c (diff) | |
| download | scummvm-rg350-47130eceb3a059f342b54b678ce0839e01474dd2.tar.gz scummvm-rg350-47130eceb3a059f342b54b678ce0839e01474dd2.tar.bz2 scummvm-rg350-47130eceb3a059f342b54b678ce0839e01474dd2.zip | |
COMMON: changed code page constant name from ascii to utf8
| -rw-r--r-- | common/ustr.cpp | 2 | ||||
| -rw-r--r-- | common/ustr.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/ustr.cpp b/common/ustr.cpp index b6845b2da4..ecc91bb189 100644 --- a/common/ustr.cpp +++ b/common/ustr.cpp @@ -430,7 +430,7 @@ static const uint32 g_windows1255ConversionTable[] = {0x20AC, 0x0081, 0x201A, 0x U32String convertToU32String(const char *str, CodePage page) { const String string(str); - if (page == kAscii) { + if (page == kUtf8) { return convertUtf8ToUtf32(string); } diff --git a/common/ustr.h b/common/ustr.h index 219d46293d..d5e8f8298d 100644 --- a/common/ustr.h +++ b/common/ustr.h @@ -196,14 +196,14 @@ private: U32String convertUtf8ToUtf32(const String &str); enum CodePage { - kAscii, + kUtf8, kWindows1250, kWindows1251, kWindows1252, kWindows1255 }; -U32String convertToU32String(const char *str, CodePage page = kAscii); +U32String convertToU32String(const char *str, CodePage page = kUtf8); } // End of namespace Common |