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/parser/cxfa_validate.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_validate.h') diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h index 470cefe773..ce4ba647cc 100644 --- a/xfa/fxfa/parser/cxfa_validate.h +++ b/xfa/fxfa/parser/cxfa_validate.h @@ -20,24 +20,22 @@ class CXFA_Validate : public CXFA_Data { int32_t GetFormatTest(); int32_t GetNullTest(); - bool SetNullTest(CFX_WideString wsValue); + bool SetNullTest(WideString wsValue); int32_t GetScriptTest(); - void GetFormatMessageText(CFX_WideString& wsMessage); - void SetFormatMessageText(CFX_WideString wsMessage); - void GetNullMessageText(CFX_WideString& wsMessage); - void SetNullMessageText(CFX_WideString wsMessage); - void GetScriptMessageText(CFX_WideString& wsMessage); - void SetScriptMessageText(CFX_WideString wsMessage); - void GetPicture(CFX_WideString& wsPicture); + void GetFormatMessageText(WideString& wsMessage); + void SetFormatMessageText(WideString wsMessage); + void GetNullMessageText(WideString& wsMessage); + void SetNullMessageText(WideString wsMessage); + void GetScriptMessageText(WideString& wsMessage); + void SetScriptMessageText(WideString wsMessage); + void GetPicture(WideString& wsPicture); CXFA_Script GetScript(); private: - void GetMessageText(CFX_WideString& wsMessage, - const CFX_WideString& wsMessageType); - void SetMessageText(CFX_WideString& wsMessage, - const CFX_WideString& wsMessageType); + void GetMessageText(WideString& wsMessage, const WideString& wsMessageType); + void SetMessageText(WideString& wsMessage, const WideString& wsMessageType); bool SetTestValue(int32_t iType, - CFX_WideString& wsValue, + WideString& wsValue, XFA_ATTRIBUTEENUM eName); }; -- cgit v1.2.3