From 9d0d36b7f3e2106bbeb332edf821fc2c637e6ea0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 22 Nov 2017 22:04:12 +0000 Subject: Cleanup CXFA_ValidateData This CL removes out-params in favour of returns; Makes params const; Cleans up return types. Change-Id: I2b7c237130a99859b08af0486a95b4c6f6974f62 Reviewed-on: https://pdfium-review.googlesource.com/19130 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_validatedata.h | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_validatedata.h') diff --git a/xfa/fxfa/parser/cxfa_validatedata.h b/xfa/fxfa/parser/cxfa_validatedata.h index a431cbdf20..e18fcadeaf 100644 --- a/xfa/fxfa/parser/cxfa_validatedata.h +++ b/xfa/fxfa/parser/cxfa_validatedata.h @@ -18,22 +18,28 @@ class CXFA_ValidateData : public CXFA_DataData { public: explicit CXFA_ValidateData(CXFA_Node* pNode); - int32_t GetFormatTest(); - int32_t GetNullTest(); - bool SetNullTest(WideString wsValue); - int32_t GetScriptTest(); - 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_ScriptData GetScriptData(); + XFA_ATTRIBUTEENUM GetFormatTest() const; + WideString GetFormatMessageText() const; + void SetFormatMessageText(const WideString& wsMessage); + + XFA_ATTRIBUTEENUM GetNullTest() const; + void SetNullTest(const WideString& wsValue); + + WideString GetNullMessageText() const; + void SetNullMessageText(const WideString& wsMessage); + + XFA_ATTRIBUTEENUM GetScriptTest() const; + WideString GetScriptMessageText() const; + void SetScriptMessageText(const WideString& wsMessage); + + WideString GetPicture() const; + + CXFA_ScriptData GetScriptData() const; private: - void GetMessageText(WideString& wsMessage, const WideString& wsMessageType); - void SetMessageText(WideString& wsMessage, const WideString& wsMessageType); + WideString GetMessageText(const WideString& wsMessageType) const; + void SetMessageText(const WideString& wsMessageType, + const WideString& wsMessage); }; #endif // XFA_FXFA_PARSER_CXFA_VALIDATEDATA_H_ -- cgit v1.2.3