diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-06 06:27:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-06 06:27:29 -0700 |
| commit | 660956f58af305d72c64bb87c05f694469846df2 (patch) | |
| tree | 5a73d1df3512213bcecb28114f9d51cec86fca0d /xfa/fgas/localization | |
| parent | 54750b570d32898c8ebd4fa59105bfd3b96043af (diff) | |
| download | pdfium-660956f58af305d72c64bb87c05f694469846df2.tar.xz | |
Rename CFX_WideStringC::raw_str() to c_str()
No functional change intended.
This difference in naming is standing in the way of consolidating
some of the string code between Wide and Byte strings. The Wide
code wants to call raw_str() in exactly the same spots that the
Byte code calls c_str(). This makes sense, because in both places we
get a character type back, and not a uint*_t type. If WideStringC
had a raw_str() method, it would have to return uint32_t or similar.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1863593004
Diffstat (limited to 'xfa/fgas/localization')
| -rw-r--r-- | xfa/fgas/localization/fgas_locale.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp index 878cbf6aeb..f91bc1b78f 100644 --- a/xfa/fgas/localization/fgas_locale.cpp +++ b/xfa/fgas/localization/fgas_locale.cpp @@ -68,8 +68,8 @@ static FX_STRSIZE FX_Local_Find(const CFX_WideStringC& wsSymbols, return -1; } const FX_WCHAR* lpsz = - (const FX_WCHAR*)FXSYS_wcschr(wsSymbols.raw_str() + nStart, ch); - return (lpsz == NULL) ? -1 : (FX_STRSIZE)(lpsz - wsSymbols.raw_str()); + (const FX_WCHAR*)FXSYS_wcschr(wsSymbols.c_str() + nStart, ch); + return (lpsz == NULL) ? -1 : (FX_STRSIZE)(lpsz - wsSymbols.c_str()); } static const FX_WCHAR* const gs_LocalNumberSymbols[] = { L"decimal", L"grouping", L"percent", L"minus", @@ -3856,7 +3856,7 @@ FX_BOOL FX_TimeFromCanonical(const CFX_WideStringC& wsTime, uint8_t second = 0; uint16_t millisecond = 0; int cc_start = 0, cc = cc_start; - const FX_WCHAR* str = (const FX_WCHAR*)wsTime.raw_str(); + const FX_WCHAR* str = wsTime.c_str(); int len = wsTime.GetLength(); while (cc < len && cc < 2) { if (!FX_IsDigit(str[cc])) { @@ -4702,7 +4702,7 @@ CFX_Decimal::CFX_Decimal(FX_FLOAT val, uint8_t scale) { m_uFlags = FXMATH_DECIMAL_MAKEFLAGS(val < 0 && IsNotZero(), scale); } CFX_Decimal::CFX_Decimal(const CFX_WideStringC& strObj) { - const FX_WCHAR* str = strObj.raw_str(); + const FX_WCHAR* str = strObj.c_str(); const FX_WCHAR* strBound = str + strObj.GetLength(); FX_BOOL pointmet = 0; FX_BOOL negmet = 0; |