diff options
author | tsepez <tsepez@chromium.org> | 2016-04-08 12:20:38 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-08 12:20:39 -0700 |
commit | 4c3debb3c91f5842784be30a911b52cdabcab7df (patch) | |
tree | e0534dcb43a71376be8da0b376a97de37080ecc5 /core/fxcrt/include | |
parent | f172290a8dc527cd8bc73b0d0ad59e78797968c1 (diff) | |
download | pdfium-4c3debb3c91f5842784be30a911b52cdabcab7df.tar.xz |
Rename both As{Byte,Wide}StringC() helpers to AsStringC().
The naming is redundant given the base type, and will stand
in the way of consolidating Byte and Wide code.
BUG=
Review URL: https://codereview.chromium.org/1862123003
Diffstat (limited to 'core/fxcrt/include')
-rw-r--r-- | core/fxcrt/include/fx_basic.h | 2 | ||||
-rw-r--r-- | core/fxcrt/include/fx_string.h | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h index 1cb5174351..1b64a5924f 100644 --- a/core/fxcrt/include/fx_basic.h +++ b/core/fxcrt/include/fx_basic.h @@ -67,7 +67,7 @@ class CFX_ByteTextBuf : public CFX_BinaryBuf { return *this << CFX_ByteStringC(pStr); } CFX_ByteTextBuf& operator<<(const CFX_ByteString& str) { - return *this << str.AsByteStringC(); + return *this << str.AsStringC(); } CFX_ByteTextBuf& operator<<(const CFX_ByteStringC& lpsz); CFX_ByteTextBuf& operator<<(const CFX_ByteTextBuf& buf); diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h index 6e2954fcbb..5e3cb45fba 100644 --- a/core/fxcrt/include/fx_string.h +++ b/core/fxcrt/include/fx_string.h @@ -188,7 +188,7 @@ class CFX_ByteString { // Explicit conversion to CFX_ByteStringC. // Note: |this| must outlive the use of the result. - CFX_ByteStringC AsByteStringC() const { + CFX_ByteStringC AsStringC() const { return CFX_ByteStringC(raw_str(), GetLength()); } @@ -332,29 +332,29 @@ inline CFX_ByteString operator+(FX_CHAR ch, const CFX_ByteStringC& str2) { } inline CFX_ByteString operator+(const CFX_ByteString& str1, const CFX_ByteString& str2) { - return CFX_ByteString(str1.AsByteStringC(), str2.AsByteStringC()); + return CFX_ByteString(str1.AsStringC(), str2.AsStringC()); } inline CFX_ByteString operator+(const CFX_ByteString& str1, FX_CHAR ch) { - return CFX_ByteString(str1.AsByteStringC(), CFX_ByteStringC(ch)); + return CFX_ByteString(str1.AsStringC(), CFX_ByteStringC(ch)); } inline CFX_ByteString operator+(FX_CHAR ch, const CFX_ByteString& str2) { - return CFX_ByteString(ch, str2.AsByteStringC()); + return CFX_ByteString(ch, str2.AsStringC()); } inline CFX_ByteString operator+(const CFX_ByteString& str1, const FX_CHAR* str2) { - return CFX_ByteString(str1.AsByteStringC(), str2); + return CFX_ByteString(str1.AsStringC(), str2); } inline CFX_ByteString operator+(const FX_CHAR* str1, const CFX_ByteString& str2) { - return CFX_ByteString(str1, str2.AsByteStringC()); + return CFX_ByteString(str1, str2.AsStringC()); } inline CFX_ByteString operator+(const CFX_ByteString& str1, const CFX_ByteStringC& str2) { - return CFX_ByteString(str1.AsByteStringC(), str2); + return CFX_ByteString(str1.AsStringC(), str2); } inline CFX_ByteString operator+(const CFX_ByteStringC& str1, const CFX_ByteString& str2) { - return CFX_ByteString(str1, str2.AsByteStringC()); + return CFX_ByteString(str1, str2.AsStringC()); } class CFX_WideStringC { @@ -512,7 +512,7 @@ class CFX_WideString { // Explicit conversion to CFX_WideStringC. // Note: |this| must outlive the use of the result. - CFX_WideStringC AsWideStringC() const { + CFX_WideStringC AsStringC() const { return CFX_WideStringC(c_str(), GetLength()); } @@ -641,29 +641,29 @@ inline CFX_WideString operator+(FX_WCHAR ch, const CFX_WideStringC& str2) { } inline CFX_WideString operator+(const CFX_WideString& str1, const CFX_WideString& str2) { - return CFX_WideString(str1.AsWideStringC(), str2.AsWideStringC()); + return CFX_WideString(str1.AsStringC(), str2.AsStringC()); } inline CFX_WideString operator+(const CFX_WideString& str1, FX_WCHAR ch) { - return CFX_WideString(str1.AsWideStringC(), CFX_WideStringC(ch)); + return CFX_WideString(str1.AsStringC(), CFX_WideStringC(ch)); } inline CFX_WideString operator+(FX_WCHAR ch, const CFX_WideString& str2) { - return CFX_WideString(ch, str2.AsWideStringC()); + return CFX_WideString(ch, str2.AsStringC()); } inline CFX_WideString operator+(const CFX_WideString& str1, const FX_WCHAR* str2) { - return CFX_WideString(str1.AsWideStringC(), str2); + return CFX_WideString(str1.AsStringC(), str2); } inline CFX_WideString operator+(const FX_WCHAR* str1, const CFX_WideString& str2) { - return CFX_WideString(str1, str2.AsWideStringC()); + return CFX_WideString(str1, str2.AsStringC()); } inline CFX_WideString operator+(const CFX_WideString& str1, const CFX_WideStringC& str2) { - return CFX_WideString(str1.AsWideStringC(), str2); + return CFX_WideString(str1.AsStringC(), str2); } inline CFX_WideString operator+(const CFX_WideStringC& str1, const CFX_WideString& str2) { - return CFX_WideString(str1, str2.AsWideStringC()); + return CFX_WideString(str1, str2.AsStringC()); } inline bool operator==(const wchar_t* lhs, const CFX_WideString& rhs) { return rhs == lhs; |