diff options
Diffstat (limited to 'core/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/fxcrt/fx_basic_wstring.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp index 9c17948c34..8940c1a37f 100644 --- a/core/fxcrt/fx_basic_wstring.cpp +++ b/core/fxcrt/fx_basic_wstring.cpp @@ -103,7 +103,7 @@ CFX_WideString::CFX_WideString(const CFX_WideStringC& str) { } m_pData = StringData::Create(str.GetLength()); if (m_pData) { - FXSYS_memcpy(m_pData->m_String, str.GetPtr(), + FXSYS_memcpy(m_pData->m_String, str.raw_str(), str.GetLength() * sizeof(FX_WCHAR)); } } @@ -116,9 +116,9 @@ CFX_WideString::CFX_WideString(const CFX_WideStringC& str1, } m_pData = StringData::Create(nNewLen); if (m_pData) { - FXSYS_memcpy(m_pData->m_String, str1.GetPtr(), + FXSYS_memcpy(m_pData->m_String, str1.raw_str(), str1.GetLength() * sizeof(FX_WCHAR)); - FXSYS_memcpy(m_pData->m_String + str1.GetLength(), str2.GetPtr(), + FXSYS_memcpy(m_pData->m_String + str1.GetLength(), str2.raw_str(), str2.GetLength() * sizeof(FX_WCHAR)); } } @@ -151,7 +151,7 @@ const CFX_WideString& CFX_WideString::operator=( if (stringSrc.IsEmpty()) { Empty(); } else { - AssignCopy(stringSrc.GetLength(), stringSrc.GetPtr()); + AssignCopy(stringSrc.GetLength(), stringSrc.raw_str()); } return *this; } @@ -195,7 +195,7 @@ const CFX_WideString& CFX_WideString::operator+=(const CFX_WideStringC& str) { if (str.IsEmpty()) { return *this; } - ConcatInPlace(str.GetLength(), str.GetPtr()); + ConcatInPlace(str.GetLength(), str.raw_str()); return *this; } bool CFX_WideString::operator==(const wchar_t* ptr) const { @@ -213,7 +213,7 @@ bool CFX_WideString::operator==(const CFX_WideStringC& str) const { return str.IsEmpty(); return str.GetLength() == m_pData->m_nDataLength && - wmemcmp(str.GetPtr(), m_pData->m_String, m_pData->m_nDataLength) == 0; + wmemcmp(str.raw_str(), m_pData->m_String, m_pData->m_nDataLength) == 0; } bool CFX_WideString::operator==(const CFX_WideString& other) const { if (IsEmpty()) |