From c8619c8d1cebb6b64db248ec89db98ab4513ad3c Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Tue, 14 Nov 2017 18:48:23 +0000
Subject: Rename a few more data classes.

The CXFA_Data nd CXFA_ExData files are part of the data hierarchy. They
need to be renamed to not clash with XFA node names.

Change-Id: I1ad11dd92edf26912f845aec21c57a9d23e51fcf
Reviewed-on: https://pdfium-review.googlesource.com/18270
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 xfa/fxfa/parser/cxfa_filldata.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'xfa/fxfa/parser/cxfa_filldata.cpp')

diff --git a/xfa/fxfa/parser/cxfa_filldata.cpp b/xfa/fxfa/parser/cxfa_filldata.cpp
index bdce5d604e..65ad3961c2 100644
--- a/xfa/fxfa/parser/cxfa_filldata.cpp
+++ b/xfa/fxfa/parser/cxfa_filldata.cpp
@@ -8,7 +8,7 @@
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 
-CXFA_FillData::CXFA_FillData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_FillData::CXFA_FillData(CXFA_Node* pNode) : CXFA_DataData(pNode) {}
 
 CXFA_FillData::~CXFA_FillData() {}
 
@@ -33,7 +33,7 @@ FX_ARGB CXFA_FillData::GetColor(bool bText) {
   if (CXFA_Node* pNode = m_pNode->GetChild(0, XFA_Element::Color, false)) {
     WideStringView wsColor;
     if (pNode->JSNode()->TryCData(XFA_Attribute::Value, wsColor, false))
-      return CXFA_Data::ToColor(wsColor);
+      return CXFA_DataData::ToColor(wsColor);
   }
   if (bText)
     return 0xFF000000;
@@ -58,7 +58,7 @@ int32_t CXFA_FillData::GetPattern(FX_ARGB& foreColor) {
   if (CXFA_Node* pColor = pNode->GetChild(0, XFA_Element::Color, false)) {
     WideStringView wsColor;
     pColor->JSNode()->TryCData(XFA_Attribute::Value, wsColor, false);
-    foreColor = CXFA_Data::ToColor(wsColor);
+    foreColor = CXFA_DataData::ToColor(wsColor);
   } else {
     foreColor = 0xFF000000;
   }
@@ -73,7 +73,7 @@ int32_t CXFA_FillData::GetStipple(FX_ARGB& stippleColor) {
   if (CXFA_Node* pColor = pNode->GetChild(0, XFA_Element::Color, false)) {
     WideStringView wsColor;
     pColor->JSNode()->TryCData(XFA_Attribute::Value, wsColor, false);
-    stippleColor = CXFA_Data::ToColor(wsColor);
+    stippleColor = CXFA_DataData::ToColor(wsColor);
   } else {
     stippleColor = 0xFF000000;
   }
@@ -88,7 +88,7 @@ int32_t CXFA_FillData::GetLinear(FX_ARGB& endColor) {
   if (CXFA_Node* pColor = pNode->GetChild(0, XFA_Element::Color, false)) {
     WideStringView wsColor;
     pColor->JSNode()->TryCData(XFA_Attribute::Value, wsColor, false);
-    endColor = CXFA_Data::ToColor(wsColor);
+    endColor = CXFA_DataData::ToColor(wsColor);
   } else {
     endColor = 0xFF000000;
   }
@@ -103,7 +103,7 @@ int32_t CXFA_FillData::GetRadial(FX_ARGB& endColor) {
   if (CXFA_Node* pColor = pNode->GetChild(0, XFA_Element::Color, false)) {
     WideStringView wsColor;
     pColor->JSNode()->TryCData(XFA_Attribute::Value, wsColor, false);
-    endColor = CXFA_Data::ToColor(wsColor);
+    endColor = CXFA_DataData::ToColor(wsColor);
   } else {
     endColor = 0xFF000000;
   }
-- 
cgit v1.2.3