diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-29 17:41:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-29 17:41:42 -0700 |
| commit | 202ad7238489934ba0c64760de5f95782b36a213 (patch) | |
| tree | 629937d0f0777fd4198e361bc6526bec44f5eb81 /xfa/fwl/core | |
| parent | 435546810a7c48f09889c00600ad344850b71f95 (diff) | |
| download | pdfium-202ad7238489934ba0c64760de5f95782b36a213.tar.xz | |
Move xfa/{fwl,fxbarcode,fxgraphics}/include up to parent
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2383583002
Diffstat (limited to 'xfa/fwl/core')
| -rw-r--r-- | xfa/fwl/core/cfwl_widgetmgr.h | 2 | ||||
| -rw-r--r-- | xfa/fwl/core/fwl_noteimp.h | 2 | ||||
| -rw-r--r-- | xfa/fwl/core/fwl_timerimp.cpp | 2 | ||||
| -rw-r--r-- | xfa/fwl/core/fwl_widgethit.h (renamed from xfa/fwl/core/include/fwl_widgethit.h) | 6 | ||||
| -rw-r--r-- | xfa/fwl/core/fwl_widgetimp.h | 2 | ||||
| -rw-r--r-- | xfa/fwl/core/ifwl_adaptertimermgr.h (renamed from xfa/fwl/core/include/ifwl_adaptertimermgr.h) | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fwl/core/cfwl_widgetmgr.h b/xfa/fwl/core/cfwl_widgetmgr.h index c528889f77..e0188bd600 100644 --- a/xfa/fwl/core/cfwl_widgetmgr.h +++ b/xfa/fwl/core/cfwl_widgetmgr.h @@ -12,7 +12,7 @@ #include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/fwl_error.h" -#include "xfa/fxgraphics/include/cfx_graphics.h" +#include "xfa/fxgraphics/cfx_graphics.h" #define FWL_WGTMGR_DisableThread 0x00000001 #define FWL_WGTMGR_DisableForm 0x00000002 diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h index f923c395d5..9a0723de7b 100644 --- a/xfa/fwl/core/fwl_noteimp.h +++ b/xfa/fwl/core/fwl_noteimp.h @@ -14,7 +14,7 @@ #include "xfa/fwl/core/cfwl_message.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/ifwl_widget.h" -#include "xfa/fxgraphics/include/cfx_graphics.h" +#include "xfa/fxgraphics/cfx_graphics.h" enum FWL_KeyFlag { FWL_KEYFLAG_Ctrl = 1 << 0, diff --git a/xfa/fwl/core/fwl_timerimp.cpp b/xfa/fwl/core/fwl_timerimp.cpp index 22b28c8c67..0fcbc24b01 100644 --- a/xfa/fwl/core/fwl_timerimp.cpp +++ b/xfa/fwl/core/fwl_timerimp.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/fwl/core/fwl_appimp.h" +#include "xfa/fwl/core/ifwl_adaptertimermgr.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_timer.h" -#include "xfa/fwl/core/include/ifwl_adaptertimermgr.h" #include "xfa/fxfa/include/xfa_ffapp.h" IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) { diff --git a/xfa/fwl/core/include/fwl_widgethit.h b/xfa/fwl/core/fwl_widgethit.h index 102024a510..3adecfe49e 100644 --- a/xfa/fwl/core/include/fwl_widgethit.h +++ b/xfa/fwl/core/fwl_widgethit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FWL_CORE_INCLUDE_FWL_WIDGETHIT_H_ -#define XFA_FWL_CORE_INCLUDE_FWL_WIDGETHIT_H_ +#ifndef XFA_FWL_CORE_FWL_WIDGETHIT_H_ +#define XFA_FWL_CORE_FWL_WIDGETHIT_H_ enum class FWL_WidgetHit { Unknown = 0, @@ -32,4 +32,4 @@ enum class FWL_WidgetHit { DownButton }; -#endif // XFA_FWL_CORE_INCLUDE_FWL_WIDGETHIT_H_ +#endif // XFA_FWL_CORE_FWL_WIDGETHIT_H_ diff --git a/xfa/fwl/core/fwl_widgetimp.h b/xfa/fwl/core/fwl_widgetimp.h index 0c8f643a0f..57970a87eb 100644 --- a/xfa/fwl/core/fwl_widgetimp.h +++ b/xfa/fwl/core/fwl_widgetimp.h @@ -13,8 +13,8 @@ #include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_themepart.h" +#include "xfa/fwl/core/fwl_widgethit.h" #include "xfa/fwl/core/ifwl_widgetdelegate.h" -#include "xfa/fwl/core/include/fwl_widgethit.h" #include "xfa/fwl/theme/cfwl_widgettp.h" class CFWL_AppImp; diff --git a/xfa/fwl/core/include/ifwl_adaptertimermgr.h b/xfa/fwl/core/ifwl_adaptertimermgr.h index 111c3ebf84..ef5ebba59b 100644 --- a/xfa/fwl/core/include/ifwl_adaptertimermgr.h +++ b/xfa/fwl/core/ifwl_adaptertimermgr.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FWL_CORE_INCLUDE_IFWL_ADAPTERTIMERMGR_H_ -#define XFA_FWL_CORE_INCLUDE_IFWL_ADAPTERTIMERMGR_H_ +#ifndef XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_ +#define XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_ #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/ifwl_timer.h" @@ -20,4 +20,4 @@ class IFWL_AdapterTimerMgr { virtual FWL_Error Stop(IFWL_TimerInfo* pTimerInfo) = 0; }; -#endif // XFA_FWL_CORE_INCLUDE_IFWL_ADAPTERTIMERMGR_H_ +#endif // XFA_FWL_CORE_IFWL_ADAPTERTIMERMGR_H_ |