Remove CFX_{Byte,Wide}String::ConvertFrom().

core/include/fxcrt/fx_string.h

 // 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
 
 #ifndef CORE_INCLUDE_FXCRT_FX_STRING_H_
 #define CORE_INCLUDE_FXCRT_FX_STRING_H_
 
 #include <stdint.h>  // For intptr_t.
@@ skipping 271 matching lines @@
 
   void TrimLeft(const CFX_ByteStringC& lpszTargets);
 
   FX_STRSIZE Replace(const CFX_ByteStringC& lpszOld,
                      const CFX_ByteStringC& lpszNew);
 
   FX_STRSIZE Remove(FX_CHAR ch);
 
   CFX_WideString UTF8Decode() const;
 
-  void ConvertFrom(const CFX_WideString& str, CFX_CharMap* pCharMap = NULL);
-
   FX_DWORD GetID(FX_STRSIZE start_pos = 0) const;
 
 #define FXFORMAT_SIGNED 1
 #define FXFORMAT_HEX 2
 #define FXFORMAT_CAPITAL 4
 
   static CFX_ByteString FormatInteger(int i, FX_DWORD flags = 0);
   static CFX_ByteString FormatFloat(FX_FLOAT f, int precision = 0);
 
  protected:
@@ skipping 250 matching lines @@
   CFX_WideString(const FX_WCHAR* ptr, FX_STRSIZE len);
 
   CFX_WideString(FX_WCHAR ch);
 
   CFX_WideString(const CFX_WideStringC& str);
 
   CFX_WideString(const CFX_WideStringC& str1, const CFX_WideStringC& str2);
 
   ~CFX_WideString();
 
-  static CFX_WideString FromLocal(const char* str, FX_STRSIZE len = -1);
+  static CFX_WideString FromLocal(const CFX_ByteString& str);
+
+  static CFX_WideString FromCodePage(const CFX_ByteString& str,
+                                     FX_WORD codepage);
 
   static CFX_WideString FromUTF8(const char* str, FX_STRSIZE len);
 
   static CFX_WideString FromUTF16LE(const unsigned short* str, FX_STRSIZE len);
 
   static FX_STRSIZE WStringLength(const unsigned short* str);
 
   // Explicit conversion to raw string
   const FX_WCHAR* c_str() const { return m_pData ? m_pData->m_String : L""; }
 
@@ skipping 103 matching lines @@
   FX_STRSIZE Find(FX_WCHAR ch, FX_STRSIZE start = 0) const;
 
   FX_STRSIZE Replace(const FX_WCHAR* lpszOld, const FX_WCHAR* lpszNew);
 
   FX_STRSIZE Remove(FX_WCHAR ch);
 
   CFX_ByteString UTF8Encode() const;
 
   CFX_ByteString UTF16LE_Encode() const;
 
-  void ConvertFrom(const CFX_ByteString& str, CFX_CharMap* pCharMap = NULL);
-
  protected:
   class StringData {
    public:
     static StringData* Create(int nLen);
     void Retain() { ++m_nRefs; }
     void Release() {
       if (--m_nRefs <= 0)
         FX_Free(this);
     }
 
@@ skipping 104 matching lines @@
 }
 
 FX_FLOAT FX_atof(const CFX_ByteStringC& str);
 inline FX_FLOAT FX_atof(const CFX_WideStringC& wsStr) {
   return FX_atof(FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength()));
 }
 void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData);
 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
 
 #endif  // CORE_INCLUDE_FXCRT_FX_STRING_H_