From 4c3debb3c91f5842784be30a911b52cdabcab7df Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 8 Apr 2016 12:20:38 -0700 Subject: 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 --- core/fxge/ge/fx_ge_ps.cpp | 2 +- core/fxge/ge/fx_ge_text.cpp | 2 +- core/fxge/win32/fx_win32_device.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp index b4e9ed918a..241a184ed1 100644 --- a/core/fxge/ge/fx_ge_ps.cpp +++ b/core/fxge/ge/fx_ge_ps.cpp @@ -680,7 +680,7 @@ FX_BOOL CFX_PSRenderer::DrawText(int nChars, buf << pCharPos[i].m_OriginX << " " << pCharPos[i].m_OriginY << " m"; CFX_ByteString hex; hex.Format("<%02X>", ps_glyphindex); - buf << hex.AsByteStringC() << "Tj\n"; + buf << hex.AsStringC() << "Tj\n"; } buf << "Q\n"; m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize()); diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp index 125547e5a7..44ab9f7ab5 100644 --- a/core/fxge/ge/fx_ge_text.cpp +++ b/core/fxge/ge/fx_ge_text.cpp @@ -193,7 +193,7 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ if ((text_flags & FXFONT_CIDFONT) || (pFont->GetPsName().Find( - CFX_WideString::FromLocal("+ZJHL").AsWideStringC()) != -1) || + CFX_WideString::FromLocal("+ZJHL").AsStringC()) != -1) || (pFont->GetPsName() == CFX_WideString::FromLocal("CNAAJI+cmex10"))) { should_call_draw_device_text = false; } diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 7b8a4faa55..60ae57c767 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -454,7 +454,7 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) { if (path_len > 0 && path_len < MAX_PATH) { CFX_ByteString fonts_path(windows_path); fonts_path += "\\Fonts"; - pInfoFallback->AddPath(fonts_path.AsByteStringC()); + pInfoFallback->AddPath(fonts_path.AsStringC()); } return pInfoFallback; } -- cgit v1.2.3