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 --- fpdfsdk/pwl/cpwl_list_impl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/pwl/cpwl_list_impl.cpp') diff --git a/fpdfsdk/pwl/cpwl_list_impl.cpp b/fpdfsdk/pwl/cpwl_list_impl.cpp index 94e0606941..da455d06cb 100644 --- a/fpdfsdk/pwl/cpwl_list_impl.cpp +++ b/fpdfsdk/pwl/cpwl_list_impl.cpp @@ -29,7 +29,7 @@ void CPWL_ListCtrl::Item::SetFontMap(IPVT_FontMap* pFontMap) { m_pEdit->SetFontMap(pFontMap); } -void CPWL_ListCtrl::Item::SetText(const CFX_WideString& text) { +void CPWL_ListCtrl::Item::SetText(const WideString& text) { m_pEdit->SetText(text); } @@ -49,7 +49,7 @@ uint16_t CPWL_ListCtrl::Item::GetFirstChar() const { return word.Word; } -CFX_WideString CPWL_ListCtrl::Item::GetText() const { +WideString CPWL_ListCtrl::Item::GetText() const { return m_pEdit->GetText(); } @@ -310,7 +310,7 @@ CFX_FloatRect CPWL_ListCtrl::GetItemRectInternal(int32_t nIndex) const { return InnerToOuter(rcItem); } -void CPWL_ListCtrl::AddString(const CFX_WideString& str) { +void CPWL_ListCtrl::AddString(const WideString& str) { AddItem(str); ReArrange(GetCount() - 1); } @@ -551,13 +551,13 @@ int32_t CPWL_ListCtrl::GetItemIndex(const CFX_PointF& point) const { return -1; } -CFX_WideString CPWL_ListCtrl::GetText() const { +WideString CPWL_ListCtrl::GetText() const { if (IsMultipleSel()) return GetItemText(m_nCaretIndex); return GetItemText(m_nSelItem); } -void CPWL_ListCtrl::AddItem(const CFX_WideString& str) { +void CPWL_ListCtrl::AddItem(const WideString& str) { auto pListItem = pdfium::MakeUnique(); pListItem->SetFontMap(m_pFontMap.Get()); pListItem->SetFontSize(m_fFontSize); @@ -630,7 +630,7 @@ bool CPWL_ListCtrl::IsValid(int32_t nItemIndex) const { return pdfium::IndexInBounds(m_ListItems, nItemIndex); } -CFX_WideString CPWL_ListCtrl::GetItemText(int32_t nIndex) const { +WideString CPWL_ListCtrl::GetItemText(int32_t nIndex) const { if (pdfium::IndexInBounds(m_ListItems, nIndex) && m_ListItems[nIndex]) return m_ListItems[nIndex]->GetText(); return L""; -- cgit v1.2.3