diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
| commit | 62a70f90c49cf7714c960186eb063ad55333e6f3 (patch) | |
| tree | 84b5d0f70b770e6a9ec261342d46638f4d5102bd /core/fxcrt/fx_basic_wstring.cpp | |
| parent | 4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff) | |
| download | pdfium-62a70f90c49cf7714c960186eb063ad55333e6f3.tar.xz | |
Remove FX_WORD in favor of uint16_t.
It isn't buying us anthing, and it looks strange in
a struct when other uint types are already present.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1821043003 .
Diffstat (limited to 'core/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/fxcrt/fx_basic_wstring.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp index 8282bd5014..89e3f8b1fd 100644 --- a/core/fxcrt/fx_basic_wstring.cpp +++ b/core/fxcrt/fx_basic_wstring.cpp @@ -16,7 +16,7 @@ namespace { #ifndef NDEBUG -bool IsValidCodePage(FX_WORD codepage) { +bool IsValidCodePage(uint16_t codepage) { switch (codepage) { case 0: case 932: @@ -367,7 +367,7 @@ CFX_WideString CFX_WideString::FromLocal(const CFX_ByteString& str) { // static CFX_WideString CFX_WideString::FromCodePage(const CFX_ByteString& str, - FX_WORD codepage) { + uint16_t codepage) { return CFX_CharMap::GetWideString(codepage, str); } @@ -1017,7 +1017,7 @@ FX_FLOAT CFX_WideString::GetFloat() const { } // static -CFX_ByteString CFX_CharMap::GetByteString(FX_WORD codepage, +CFX_ByteString CFX_CharMap::GetByteString(uint16_t codepage, const CFX_WideString& wstr) { FXSYS_assert(IsValidCodePage(codepage)); int src_len = wstr.GetLength(); @@ -1034,7 +1034,7 @@ CFX_ByteString CFX_CharMap::GetByteString(FX_WORD codepage, } // static -CFX_WideString CFX_CharMap::GetWideString(FX_WORD codepage, +CFX_WideString CFX_CharMap::GetWideString(uint16_t codepage, const CFX_ByteString& bstr) { FXSYS_assert(IsValidCodePage(codepage)); int src_len = bstr.GetLength(); |