Make CFX_WideString::FromLocal() take a CFX_ByteStringC arg

core/fxcrt/fx_basic_wstring.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cctype>
@@ skipping 343 matching lines @@
     return NULL;
   }
   FXSYS_memcpy(m_pData->m_String, pOldData->m_String,
                (nOldLen + 1) * sizeof(FX_WCHAR));
   m_pData->m_nDataLength = nOldLen;
   pOldData->Release();
   return m_pData->m_String;
 }
 
 // static
-CFX_WideString CFX_WideString::FromLocal(const CFX_ByteString& str) {
+CFX_WideString CFX_WideString::FromLocal(const CFX_ByteStringC& str) {
   return FromCodePage(str, 0);
 }
 
 // static
-CFX_WideString CFX_WideString::FromCodePage(const CFX_ByteString& str,
+CFX_WideString CFX_WideString::FromCodePage(const CFX_ByteStringC& str,
                                             uint16_t codepage) {
   return CFX_CharMap::GetWideString(codepage, str);
 }
 
 // static
 CFX_WideString CFX_WideString::FromUTF8(const CFX_ByteStringC& str) {
   if (str.IsEmpty())
     return CFX_WideString();
 
   CFX_UTF8Decoder decoder;
@@ skipping 623 matching lines @@
 }
 int CFX_WideString::GetInteger() const {
   return m_pData ? FXSYS_wtoi(m_pData->m_String) : 0;
 }
 FX_FLOAT CFX_WideString::GetFloat() const {
   return m_pData ? FX_wtof(m_pData->m_String, m_pData->m_nDataLength) : 0.0f;
 }
 
 // static
 CFX_ByteString CFX_CharMap::GetByteString(uint16_t codepage,
-                                          const CFX_WideString& wstr) {
+                                          const CFX_WideStringC& wstr) {
   FXSYS_assert(IsValidCodePage(codepage));
   int src_len = wstr.GetLength();
   int dest_len = FXSYS_WideCharToMultiByte(codepage, 0, wstr.c_str(), src_len,
                                            nullptr, 0, nullptr, nullptr);
   CFX_ByteString bstr;
   if (dest_len) {
     FX_CHAR* dest_buf = bstr.GetBuffer(dest_len);
     FXSYS_WideCharToMultiByte(codepage, 0, wstr.c_str(), src_len, dest_buf,
                               dest_len, nullptr, nullptr);
     bstr.ReleaseBuffer(dest_len);
   }
   return bstr;
 }
 
 // static
 CFX_WideString CFX_CharMap::GetWideString(uint16_t codepage,
-                                          const CFX_ByteString& bstr) {
+                                          const CFX_ByteStringC& bstr) {
   FXSYS_assert(IsValidCodePage(codepage));
   int src_len = bstr.GetLength();
   int dest_len =
-      FXSYS_MultiByteToWideChar(codepage, 0, bstr, src_len, nullptr, 0);
+      FXSYS_MultiByteToWideChar(codepage, 0, bstr.c_str(), src_len, nullptr, 0);
   CFX_WideString wstr;
   if (dest_len) {
     FX_WCHAR* dest_buf = wstr.GetBuffer(dest_len);
-    FXSYS_MultiByteToWideChar(codepage, 0, bstr, src_len, dest_buf, dest_len);
+    FXSYS_MultiByteToWideChar(codepage, 0, bstr.c_str(), src_len, dest_buf,
+                              dest_len);
     wstr.ReleaseBuffer(dest_len);
   }
   return wstr;
 }