diff options
author | Ryan Harrison <rharrison@chromium.org> | 2017-09-18 14:23:18 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-18 18:40:16 +0000 |
commit | 275e260a6cd4a8e506ba974feb85ebcd926c1739 (patch) | |
tree | 2029b9158ec044764ceff122fe5fb5d0a3f123d1 /xfa/fgas/layout | |
parent | 450fbeaaabf1ab340c1018de2e58f1950657517e (diff) | |
download | pdfium-275e260a6cd4a8e506ba974feb85ebcd926c1739.tar.xz |
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 <tsepez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fgas/layout')
-rw-r--r-- | xfa/fgas/layout/cfx_breakline.cpp | 2 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_breakline.h | 2 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_breakpiece.cpp | 4 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_breakpiece.h | 2 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.h | 2 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak_unittest.cpp | 2 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fgas/layout/cfx_breakline.cpp b/xfa/fgas/layout/cfx_breakline.cpp index 9eb0211119..d3fce06d6f 100644 --- a/xfa/fgas/layout/cfx_breakline.cpp +++ b/xfa/fgas/layout/cfx_breakline.cpp @@ -35,7 +35,7 @@ const CFX_BreakPiece* CFX_BreakLine::GetPiece(int32_t index) const { return &m_LinePieces[index]; } -void CFX_BreakLine::GetString(CFX_WideString& wsStr) const { +void CFX_BreakLine::GetString(WideString& wsStr) const { int32_t iCount = pdfium::CollectionSize<int32_t>(m_LineChars); wchar_t* pBuf = wsStr.GetBuffer(iCount); for (int32_t i = 0; i < iCount; i++) diff --git a/xfa/fgas/layout/cfx_breakline.h b/xfa/fgas/layout/cfx_breakline.h index 138ee3104e..8826976517 100644 --- a/xfa/fgas/layout/cfx_breakline.h +++ b/xfa/fgas/layout/cfx_breakline.h @@ -24,7 +24,7 @@ class CFX_BreakLine { int32_t CountPieces() const; const CFX_BreakPiece* GetPiece(int32_t index) const; - void GetString(CFX_WideString& wsStr) const; + void GetString(WideString& wsStr) const; int32_t GetLineEnd() const; void Clear(); diff --git a/xfa/fgas/layout/cfx_breakpiece.cpp b/xfa/fgas/layout/cfx_breakpiece.cpp index 70ac66e8ba..364c117e89 100644 --- a/xfa/fgas/layout/cfx_breakpiece.cpp +++ b/xfa/fgas/layout/cfx_breakpiece.cpp @@ -34,8 +34,8 @@ CFX_Char* CFX_BreakPiece::GetChar(int32_t index) const { return &(*m_pChars)[m_iStartChar + index]; } -CFX_WideString CFX_BreakPiece::GetString() const { - CFX_WideString ret; +WideString CFX_BreakPiece::GetString() const { + WideString ret; ret.Reserve(m_iChars); for (int32_t i = m_iStartChar; i < m_iStartChar + m_iChars; i++) ret += static_cast<wchar_t>((*m_pChars)[i].char_code()); diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h index 668245f3c0..bbf4558eb1 100644 --- a/xfa/fgas/layout/cfx_breakpiece.h +++ b/xfa/fgas/layout/cfx_breakpiece.h @@ -25,7 +25,7 @@ class CFX_BreakPiece { int32_t GetLength() const { return m_iChars; } CFX_Char* GetChar(int32_t index) const; - CFX_WideString GetString() const; + WideString GetString() const; std::vector<int32_t> GetWidths() const; CFX_BreakType m_dwStatus; diff --git a/xfa/fgas/layout/cfx_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h index 699815ab98..f5ad90838f 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.h +++ b/xfa/fgas/layout/cfx_rtfbreak.h @@ -31,7 +31,7 @@ struct FX_RTFTEXTOBJ { FX_RTFTEXTOBJ(); ~FX_RTFTEXTOBJ(); - CFX_WideString pStr; + WideString pStr; std::vector<int32_t> pWidths; CFX_RetainPtr<CFGAS_GEFont> pFont; const CFX_RectF* pRect; diff --git a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp index 8997edc083..bda52fc76a 100644 --- a/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp @@ -39,7 +39,7 @@ class CFX_RTFBreakTest : public testing::Test { TEST_F(CFX_RTFBreakTest, AddChars) { auto b = CreateBreak(FX_LAYOUTSTYLE_ExpandTab); - CFX_WideString str(L"Input String."); + WideString str(L"Input String."); for (const auto& c : str) EXPECT_EQ(CFX_BreakType::None, b->AppendChar(c)); diff --git a/xfa/fgas/layout/cfx_txtbreak.h b/xfa/fgas/layout/cfx_txtbreak.h index 72614bc2e7..959cd8eb48 100644 --- a/xfa/fgas/layout/cfx_txtbreak.h +++ b/xfa/fgas/layout/cfx_txtbreak.h @@ -41,7 +41,7 @@ struct FX_TXTRUN { CFDE_TextEditEngine* pEdtEngine; const FDE_TEXTEDITPIECE* pIdentity; - CFX_WideString wsStr; + WideString wsStr; int32_t* pWidths; int32_t iLength; CFX_RetainPtr<CFGAS_GEFont> pFont; |