diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-07 18:41:41 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-07 18:41:41 +0000 |
commit | cce8e2f46d0fb64c2558c24a2aa33ac929dfdad6 (patch) | |
tree | 6346c809d62d1c24baa67b958a473d2f413dfea5 /xfa/fxfa/parser | |
parent | 50132e522702dd016b83ed12e91d065357fe0b59 (diff) | |
download | pdfium-cce8e2f46d0fb64c2558c24a2aa33ac929dfdad6.tar.xz |
Rename CXFA_Box to CXFA_BoxData
This CL renames CXFA_Box to CXFA_BoxData to make it clear it's part of
the Data hierarchy.
Change-Id: I5971eefb078f73228e2fcfc08d2025d800c319fb
Reviewed-on: https://pdfium-review.googlesource.com/17975
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r-- | xfa/fxfa/parser/cxfa_arcdata.h | 6 | ||||
-rw-r--r-- | xfa/fxfa/parser/cxfa_borderdata.h | 6 | ||||
-rw-r--r-- | xfa/fxfa/parser/cxfa_boxdata.cpp (renamed from xfa/fxfa/parser/cxfa_box.cpp) | 24 | ||||
-rw-r--r-- | xfa/fxfa/parser/cxfa_boxdata.h (renamed from xfa/fxfa/parser/cxfa_box.h) | 10 | ||||
-rw-r--r-- | xfa/fxfa/parser/cxfa_rectangle.h | 6 |
5 files changed, 26 insertions, 26 deletions
diff --git a/xfa/fxfa/parser/cxfa_arcdata.h b/xfa/fxfa/parser/cxfa_arcdata.h index 60c32bad4e..9c1272e9c6 100644 --- a/xfa/fxfa/parser/cxfa_arcdata.h +++ b/xfa/fxfa/parser/cxfa_arcdata.h @@ -7,13 +7,13 @@ #ifndef XFA_FXFA_PARSER_CXFA_ARCDATA_H_ #define XFA_FXFA_PARSER_CXFA_ARCDATA_H_ -#include "xfa/fxfa/parser/cxfa_box.h" +#include "xfa/fxfa/parser/cxfa_boxdata.h" class CXFA_Node; -class CXFA_ArcData : public CXFA_Box { +class CXFA_ArcData : public CXFA_BoxData { public: - explicit CXFA_ArcData(CXFA_Node* pNode) : CXFA_Box(pNode) {} + explicit CXFA_ArcData(CXFA_Node* pNode) : CXFA_BoxData(pNode) {} }; #endif // XFA_FXFA_PARSER_CXFA_ARCDATA_H_ diff --git a/xfa/fxfa/parser/cxfa_borderdata.h b/xfa/fxfa/parser/cxfa_borderdata.h index 20e66562e5..aba7d3dd1a 100644 --- a/xfa/fxfa/parser/cxfa_borderdata.h +++ b/xfa/fxfa/parser/cxfa_borderdata.h @@ -7,13 +7,13 @@ #ifndef XFA_FXFA_PARSER_CXFA_BORDERDATA_H_ #define XFA_FXFA_PARSER_CXFA_BORDERDATA_H_ -#include "xfa/fxfa/parser/cxfa_box.h" +#include "xfa/fxfa/parser/cxfa_boxdata.h" class CXFA_Node; -class CXFA_BorderData : public CXFA_Box { +class CXFA_BorderData : public CXFA_BoxData { public: - explicit CXFA_BorderData(CXFA_Node* pNode) : CXFA_Box(pNode) {} + explicit CXFA_BorderData(CXFA_Node* pNode) : CXFA_BoxData(pNode) {} }; #endif // XFA_FXFA_PARSER_CXFA_BORDERDATA_H_ diff --git a/xfa/fxfa/parser/cxfa_box.cpp b/xfa/fxfa/parser/cxfa_boxdata.cpp index c0ca723746..c7a58a1c27 100644 --- a/xfa/fxfa/parser/cxfa_box.cpp +++ b/xfa/fxfa/parser/cxfa_boxdata.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/parser/cxfa_box.h" +#include "xfa/fxfa/parser/cxfa_boxdata.h" #include "xfa/fxfa/parser/cxfa_corner.h" #include "xfa/fxfa/parser/cxfa_measurement.h" @@ -75,41 +75,41 @@ static int32_t Style3D(const std::vector<CXFA_Stroke>& strokes, } // namespace -int32_t CXFA_Box::GetHand() const { +int32_t CXFA_BoxData::GetHand() const { if (!m_pNode) return XFA_ATTRIBUTEENUM_Even; return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Hand); } -int32_t CXFA_Box::GetPresence() const { +int32_t CXFA_BoxData::GetPresence() const { if (!m_pNode) return XFA_ATTRIBUTEENUM_Hidden; return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Presence); } -int32_t CXFA_Box::CountEdges() const { +int32_t CXFA_BoxData::CountEdges() const { if (!m_pNode) return 0; return m_pNode->CountChildren(XFA_Element::Edge, false); } -CXFA_Edge CXFA_Box::GetEdge(int32_t nIndex) const { +CXFA_Edge CXFA_BoxData::GetEdge(int32_t nIndex) const { return CXFA_Edge(m_pNode ? m_pNode->JSNode()->GetProperty( nIndex, XFA_Element::Edge, nIndex == 0) : nullptr); } -void CXFA_Box::GetStrokes(std::vector<CXFA_Stroke>* strokes) const { +void CXFA_BoxData::GetStrokes(std::vector<CXFA_Stroke>* strokes) const { GetStrokesInternal(m_pNode, strokes, false); } -bool CXFA_Box::IsCircular() const { +bool CXFA_BoxData::IsCircular() const { if (!m_pNode) return false; return m_pNode->JSNode()->GetBoolean(XFA_ATTRIBUTE_Circular); } -bool CXFA_Box::GetStartAngle(float& fStartAngle) const { +bool CXFA_BoxData::GetStartAngle(float& fStartAngle) const { fStartAngle = 0; if (!m_pNode) return false; @@ -123,7 +123,7 @@ bool CXFA_Box::GetStartAngle(float& fStartAngle) const { return bRet; } -bool CXFA_Box::GetSweepAngle(float& fSweepAngle) const { +bool CXFA_BoxData::GetSweepAngle(float& fSweepAngle) const { fSweepAngle = 360; if (!m_pNode) return false; @@ -137,7 +137,7 @@ bool CXFA_Box::GetSweepAngle(float& fSweepAngle) const { return bRet; } -CXFA_Fill CXFA_Box::GetFill(bool bModified) const { +CXFA_Fill CXFA_BoxData::GetFill(bool bModified) const { if (!m_pNode) return CXFA_Fill(nullptr); @@ -146,12 +146,12 @@ CXFA_Fill CXFA_Box::GetFill(bool bModified) const { return CXFA_Fill(pFillNode); } -CXFA_Margin CXFA_Box::GetMargin() const { +CXFA_Margin CXFA_BoxData::GetMargin() const { return CXFA_Margin(m_pNode ? m_pNode->GetChild(0, XFA_Element::Margin, false) : nullptr); } -int32_t CXFA_Box::Get3DStyle(bool& bVisible, float& fThickness) const { +int32_t CXFA_BoxData::Get3DStyle(bool& bVisible, float& fThickness) const { if (IsArc()) return 0; diff --git a/xfa/fxfa/parser/cxfa_box.h b/xfa/fxfa/parser/cxfa_boxdata.h index d2b79fae56..b664479a28 100644 --- a/xfa/fxfa/parser/cxfa_box.h +++ b/xfa/fxfa/parser/cxfa_boxdata.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_PARSER_CXFA_BOX_H_ -#define XFA_FXFA_PARSER_CXFA_BOX_H_ +#ifndef XFA_FXFA_PARSER_CXFA_BOXDATA_H_ +#define XFA_FXFA_PARSER_CXFA_BOXDATA_H_ #include <vector> @@ -17,9 +17,9 @@ class CXFA_Node; -class CXFA_Box : public CXFA_Data { +class CXFA_BoxData : public CXFA_Data { public: - explicit CXFA_Box(CXFA_Node* pNode) : CXFA_Data(pNode) {} + explicit CXFA_BoxData(CXFA_Node* pNode) : CXFA_Data(pNode) {} bool IsArc() const { return GetElementType() == XFA_Element::Arc; } bool IsBorder() const { return GetElementType() == XFA_Element::Border; } @@ -51,4 +51,4 @@ class CXFA_Box : public CXFA_Data { int32_t Get3DStyle(bool& bVisible, float& fThickness) const; }; -#endif // XFA_FXFA_PARSER_CXFA_BOX_H_ +#endif // XFA_FXFA_PARSER_CXFA_BOXDATA_H_ diff --git a/xfa/fxfa/parser/cxfa_rectangle.h b/xfa/fxfa/parser/cxfa_rectangle.h index 8d18ace0de..07a4d7de70 100644 --- a/xfa/fxfa/parser/cxfa_rectangle.h +++ b/xfa/fxfa/parser/cxfa_rectangle.h @@ -7,13 +7,13 @@ #ifndef XFA_FXFA_PARSER_CXFA_RECTANGLE_H_ #define XFA_FXFA_PARSER_CXFA_RECTANGLE_H_ -#include "xfa/fxfa/parser/cxfa_box.h" +#include "xfa/fxfa/parser/cxfa_boxdata.h" class CXFA_Node; -class CXFA_Rectangle : public CXFA_Box { +class CXFA_Rectangle : public CXFA_BoxData { public: - explicit CXFA_Rectangle(CXFA_Node* pNode) : CXFA_Box(pNode) {} + explicit CXFA_Rectangle(CXFA_Node* pNode) : CXFA_BoxData(pNode) {} }; #endif // XFA_FXFA_PARSER_CXFA_RECTANGLE_H_ |