From a688a049e516a050bc3dc473910096f255552386 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 9 Nov 2015 13:57:49 -0800 Subject: Merge to XFA: Fix all relative includes to core. Do some IWYU to fix build errors due to files that have no #includes but just happened to work previously because the #includes were in the right order. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1407423004 . (cherry picked from commit 9e7cd8ffb81c564e1102f6c6459ec0942a0b11ea) Review URL: https://codereview.chromium.org/1425163004 . --- fpdfsdk/include/formfiller/FFL_ComboBox.h | 2 +- fpdfsdk/include/formfiller/FormFiller.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/include/formfiller') diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h index f1c8b2d99b..ce244d80bb 100644 --- a/fpdfsdk/include/formfiller/FFL_ComboBox.h +++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_ -#include "../../../core/include/fxcrt/fx_string.h" #include "FFL_FormFiller.h" +#include "core/include/fxcrt/fx_string.h" class CBA_FontMap; class CPDFSDK_Document; diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h index 90351f5527..acbf52eddf 100644 --- a/fpdfsdk/include/formfiller/FormFiller.h +++ b/fpdfsdk/include/formfiller/FormFiller.h @@ -7,11 +7,11 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_ -#include "../../../core/include/fpdfapi/fpdf_module.h" -#include "../../../core/include/fpdfdoc/fpdf_doc.h" -#include "../../../core/include/fpdfdoc/fpdf_vt.h" #include "../fsdk_mgr.h" #include "../fxedit/fx_edit.h" #include "../pdfwindow/IPDFWindow.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfdoc/fpdf_doc.h" +#include "core/include/fpdfdoc/fpdf_vt.h" #endif // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_ -- cgit v1.2.3