From 1770c021cf998ff1b33855b1397f6ea8ff9f7cd7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 14 Mar 2016 14:14:16 -0400 Subject: Move xfa/src up to xfa/. This CL moves the xfa/src files up to the xfa/ directory and fixes the includes, include guards, and build files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1803723002 . --- xfa/include/fwl/basewidget/fwl_picturebox.h | 2 +- xfa/include/fwl/basewidget/fwl_pushbutton.h | 2 +- xfa/include/fwl/basewidget/fwl_scrollbar.h | 2 +- xfa/include/fwl/basewidget/fwl_spinbutton.h | 2 +- xfa/include/fwl/core/fwl_content.h | 2 +- xfa/include/fwl/core/fwl_panel.h | 2 +- xfa/include/fxfa/fxfa_objectacc.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'xfa/include') diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index be999493b2..123607a804 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ -#include "xfa/src/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/fwl_widgetimp.h" #define FWL_CLASS_PictureBox L"FWL_PICTUREBOX" #define FWL_CLASSHASH_PictureBox 2974721741 diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h index ffc05c2305..28f9df4fa6 100644 --- a/xfa/include/fwl/basewidget/fwl_pushbutton.h +++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ +#include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/fwl/core/fwl_widgetimp.h" #define FWL_CLASS_PushButton L"FWL_PUSHBUTTON" #define FWL_CLASSHASH_PushButton 3521614244 diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h index 461e67576c..8cd69bcf1f 100644 --- a/xfa/include/fwl/basewidget/fwl_scrollbar.h +++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ -#include "xfa/src/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/fwl_widgetimp.h" #define FWL_CLASS_ScrollBar L"FWL_SCROLLBAR" #define FWL_CLASSHASH_ScrollBar 2826584844 diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h index 17f48954b8..fdd27c64a6 100644 --- a/xfa/include/fwl/basewidget/fwl_spinbutton.h +++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_ -#include "xfa/src/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/fwl_widgetimp.h" #define FWL_CLASS_SpinButton L"FWL_SPINBUTTON" #define FWL_CLASSHASH_SpinButton 3793043646 diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index 5801bd3374..10d6c1e1ac 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_ #define XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_ -#include "xfa/src/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/fwl_widgetimp.h" class IFWL_Content : public IFWL_Widget { public: diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h index 462112c6be..4e0b7a38a0 100644 --- a/xfa/include/fwl/core/fwl_panel.h +++ b/xfa/include/fwl/core/fwl_panel.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_ #define XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_ -#include "xfa/src/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/fwl_widgetimp.h" class IFWL_Content; diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index 7938b2ef2d..6f111b06f8 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -8,7 +8,7 @@ #define XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_ #include "core/include/fxge/fx_dib.h" -#include "xfa/src/fxfa/parser/xfa_object.h" +#include "xfa/fxfa/parser/xfa_object.h" class CXFA_Node; class IFX_Locale; -- cgit v1.2.3