summaryrefslogtreecommitdiff
path: root/core/fxcrt
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt')
-rw-r--r--core/fxcrt/fx_basic.h2
-rw-r--r--core/fxcrt/fx_basic_utf.cpp6
-rw-r--r--core/fxcrt/xml/cxml_parser.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcrt/fx_basic.h b/core/fxcrt/fx_basic.h
index c6ffc0d535..db0072a5ac 100644
--- a/core/fxcrt/fx_basic.h
+++ b/core/fxcrt/fx_basic.h
@@ -117,7 +117,7 @@ class CFX_UTF8Decoder {
void Clear();
void Input(uint8_t byte);
- void AppendChar(uint32_t ch);
+ void AppendCodePoint(uint32_t ch);
void ClearStatus() { m_PendingBytes = 0; }
CFX_WideStringC GetResult() const { return m_Buffer.AsStringC(); }
diff --git a/core/fxcrt/fx_basic_utf.cpp b/core/fxcrt/fx_basic_utf.cpp
index fcfd5934e4..084553b671 100644
--- a/core/fxcrt/fx_basic_utf.cpp
+++ b/core/fxcrt/fx_basic_utf.cpp
@@ -11,8 +11,8 @@ void CFX_UTF8Decoder::Clear() {
m_PendingBytes = 0;
}
-void CFX_UTF8Decoder::AppendChar(uint32_t ch) {
- m_Buffer.AppendChar((wchar_t)ch);
+void CFX_UTF8Decoder::AppendCodePoint(uint32_t ch) {
+ m_Buffer.AppendChar(static_cast<wchar_t>(ch));
}
void CFX_UTF8Decoder::Input(uint8_t byte) {
@@ -26,7 +26,7 @@ void CFX_UTF8Decoder::Input(uint8_t byte) {
m_PendingBytes--;
m_PendingChar |= (byte & 0x3f) << (m_PendingBytes * 6);
if (m_PendingBytes == 0) {
- AppendChar(m_PendingChar);
+ AppendCodePoint(m_PendingChar);
}
} else if (byte < 0xe0) {
m_PendingBytes = 1;
diff --git a/core/fxcrt/xml/cxml_parser.cpp b/core/fxcrt/xml/cxml_parser.cpp
index 35eca527e6..4d9e3dc469 100644
--- a/core/fxcrt/xml/cxml_parser.cpp
+++ b/core/fxcrt/xml/cxml_parser.cpp
@@ -303,7 +303,7 @@ void CXML_Parser::GetAttrValue(CFX_WideString& value) {
break;
if (ch == '&') {
- decoder.AppendChar(GetCharRef());
+ decoder.AppendCodePoint(GetCharRef());
if (IsEOF()) {
value = decoder.GetResult();
return;
@@ -459,7 +459,7 @@ std::unique_ptr<CXML_Element> CXML_Parser::ParseElementInternal(
iState = 1;
} else if (ch == '&') {
decoder.ClearStatus();
- decoder.AppendChar(GetCharRef());
+ decoder.AppendCodePoint(GetCharRef());
} else {
decoder.Input(ch);
}