From 670c4fdea0acb9663145b96bec1fbf76279781df Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 31 Aug 2017 15:11:52 -0400 Subject: Cleanup fx_basic_* files Remove dead code, move code to namespaces where possible, cleanup some single use items. Change-Id: Ia734477ceb2105a1ed272463bd8220f1205a7ce9 Reviewed-on: https://pdfium-review.googlesource.com/12732 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fgas/font/cfgas_fontmgr.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xfa') diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index 36cf10581a..4b395c9ddf 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp @@ -611,6 +611,8 @@ const FX_BIT2CHARSET g_FX_Bit2Charset[4][16] = { {1 << 14, FX_CHARSET_Default}, {1 << 15, FX_CHARSET_US}}}; +constexpr wchar_t kFolderSeparator = L'/'; + } // namespace CFX_FontDescriptor::CFX_FontDescriptor() @@ -640,7 +642,7 @@ CFX_ByteString CFX_FontSourceEnum_File::GetNextFile() { CFX_ByteString bsName; bool bFolder; CFX_ByteString bsFolderSeparator = - CFX_ByteString::FromUnicode(CFX_WideString(FX_GetFolderSeparator())); + CFX_ByteString::FromUnicode(CFX_WideString(kFolderSeparator)); while (true) { if (!FX_GetNextFile(pCurHandle, &bsName, &bFolder)) { FX_CloseFolder(pCurHandle); -- cgit v1.2.3