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 --- xfa/fwl/cfwl_combobox.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'xfa/fwl/cfwl_combobox.h') diff --git a/xfa/fwl/cfwl_combobox.h b/xfa/fwl/cfwl_combobox.h index 7242b1f450..923e2d8b9a 100644 --- a/xfa/fwl/cfwl_combobox.h +++ b/xfa/fwl/cfwl_combobox.h @@ -59,16 +59,16 @@ class CFWL_ComboBox : public CFWL_Widget { void OnDrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override; - CFX_WideString GetTextByIndex(int32_t iIndex) const; + WideString GetTextByIndex(int32_t iIndex) const; int32_t GetCurSel() const { return m_iCurSel; } void SetCurSel(int32_t iSel); - void AddString(const CFX_WideStringC& wsText); + void AddString(const WideStringView& wsText); void RemoveAt(int32_t iIndex); void RemoveAll(); - void SetEditText(const CFX_WideString& wsText); - CFX_WideString GetEditText() const; + void SetEditText(const WideString& wsText); + WideString GetEditText() const; void OpenDropDownList(bool bActivate); @@ -83,11 +83,9 @@ class CFWL_ComboBox : public CFWL_Widget { return EditCanCopy(); } bool EditCanSelectAll() const { return m_pEdit->GetTextLength() > 0; } - bool EditCopy(CFX_WideString& wsCopy) const { return m_pEdit->Copy(wsCopy); } - bool EditCut(CFX_WideString& wsCut) { return m_pEdit->Cut(wsCut); } - bool EditPaste(const CFX_WideString& wsPaste) { - return m_pEdit->Paste(wsPaste); - } + bool EditCopy(WideString& wsCopy) const { return m_pEdit->Copy(wsCopy); } + bool EditCut(WideString& wsCut) { return m_pEdit->Cut(wsCut); } + bool EditPaste(const WideString& wsPaste) { return m_pEdit->Paste(wsPaste); } void EditSelectAll() { m_pEdit->SelectAll(); } void EditDelete() { m_pEdit->ClearText(); } void EditDeSelect() { m_pEdit->ClearSelection(); } -- cgit v1.2.3