[Scummvm-git-logs] scummvm master -> 47130eceb3a059f342b54b678ce0839e01474dd2

[whiterandrek]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
47130eceb3 COMMON: changed code page constant name from ascii to utf8


Commit: 47130eceb3a059f342b54b678ce0839e01474dd2
    https://github.com/scummvm/scummvm/commit/47130eceb3a059f342b54b678ce0839e01474dd2
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-08-05T22:50:42+03:00

Commit Message:
COMMON: changed code page constant name from ascii to utf8

Changed paths:
    common/ustr.cpp
    common/ustr.h


diff --git a/common/ustr.cpp b/common/ustr.cpp
index b6845b2..ecc91bb 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 219d462..d5e8f829 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