From 1a7534a1a477323f7b8497e359f6af6e9bd54cd5 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 22 Nov 2016 15:56:11 -0800 Subject: Rename IFWL_App to CFWL_App This class is not an interface but a concrete implementation. Rename to match. Review-Url: https://codereview.chromium.org/2521303002 --- xfa/fxfa/app/xfa_ffapp.cpp | 3 +-- xfa/fxfa/app/xfa_ffbarcode.cpp | 2 +- xfa/fxfa/app/xfa_ffchoicelist.cpp | 2 +- xfa/fxfa/app/xfa_ffimageedit.cpp | 2 +- xfa/fxfa/app/xfa_ffwidget.cpp | 2 +- xfa/fxfa/xfa_ffapp.h | 6 +++--- xfa/fxfa/xfa_ffwidget.h | 4 ++-- 7 files changed, 10 insertions(+), 11 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index 285194f608..b6b90ab07c 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -75,8 +75,7 @@ void CXFA_FileRead::Release() { CXFA_FFApp::CXFA_FFApp(IXFA_AppProvider* pProvider) : m_pProvider(pProvider), m_pWidgetMgrDelegate(nullptr), - m_pFWLApp(new IFWL_App(this)) { -} + m_pFWLApp(new CFWL_App(this)) {} CXFA_FFApp::~CXFA_FFApp() {} diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index bfa8097248..355ab0f0cc 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -7,9 +7,9 @@ #include "xfa/fxfa/app/xfa_ffbarcode.h" #include "core/fxcrt/fx_ext.h" +#include "xfa/fwl/core/cfwl_app.h" #include "xfa/fwl/core/cfwl_barcode.h" #include "xfa/fwl/core/cfwl_notedriver.h" -#include "xfa/fwl/core/ifwl_app.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fftextedit.h" #include "xfa/fxfa/app/xfa_fwladapter.h" diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index da433aeeed..eec4947425 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -6,11 +6,11 @@ #include "xfa/fxfa/app/xfa_ffchoicelist.h" +#include "xfa/fwl/core/cfwl_app.h" #include "xfa/fwl/core/cfwl_combobox.h" #include "xfa/fwl/core/cfwl_evtselectchanged.h" #include "xfa/fwl/core/cfwl_listbox.h" #include "xfa/fwl/core/cfwl_notedriver.h" -#include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_combobox.h" #include "xfa/fwl/core/ifwl_edit.h" #include "xfa/fwl/core/ifwl_listbox.h" diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp index b88ccb624c..89188b2847 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.cpp +++ b/xfa/fxfa/app/xfa_ffimageedit.cpp @@ -6,10 +6,10 @@ #include "xfa/fxfa/app/xfa_ffimageedit.h" +#include "xfa/fwl/core/cfwl_app.h" #include "xfa/fwl/core/cfwl_msgmouse.h" #include "xfa/fwl/core/cfwl_notedriver.h" #include "xfa/fwl/core/cfwl_picturebox.h" -#include "xfa/fwl/core/ifwl_app.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/xfa_ffdoc.h" #include "xfa/fxfa/xfa_ffdocview.h" diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index afc2a05f6e..e6c0c595b2 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -46,7 +46,7 @@ void CXFA_FFWidget::SetPageView(CXFA_FFPageView* pPageView) { m_pPageView = pPageView; } -const IFWL_App* CXFA_FFWidget::GetFWLApp() { +const CFWL_App* CXFA_FFWidget::GetFWLApp() { return GetPageView()->GetDocView()->GetDoc()->GetApp()->GetFWLApp(); } diff --git a/xfa/fxfa/xfa_ffapp.h b/xfa/fxfa/xfa_ffapp.h index 554b7b9328..4b40ba76c8 100644 --- a/xfa/fxfa/xfa_ffapp.h +++ b/xfa/fxfa/xfa_ffapp.h @@ -13,7 +13,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "xfa/fgas/font/cfgas_fontmgr.h" -#include "xfa/fwl/core/ifwl_app.h" +#include "xfa/fwl/core/cfwl_app.h" #include "xfa/fxfa/fxfa.h" class CXFA_DefFontMgr; @@ -56,7 +56,7 @@ class CXFA_FFApp { CXFA_FWLTheme* GetFWLTheme(); IXFA_AppProvider* GetAppProvider() const { return m_pProvider; } - const IFWL_App* GetFWLApp() const { return m_pFWLApp.get(); } + const CFWL_App* GetFWLApp() const { return m_pFWLApp.get(); } IFWL_AdapterTimerMgr* GetTimerMgr() const; CXFA_FontMgr* GetXFAFontMgr() const; IFWL_WidgetMgrDelegate* GetWidgetMgrDelegate() const { @@ -91,7 +91,7 @@ class CXFA_FFApp { // |m_pFWLApp| has to be released first, then |m_pFWLTheme| since the former // may refers to theme manager and the latter refers to font manager. std::unique_ptr m_pFWLTheme; - std::unique_ptr m_pFWLApp; + std::unique_ptr m_pFWLApp; }; #endif // XFA_FXFA_XFA_FFAPP_H_ diff --git a/xfa/fxfa/xfa_ffwidget.h b/xfa/fxfa/xfa_ffwidget.h index 3c2af1647c..9e02680a23 100644 --- a/xfa/fxfa/xfa_ffwidget.h +++ b/xfa/fxfa/xfa_ffwidget.h @@ -11,7 +11,7 @@ #include "core/fxcodec/fx_codec_def.h" #include "core/fxge/cfx_graphstatedata.h" -#include "xfa/fwl/core/ifwl_app.h" +#include "xfa/fwl/core/cfwl_app.h" #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h" @@ -124,7 +124,7 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { bool IsLayoutRectEmpty(); CXFA_FFWidget* GetParent(); bool IsAncestorOf(CXFA_FFWidget* pWidget); - const IFWL_App* GetFWLApp(); + const CFWL_App* GetFWLApp(); protected: virtual bool PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy); -- cgit v1.2.3