XFA: Remove many relative includes in xfa/

Also remove useless files.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1570743002 .

6 files changed, 86 insertions, 84 deletions

diff --git a/xfa/include/foxitxfa.h b/xfa/include/foxitxfa.h
index 3df47326b7..c5730b7069 100644
--- a/xfa/include/foxitxfa.h
+++ b/xfa/include/foxitxfa.h
@@ -8,14 +8,14 @@
 

 #ifndef _FOXIT_XFA_H_

 #define _FOXIT_XFA_H_

-#include "../../core/include/fxcrt/fx_ext.h"

-#include "../../core/include/fxge/fx_ge.h"

-#include "../../core/include/fxcodec/fx_codec.h"

-#include "../../core/include/fdrm/fx_crypt.h"

-#include "../../core/include/fpdfdoc/fpdf_doc.h"

-#include "./fxbarcode/BC_BarCode.h"

-#include "./fxgraphics/fx_graphics.h"

-#include "./fwl/fwl.h"

-#include "./fxjse/fxjse.h"

-#include "./fxfa/fxfa.h"

+#include "core/include/fxcrt/fx_ext.h"

+#include "core/include/fxge/fx_ge.h"

+#include "core/include/fxcodec/fx_codec.h"

+#include "core/include/fdrm/fx_crypt.h"

+#include "core/include/fpdfdoc/fpdf_doc.h"

+#include "xfa/include/fxbarcode/BC_BarCode.h"

+#include "xfa/include/fxgraphics/fx_graphics.h"

+#include "xfa/include/fwl/fwl.h"

+#include "xfa/include/fxjse/fxjse.h"

+#include "xfa/include/fxfa/fxfa.h"

 #endif

diff --git a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h
index 3c862aabf8..aed9241397 100644
--- a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h
+++ b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h
@@ -7,8 +7,8 @@
 #ifndef _FWL_ADAPTER_TIMERMGR_H

 #define _FWL_ADAPTER_TIMERMGR_H

 

-#include "../core/fwl_error.h"

-#include "../core/fwl_timer.h"

+#include "xfa/include/fwl/core/fwl_error.h"

+#include "xfa/include/fwl/core/fwl_timer.h"

 

 class IFWL_Timer;

 

diff --git a/xfa/include/fwl/fwl.h b/xfa/include/fwl/fwl.h
index a8363a192b..8b99cc116f 100644
--- a/xfa/include/fwl/fwl.h
+++ b/xfa/include/fwl/fwl.h
@@ -4,73 +4,75 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

+// TODO(thestig): Remove this file and do IWYU.

+

 #ifndef _FWL_H

 #define _FWL_H

-#include "core/fwl_error.h"

-#include "core/fwl_target.h"

-#include "core/fwl_thread.h"

-#include "core/fwl_note.h"

-#include "core/fwl_widgetdef.h"

-#include "core/fwl_theme.h"

-#include "core/fwl_widget.h"

-#include "core/fwl_content.h"

-#include "core/fwl_panel.h"

-#include "core/fwl_form.h"

-#include "core/fwl_widgetmgr.h"

-#include "core/fwl_timer.h"

-#include "core/fwl_app.h"

-#include "core/fwl_grid.h"

-#include "basewidget/fwl_pushbutton.h"

-#include "basewidget/fwl_checkbox.h"

-#include "basewidget/fwl_scrollbar.h"

-#include "basewidget/fwl_listbox.h"

-#include "basewidget/fwl_edit.h"

-#include "basewidget/fwl_picturebox.h"

-#include "basewidget/fwl_combobox.h"

-#include "basewidget/fwl_menu.h"

-#include "basewidget/fwl_monthcalendar.h"

-#include "basewidget/fwl_datetimepicker.h"

-#include "basewidget/fwl_spinbutton.h"

-#include "basewidget/fwl_barcode.h"

-#include "basewidget/fxmath_barcode.h"

-#include "basewidget/fwl_tooltipctrl.h"

-#include "basewidget/fwl_caret.h"

-#include "lightwidget/app.h"

-#include "lightwidget/widget.h"

-#include "lightwidget/pushbutton.h"

-#include "lightwidget/checkbox.h"

-#include "lightwidget/scrollbar.h"

-#include "lightwidget/listbox.h"

-#include "lightwidget/picturebox.h"

-#include "lightwidget/edit.h"

-#include "lightwidget/combobox.h"

-#include "lightwidget/datetimepicker.h"

-#include "lightwidget/barcode.h"

-#include "lightwidget/theme.h"

-#include "lightwidget/tooltipctrl.h"

-#include "lightwidget/caret.h"

-#include "theme/utils.h"

-#include "theme/widgettp.h"

-#include "theme/barcodetp.h"

-#include "theme/checkboxtp.h"

-#include "theme/comboboxtp.h"

-#include "theme/datetimepickertp.h"

-#include "theme/edittp.h"

-#include "theme/formtp.h"

-#include "theme/listboxtp.h"

-#include "theme/monthcalendartp.h"

-#include "theme/pictureboxtp.h"

-#include "theme/pushbuttontp.h"

-#include "theme/scrollbartp.h"

-#include "theme/widgettp.h"

-#include "theme/barcodetp.h"

-#include "theme/carettp.h"

-#include "adapter/fwl_adapternative.h"

-#include "adapter/fwl_adapterthreadmgr.h"

-#include "adapter/fwl_adaptertimermgr.h"

-#include "adapter/fwl_adapterwidgetmgr.h"

-#include "adapter/fwl_adaptercursormgr.h"

-#include "adapter/fwl_adaptermonitormgr.h"

-#include "adapter/fwl_adapterclipboardmgr.h"

-#include "adapter/fwl_sdadapterimp.h"

+#include "xfa/include/fwl/core/fwl_error.h"

+#include "xfa/include/fwl/core/fwl_target.h"

+#include "xfa/include/fwl/core/fwl_thread.h"

+#include "xfa/include/fwl/core/fwl_note.h"

+#include "xfa/include/fwl/core/fwl_widgetdef.h"

+#include "xfa/include/fwl/core/fwl_theme.h"

+#include "xfa/include/fwl/core/fwl_widget.h"

+#include "xfa/include/fwl/core/fwl_content.h"

+#include "xfa/include/fwl/core/fwl_panel.h"

+#include "xfa/include/fwl/core/fwl_form.h"

+#include "xfa/include/fwl/core/fwl_widgetmgr.h"

+#include "xfa/include/fwl/core/fwl_timer.h"

+#include "xfa/include/fwl/core/fwl_app.h"

+#include "xfa/include/fwl/core/fwl_grid.h"

+#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"

+#include "xfa/include/fwl/basewidget/fwl_checkbox.h"

+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"

+#include "xfa/include/fwl/basewidget/fwl_listbox.h"

+#include "xfa/include/fwl/basewidget/fwl_edit.h"

+#include "xfa/include/fwl/basewidget/fwl_picturebox.h"

+#include "xfa/include/fwl/basewidget/fwl_combobox.h"

+#include "xfa/include/fwl/basewidget/fwl_menu.h"

+#include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"

+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"

+#include "xfa/include/fwl/basewidget/fwl_spinbutton.h"

+#include "xfa/include/fwl/basewidget/fwl_barcode.h"

+#include "xfa/include/fwl/basewidget/fxmath_barcode.h"

+#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"

+#include "xfa/include/fwl/basewidget/fwl_caret.h"

+#include "xfa/include/fwl/lightwidget/app.h"

+#include "xfa/include/fwl/lightwidget/widget.h"

+#include "xfa/include/fwl/lightwidget/pushbutton.h"

+#include "xfa/include/fwl/lightwidget/checkbox.h"

+#include "xfa/include/fwl/lightwidget/scrollbar.h"

+#include "xfa/include/fwl/lightwidget/listbox.h"

+#include "xfa/include/fwl/lightwidget/picturebox.h"

+#include "xfa/include/fwl/lightwidget/edit.h"

+#include "xfa/include/fwl/lightwidget/combobox.h"

+#include "xfa/include/fwl/lightwidget/datetimepicker.h"

+#include "xfa/include/fwl/lightwidget/barcode.h"

+#include "xfa/include/fwl/lightwidget/theme.h"

+#include "xfa/include/fwl/lightwidget/tooltipctrl.h"

+#include "xfa/include/fwl/lightwidget/caret.h"

+#include "xfa/include/fwl/theme/utils.h"

+#include "xfa/include/fwl/theme/widgettp.h"

+#include "xfa/include/fwl/theme/barcodetp.h"

+#include "xfa/include/fwl/theme/checkboxtp.h"

+#include "xfa/include/fwl/theme/comboboxtp.h"

+#include "xfa/include/fwl/theme/datetimepickertp.h"

+#include "xfa/include/fwl/theme/edittp.h"

+#include "xfa/include/fwl/theme/formtp.h"

+#include "xfa/include/fwl/theme/listboxtp.h"

+#include "xfa/include/fwl/theme/monthcalendartp.h"

+#include "xfa/include/fwl/theme/pictureboxtp.h"

+#include "xfa/include/fwl/theme/pushbuttontp.h"

+#include "xfa/include/fwl/theme/scrollbartp.h"

+#include "xfa/include/fwl/theme/widgettp.h"

+#include "xfa/include/fwl/theme/barcodetp.h"

+#include "xfa/include/fwl/theme/carettp.h"

+#include "xfa/include/fwl/adapter/fwl_adapternative.h"

+#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"

+#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"

+#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"

+#include "xfa/include/fwl/adapter/fwl_adaptercursormgr.h"

+#include "xfa/include/fwl/adapter/fwl_adaptermonitormgr.h"

+#include "xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h"

+#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"

 #endif

diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h
index 7d90fe82ef..e71e417734 100644
--- a/xfa/include/fxfa/fxfa_basic.h
+++ b/xfa/include/fxfa/fxfa_basic.h
@@ -7,7 +7,7 @@
 #ifndef _FXFA_BASIC_H

 #define _FXFA_BASIC_H

 

-#include "../fxjse/fxjse.h"

+#include "xfa/include/fxjse/fxjse.h"

 

 class CXFA_Measurement;

 #define XFA_HASHCODE_Xfa 0xc56b9ff

diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index 3cef82b363..897cb08f99 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -7,7 +7,7 @@
 #ifndef FXFA_OBJECTACC_H_

 #define FXFA_OBJECTACC_H_

 

-#include "../../../core/include/fxge/fx_dib.h"  // For FX_ARGB.

+#include "core/include/fxge/fx_dib.h"  // For FX_ARGB.

 

 class CXFA_Node;

 class IFX_Locale;

diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h
index 572d697394..5aa563a1eb 100644
--- a/xfa/include/fxjse/fxjse.h
+++ b/xfa/include/fxjse/fxjse.h
@@ -7,9 +7,9 @@
 #ifndef XFA_INCLUDE_FXJSE_FXJSE_H_

 #define XFA_INCLUDE_FXJSE_FXJSE_H_

 

-#include "../../../core/include/fpdfapi/fpdf_parser.h"

-#include "../../../core/include/fxcrt/fx_string.h"

-#include "../../../core/include/fxcrt/fx_system.h"

+#include "core/include/fpdfapi/fpdf_parser.h"

+#include "core/include/fxcrt/fx_string.h"

+#include "core/include/fxcrt/fx_system.h"

 

 class CPDFDoc_Environment;

 class CPDF_Page;