Rename GetCStr and GetPtr to match CFX_ByteString

core/fxcrt/include/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_FXCRT_INCLUDE_FX_STRING_H_
 #define CORE_FXCRT_INCLUDE_FX_STRING_H_
 
 #include <stdint.h>  // For intptr_t.
@@ skipping 72 matching lines @@
     return other.m_Length == m_Length &&
            FXSYS_memcmp(other.m_Ptr, m_Ptr, m_Length) == 0;
   }
   bool operator!=(const char* ptr) const { return !(*this == ptr); }
   bool operator!=(const CFX_ByteStringC& other) const {
     return !(*this == other);
   }
 
   uint32_t GetID(FX_STRSIZE start_pos = 0) const;
 
-  const uint8_t* GetPtr() const { return m_Ptr; }
-  const FX_CHAR* GetCStr() const { return (const FX_CHAR*)m_Ptr; }
+  const uint8_t* raw_str() const { return m_Ptr; }
+  const FX_CHAR* c_str() const {
+    return reinterpret_cast<const FX_CHAR*>(m_Ptr);
+  }
 
   FX_STRSIZE GetLength() const { return m_Length; }
   bool IsEmpty() const { return m_Length == 0; }
 
   uint8_t GetAt(FX_STRSIZE index) const { return m_Ptr[index]; }
 
   CFX_ByteStringC Mid(FX_STRSIZE index, FX_STRSIZE count = -1) const {
     if (index < 0) {
       index = 0;
     }
@@ skipping 66 matching lines @@
   // Implicit conversion to C-style string -- deprecated.
   operator const FX_CHAR*() const { return m_pData ? m_pData->m_String : ""; }
 
   // Explicit conversion to uint8_t*.
   // Note: |this| must outlive the use of the result.
   const uint8_t* raw_str() const {
     return m_pData ? reinterpret_cast<const uint8_t*>(m_pData->m_String)
                    : nullptr;
   }
 
-  // Implicit conversiont to uint8_t* -- deprecated.
+  // Implicit conversion to uint8_t* -- deprecated.
   operator const uint8_t*() const {
     return m_pData ? reinterpret_cast<const uint8_t*>(m_pData->m_String)
                    : nullptr;
   }
 
   // Explicit conversion to CFX_ByteStringC.
   // Note: |this| must outlive the use of the result.
   CFX_ByteStringC AsByteStringC() const {
     return CFX_ByteStringC(raw_str(), GetLength());
   }
@@ skipping 255 matching lines @@
 
   bool operator==(const wchar_t* ptr) const {
     return FXSYS_wcslen(ptr) == m_Length && wmemcmp(ptr, m_Ptr, m_Length) == 0;
   }
   bool operator==(const CFX_WideStringC& str) const {
     return str.m_Length == m_Length && wmemcmp(str.m_Ptr, m_Ptr, m_Length) == 0;
   }
   bool operator!=(const wchar_t* ptr) const { return !(*this == ptr); }
   bool operator!=(const CFX_WideStringC& str) const { return !(*this == str); }
 
-  const FX_WCHAR* GetPtr() const { return m_Ptr; }
+  const FX_WCHAR* raw_str() const { return m_Ptr; }
 
   FX_STRSIZE GetLength() const { return m_Length; }
   bool IsEmpty() const { return m_Length == 0; }
 
   FX_WCHAR GetAt(FX_STRSIZE index) const { return m_Ptr[index]; }
 
   CFX_WideStringC Left(FX_STRSIZE count) const {
     if (count < 1) {
       return CFX_WideStringC();
     }
@@ skipping 277 matching lines @@
 }
 inline bool operator!=(const wchar_t* lhs, const CFX_WideString& rhs) {
   return rhs != lhs;
 }
 inline bool operator!=(const CFX_WideStringC& lhs, const CFX_WideString& rhs) {
   return rhs != lhs;
 }
 
 CFX_ByteString FX_UTF8Encode(const FX_WCHAR* pwsStr, FX_STRSIZE len);
 inline CFX_ByteString FX_UTF8Encode(const CFX_WideStringC& wsStr) {
-  return FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength());
+  return FX_UTF8Encode(wsStr.raw_str(), wsStr.GetLength());
 }
 inline CFX_ByteString FX_UTF8Encode(const CFX_WideString& wsStr) {
   return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength());
 }
 
 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()).c_str());
+  return FX_atof(FX_UTF8Encode(wsStr.raw_str(), wsStr.GetLength()).c_str());
 }
 void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData);
 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
 
 #endif  // CORE_FXCRT_INCLUDE_FX_STRING_H_