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/fxfa/cxfa_textparser.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'xfa/fxfa/cxfa_textparser.h') diff --git a/xfa/fxfa/cxfa_textparser.h b/xfa/fxfa/cxfa_textparser.h index 567aff0189..ee5c38d2af 100644 --- a/xfa/fxfa/cxfa_textparser.h +++ b/xfa/fxfa/cxfa_textparser.h @@ -78,11 +78,11 @@ class CXFA_TextParser { bool GetEmbbedObj(CXFA_TextProvider* pTextProvider, CFX_XMLNode* pXMLNode, - CFX_WideString& wsValue); + WideString& wsValue); CXFA_TextParseContext* GetParseContextFromMap(CFX_XMLNode* pXMLNode); protected: - bool TagValidate(const CFX_WideString& str) const; + bool TagValidate(const WideString& str) const; private: class TagProvider { @@ -90,15 +90,14 @@ class CXFA_TextParser { TagProvider(); ~TagProvider(); - CFX_WideString GetTagName() { return m_wsTagName; } + WideString GetTagName() { return m_wsTagName; } - void SetTagName(const CFX_WideString& wsName) { m_wsTagName = wsName; } - void SetAttribute(const CFX_WideString& wsAttr, - const CFX_WideString& wsValue) { + void SetTagName(const WideString& wsName) { m_wsTagName = wsName; } + void SetAttribute(const WideString& wsAttr, const WideString& wsValue) { m_Attributes.insert({wsAttr, wsValue}); } - CFX_WideString GetAttribute(const CFX_WideString& wsAttr) { + WideString GetAttribute(const WideString& wsAttr) { return m_Attributes[wsAttr]; } @@ -106,8 +105,8 @@ class CXFA_TextParser { bool m_bContent; private: - CFX_WideString m_wsTagName; - std::map m_Attributes; + WideString m_wsTagName; + std::map m_Attributes; }; void InitCSSData(CXFA_TextProvider* pTextProvider); -- cgit v1.2.3