From bb535b45f86f4f9fc470312b048159f0096d3eaa Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Nov 2017 18:32:50 +0000 Subject: Rename CXFA_Assist to CXFA_AssistData This CL renames CXFA_Assist to CXFA_AssistData to make it clear it's part of the data hierarchy. Change-Id: I1d320a0f09dd3536251fd308c71b78db5c4ed644 Reviewed-on: https://pdfium-review.googlesource.com/17971 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- BUILD.gn | 4 ++-- xfa/fxfa/cxfa_ffwidget.cpp | 7 ++++--- xfa/fxfa/parser/cxfa_assist.cpp | 15 --------------- xfa/fxfa/parser/cxfa_assist.h | 22 ---------------------- xfa/fxfa/parser/cxfa_assistdata.cpp | 15 +++++++++++++++ xfa/fxfa/parser/cxfa_assistdata.h | 22 ++++++++++++++++++++++ xfa/fxfa/parser/cxfa_widgetdata.cpp | 4 ++-- xfa/fxfa/parser/cxfa_widgetdata.h | 4 ++-- 8 files changed, 47 insertions(+), 46 deletions(-) delete mode 100644 xfa/fxfa/parser/cxfa_assist.cpp delete mode 100644 xfa/fxfa/parser/cxfa_assist.h create mode 100644 xfa/fxfa/parser/cxfa_assistdata.cpp create mode 100644 xfa/fxfa/parser/cxfa_assistdata.h diff --git a/BUILD.gn b/BUILD.gn index a1ccd6996a..65fe6a025d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1788,8 +1788,8 @@ if (pdf_enable_xfa) { "xfa/fxfa/parser/cxfa_arcdata.h", "xfa/fxfa/parser/cxfa_arraynodelist.cpp", "xfa/fxfa/parser/cxfa_arraynodelist.h", - "xfa/fxfa/parser/cxfa_assist.cpp", - "xfa/fxfa/parser/cxfa_assist.h", + "xfa/fxfa/parser/cxfa_assistdata.cpp", + "xfa/fxfa/parser/cxfa_assistdata.h", "xfa/fxfa/parser/cxfa_attachnodelist.cpp", "xfa/fxfa/parser/cxfa_attachnodelist.h", "xfa/fxfa/parser/cxfa_bind.cpp", diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index 6971d03df0..5cfa836aed 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -978,10 +978,11 @@ CXFA_WidgetAcc* CXFA_FFWidget::GetDataAcc() { } bool CXFA_FFWidget::GetToolTip(WideString& wsToolTip) { - if (CXFA_Assist assist = m_pDataAcc->GetAssist()) { - if (CXFA_ToolTip toolTip = assist.GetToolTip()) { + CXFA_AssistData assist = m_pDataAcc->GetAssistData(); + if (assist) { + CXFA_ToolTip toolTip = assist.GetToolTip(); + if (toolTip) return toolTip.GetTip(wsToolTip); - } } return GetCaptionText(wsToolTip); } diff --git a/xfa/fxfa/parser/cxfa_assist.cpp b/xfa/fxfa/parser/cxfa_assist.cpp deleted file mode 100644 index 7d353a56ec..0000000000 --- a/xfa/fxfa/parser/cxfa_assist.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "xfa/fxfa/parser/cxfa_assist.h" - -#include "xfa/fxfa/parser/cxfa_node.h" - -CXFA_Assist::CXFA_Assist(CXFA_Node* pNode) : CXFA_Data(pNode) {} - -CXFA_ToolTip CXFA_Assist::GetToolTip() { - return CXFA_ToolTip(m_pNode->GetChild(0, XFA_Element::ToolTip, false)); -} diff --git a/xfa/fxfa/parser/cxfa_assist.h b/xfa/fxfa/parser/cxfa_assist.h deleted file mode 100644 index c583ff59d5..0000000000 --- a/xfa/fxfa/parser/cxfa_assist.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FXFA_PARSER_CXFA_ASSIST_H_ -#define XFA_FXFA_PARSER_CXFA_ASSIST_H_ - -#include "xfa/fxfa/parser/cxfa_data.h" -#include "xfa/fxfa/parser/cxfa_tooltip.h" - -class CXFA_Node; - -class CXFA_Assist : public CXFA_Data { - public: - explicit CXFA_Assist(CXFA_Node* pNode); - - CXFA_ToolTip GetToolTip(); -}; - -#endif // XFA_FXFA_PARSER_CXFA_ASSIST_H_ diff --git a/xfa/fxfa/parser/cxfa_assistdata.cpp b/xfa/fxfa/parser/cxfa_assistdata.cpp new file mode 100644 index 0000000000..e480d0ba68 --- /dev/null +++ b/xfa/fxfa/parser/cxfa_assistdata.cpp @@ -0,0 +1,15 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#include "xfa/fxfa/parser/cxfa_assistdata.h" + +#include "xfa/fxfa/parser/cxfa_node.h" + +CXFA_AssistData::CXFA_AssistData(CXFA_Node* pNode) : CXFA_Data(pNode) {} + +CXFA_ToolTip CXFA_AssistData::GetToolTip() { + return CXFA_ToolTip(m_pNode->GetChild(0, XFA_Element::ToolTip, false)); +} diff --git a/xfa/fxfa/parser/cxfa_assistdata.h b/xfa/fxfa/parser/cxfa_assistdata.h new file mode 100644 index 0000000000..f77ffc4245 --- /dev/null +++ b/xfa/fxfa/parser/cxfa_assistdata.h @@ -0,0 +1,22 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#ifndef XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_ +#define XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_ + +#include "xfa/fxfa/parser/cxfa_data.h" +#include "xfa/fxfa/parser/cxfa_tooltip.h" + +class CXFA_Node; + +class CXFA_AssistData : public CXFA_Data { + public: + explicit CXFA_AssistData(CXFA_Node* pNode); + + CXFA_ToolTip GetToolTip(); +}; + +#endif // XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_ diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 963dc5e24e..e5734ef156 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -357,8 +357,8 @@ CXFA_Bind CXFA_WidgetData::GetBind() { return CXFA_Bind(m_pNode->JSNode()->GetProperty(0, XFA_Element::Bind, false)); } -CXFA_Assist CXFA_WidgetData::GetAssist() { - return CXFA_Assist( +CXFA_AssistData CXFA_WidgetData::GetAssistData() { + return CXFA_AssistData( m_pNode->JSNode()->GetProperty(0, XFA_Element::Assist, false)); } diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h index 69f8d0d5a2..8f01e03c76 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -12,7 +12,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "xfa/fxfa/parser/cxfa_assist.h" +#include "xfa/fxfa/parser/cxfa_assistdata.h" #include "xfa/fxfa/parser/cxfa_bind.h" #include "xfa/fxfa/parser/cxfa_border.h" #include "xfa/fxfa/parser/cxfa_calculate.h" @@ -49,7 +49,7 @@ class CXFA_WidgetData : public CXFA_Data { int32_t GetAccess(); int32_t GetRotate(); - CXFA_Assist GetAssist(); + CXFA_AssistData GetAssistData(); CXFA_Border GetBorder(bool bModified); CXFA_Caption GetCaption(); CXFA_Font GetFont(bool bModified); -- cgit v1.2.3