From a8a28e0702a1874d29d3c9f2b155bce1557eb4fd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:41:39 -0400 Subject: Move core/include/fxcrt to core/fxcrt/include. This CL moves the fxcrt code into the core/fxcrt directory. The only exception was fx_bidi.h which was moved into core/fxcrt as it is not used outside of core/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1825953002 . --- xfa/include/fwl/adapter/fwl_adapterthreadmgr.h | 2 +- xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 4 ++-- xfa/include/fwl/basewidget/fxmath_barcode.h | 4 ++-- xfa/include/fwl/core/fwl_app.h | 2 +- xfa/include/fwl/core/fwl_note.h | 2 +- xfa/include/fwl/core/fwl_target.h | 2 +- xfa/include/fwl/core/fwl_theme.h | 4 ++-- xfa/include/fwl/core/fwl_timer.h | 2 +- xfa/include/fwl/theme/utils.h | 2 +- xfa/include/fwl/theme/widgettp.h | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) (limited to 'xfa/include') diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h index 7446853299..dbd1d72ea2 100644 --- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_ #define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/core/fwl_thread.h" diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index 327c92e7e1..f5d3c05000 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_ #define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_ -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" #include "xfa/include/fwl/core/fwl_error.h" class IFWL_Widget; diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h index 58ce11727c..51fd242a7d 100644 --- a/xfa/include/fwl/basewidget/fxmath_barcode.h +++ b/xfa/include/fwl/basewidget/fxmath_barcode.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_ -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" #include "core/include/fxge/fx_dib.h" #include "xfa/fxbarcode/include/BC_Library.h" diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h index ca771432db..7904ee89f5 100644 --- a/xfa/include/fwl/core/fwl_app.h +++ b/xfa/include/fwl/core/fwl_app.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_APP_H_ #define XFA_INCLUDE_FWL_CORE_FWL_APP_H_ -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" #include "xfa/include/fwl/core/fwl_thread.h" class IFWL_AdapterNative; diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h index e41cf1dcef..170e4795ff 100644 --- a/xfa/include/fwl/core/fwl_note.h +++ b/xfa/include/fwl/core/fwl_note.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_ #define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_ -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_coordinates.h" #include "xfa/fxgraphics/include/cfx_graphics.h" #include "xfa/include/fwl/core/fwl_error.h" diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h index 6572f8be33..9f010e91e4 100644 --- a/xfa/include/fwl/core/fwl_target.h +++ b/xfa/include/fwl/core/fwl_target.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_ #define XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/include/fwl/core/fwl_error.h" // FWL contains three parallel inheritance hierarchies, which reference each diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index 69783c740a..7dd443e506 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_ #define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_ -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" #include "xfa/include/fwl/core/fwl_error.h" class IFWL_Widget; diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h index b9b4735f22..4e8feb0cfc 100644 --- a/xfa/include/fwl/core/fwl_timer.h +++ b/xfa/include/fwl/core/fwl_timer.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_ #define XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" typedef struct FWL_HTIMER_ { void* pData; } * FWL_HTIMER; diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h index dd6549666d..73e865076d 100644 --- a/xfa/include/fwl/theme/utils.h +++ b/xfa/include/fwl/theme/utils.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_THEME_UTILS_H_ #define XFA_INCLUDE_FWL_THEME_UTILS_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #define THEME_XPSimilar enum FWLTHEME_EDGE { diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 1585db9ce2..84cf82a868 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -10,8 +10,8 @@ #include #include -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" #include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_widget.h" -- cgit v1.2.3