4 files changed, 27 insertions, 27 deletions
diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validatedata.cpp
index 2f38d82290..756ddf23bf 100644
--- a/xfa/fxfa/parser/cxfa_validate.cpp
+++ b/xfa/fxfa/parser/cxfa_validatedata.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/parser/cxfa_validate.h"
+#include "xfa/fxfa/parser/cxfa_validatedata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 
-CXFA_Validate::CXFA_Validate(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_ValidateData::CXFA_ValidateData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-int32_t CXFA_Validate::GetFormatTest() {
+int32_t CXFA_ValidateData::GetFormatTest() {
   return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_FormatTest);
 }
 
-bool CXFA_Validate::SetNullTest(WideString wsValue) {
+bool CXFA_ValidateData::SetNullTest(WideString wsValue) {
   const XFA_ATTRIBUTEENUMINFO* pInfo =
       XFA_GetAttributeEnumByName(wsValue.AsStringView());
   m_pNode->JSNode()->SetEnum(XFA_ATTRIBUTE_NullTest,
@@ -24,16 +24,16 @@ bool CXFA_Validate::SetNullTest(WideString wsValue) {
   return true;
 }
 
-int32_t CXFA_Validate::GetNullTest() {
+int32_t CXFA_ValidateData::GetNullTest() {
   return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_NullTest);
 }
 
-int32_t CXFA_Validate::GetScriptTest() {
+int32_t CXFA_ValidateData::GetScriptTest() {
   return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_ScriptTest);
 }
 
-void CXFA_Validate::GetMessageText(WideString& wsMessage,
-                                   const WideString& wsMessageType) {
+void CXFA_ValidateData::GetMessageText(WideString& wsMessage,
+                                       const WideString& wsMessageType) {
   CXFA_Node* pNode =
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Message, false);
   if (!pNode)
@@ -54,24 +54,24 @@ void CXFA_Validate::GetMessageText(WideString& wsMessage,
   }
 }
 
-void CXFA_Validate::SetFormatMessageText(WideString wsMessage) {
+void CXFA_ValidateData::SetFormatMessageText(WideString wsMessage) {
   SetMessageText(wsMessage, L"formatTest");
 }
 
-void CXFA_Validate::GetFormatMessageText(WideString& wsMessage) {
+void CXFA_ValidateData::GetFormatMessageText(WideString& wsMessage) {
   GetMessageText(wsMessage, L"formatTest");
 }
 
-void CXFA_Validate::SetNullMessageText(WideString wsMessage) {
+void CXFA_ValidateData::SetNullMessageText(WideString wsMessage) {
   SetMessageText(wsMessage, L"nullTest");
 }
 
-void CXFA_Validate::GetNullMessageText(WideString& wsMessage) {
+void CXFA_ValidateData::GetNullMessageText(WideString& wsMessage) {
   GetMessageText(wsMessage, L"nullTest");
 }
 
-void CXFA_Validate::SetMessageText(WideString& wsMessage,
-                                   const WideString& wsMessageType) {
+void CXFA_ValidateData::SetMessageText(WideString& wsMessage,
+                                       const WideString& wsMessageType) {
   CXFA_Node* pNode =
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Message, true);
   if (!pNode)
@@ -97,19 +97,19 @@ void CXFA_Validate::SetMessageText(WideString& wsMessage,
   pTextNode->JSNode()->SetContent(wsMessage, wsMessage, false, false, true);
 }
 
-void CXFA_Validate::GetScriptMessageText(WideString& wsMessage) {
+void CXFA_ValidateData::GetScriptMessageText(WideString& wsMessage) {
   GetMessageText(wsMessage, L"scriptTest");
 }
 
-void CXFA_Validate::SetScriptMessageText(WideString wsMessage) {
+void CXFA_ValidateData::SetScriptMessageText(WideString wsMessage) {
   SetMessageText(wsMessage, L"scriptTest");
 }
 
-void CXFA_Validate::GetPicture(WideString& wsPicture) {
+void CXFA_ValidateData::GetPicture(WideString& wsPicture) {
   if (CXFA_Node* pNode = m_pNode->GetChild(0, XFA_Element::Picture, false))
     pNode->JSNode()->TryContent(wsPicture, false, true);
 }
 
-CXFA_ScriptData CXFA_Validate::GetScriptData() {
+CXFA_ScriptData CXFA_ValidateData::GetScriptData() {
   return CXFA_ScriptData(m_pNode->GetChild(0, XFA_Element::Script, false));
 }
diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validatedata.h
index bf6b807b7e..53df39429d 100644
--- a/xfa/fxfa/parser/cxfa_validate.h
+++ b/xfa/fxfa/parser/cxfa_validatedata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_PARSER_CXFA_VALIDATE_H_
-#define XFA_FXFA_PARSER_CXFA_VALIDATE_H_
+#ifndef XFA_FXFA_PARSER_CXFA_VALIDATEDATA_H_
+#define XFA_FXFA_PARSER_CXFA_VALIDATEDATA_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -14,9 +14,9 @@
 
 class CXFA_Node;
 
-class CXFA_Validate : public CXFA_Data {
+class CXFA_ValidateData : public CXFA_Data {
  public:
-  explicit CXFA_Validate(CXFA_Node* pNode);
+  explicit CXFA_ValidateData(CXFA_Node* pNode);
 
   int32_t GetFormatTest();
   int32_t GetNullTest();
@@ -36,4 +36,4 @@ class CXFA_Validate : public CXFA_Data {
   void SetMessageText(WideString& wsMessage, const WideString& wsMessageType);
 };
 
-#endif  // XFA_FXFA_PARSER_CXFA_VALIDATE_H_
+#endif  // XFA_FXFA_PARSER_CXFA_VALIDATEDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index b9a54bd447..d5b1609aea 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -349,8 +349,8 @@ CXFA_CalculateData CXFA_WidgetData::GetCalculateData() {
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Calculate, false));
 }
 
-CXFA_Validate CXFA_WidgetData::GetValidate(bool bModified) {
-  return CXFA_Validate(
+CXFA_ValidateData CXFA_WidgetData::GetValidateData(bool bModified) {
+  return CXFA_ValidateData(
       m_pNode->JSNode()->GetProperty(0, XFA_Element::Validate, bModified));
 }
 
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index d076b9b01e..40ee92d299 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -21,7 +21,7 @@
 #include "xfa/fxfa/parser/cxfa_fontdata.h"
 #include "xfa/fxfa/parser/cxfa_margindata.h"
 #include "xfa/fxfa/parser/cxfa_paradata.h"
-#include "xfa/fxfa/parser/cxfa_validate.h"
+#include "xfa/fxfa/parser/cxfa_validatedata.h"
 
 enum XFA_CHECKSTATE {
   XFA_CHECKSTATE_On = 0,
@@ -61,7 +61,7 @@ class CXFA_WidgetData : public CXFA_Data {
   CXFA_Value GetDefaultValue();
   CXFA_Value GetFormValue();
   CXFA_CalculateData GetCalculateData();
-  CXFA_Validate GetValidate(bool bModified);
+  CXFA_ValidateData GetValidateData(bool bModified);
 
   bool GetWidth(float& fWidth);
   bool GetHeight(float& fHeight);