From 275e260a6cd4a8e506ba974feb85ebcd926c1739 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 18 Sep 2017 14:23:18 -0400 Subject: Convert string class names Automated using git grep & sed. Replace StringC classes with StringView classes. Remove the CFX_ prefix and put string classes in fxcrt namespace. Change AsStringC() to AsStringView(). Rename tests from TEST(fxcrt, *String*Foo) to TEST(*String*, Foo). Couple of tests needed to have their names regularlized. BUG=pdfium:894 Change-Id: I7ca038685c8d803795f3ed02545124f7a224c83d Reviewed-on: https://pdfium-review.googlesource.com/14151 Reviewed-by: Tom Sepez Commit-Queue: Ryan Harrison --- core/fxge/apple/fx_mac_imp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fxge/apple/fx_mac_imp.cpp') diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index 2eee8e2e62..637984797a 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -51,7 +51,7 @@ class CFX_MacFontInfo : public CFX_FolderFontInfo { const char JAPAN_GOTHIC[] = "Hiragino Kaku Gothic Pro W6"; const char JAPAN_MINCHO[] = "Hiragino Mincho Pro W6"; -void GetJapanesePreference(CFX_ByteString* face, int weight, int pitch_family) { +void GetJapanesePreference(ByteString* face, int weight, int pitch_family) { if (face->Contains("Gothic")) { *face = JAPAN_GOTHIC; return; @@ -66,9 +66,9 @@ void* CFX_MacFontInfo::MapFont(int weight, int pitch_family, const char* cstr_face, int& iExact) { - CFX_ByteString face = cstr_face; + ByteString face = cstr_face; for (size_t i = 0; i < FX_ArraySize(g_Base14Substs); ++i) { - if (face == CFX_ByteStringC(g_Base14Substs[i].m_pName)) { + if (face == ByteStringView(g_Base14Substs[i].m_pName)) { face = g_Base14Substs[i].m_pSubstName; iExact = true; return GetFont(face.c_str()); @@ -83,7 +83,7 @@ void* CFX_MacFontInfo::MapFont(int weight, // fonts in |m_FontList| with |face| in the name, and examine the fonts to // see which best matches the requested characteristics. if (!face.Contains("Bold") && !face.Contains("Italic")) { - CFX_ByteString new_face = face; + ByteString new_face = face; if (weight > 400) new_face += " Bold"; if (bItalic) -- cgit v1.2.3