From bde53d25de8cba5657aa7f63a301288663fa58e5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 12 Nov 2015 22:21:30 -0800 Subject: Merge to XFA: Remove relative includes. That refer to parent directories. TBR=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1434223002 . (cherry picked from commit 22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228) Review URL: https://codereview.chromium.org/1439223003 . --- fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | 4 ++-- fpdfsdk/src/formfiller/FFL_CheckBox.cpp | 6 +++--- fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 10 +++++----- fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 4 ++-- fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 16 ++++++++-------- fpdfsdk/src/formfiller/FFL_ListBox.cpp | 12 +++++------- fpdfsdk/src/formfiller/FFL_PushButton.cpp | 6 +++--- fpdfsdk/src/formfiller/FFL_RadioButton.cpp | 7 +++---- fpdfsdk/src/formfiller/FFL_TextField.cpp | 4 ++-- 9 files changed, 33 insertions(+), 36 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index 147a0588cc..97b061f56a 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler) diff --git a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp b/fpdfsdk/src/formfiller/FFL_CheckBox.cpp index 42c6251d68..b0fc906f98 100644 --- a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_CheckBox.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_CheckBox.h" +#include "fpdfsdk/include/formfiller/FFL_CheckBox.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_CheckBox ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index b4619cb32d..d4a93aaf3c 100644 --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_IFormFiller.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" -#include "../../include/formfiller/FFL_ComboBox.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_ComboBox.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_ComboBox ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index add110378a..048ebafa12 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" #define GetRed(rgb) ((uint8_t)(rgb)) #define GetGreen(rgb) ((uint8_t)(((FX_WORD)(rgb)) >> 8)) diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index df3d04869c..a12d84e88a 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_IFormFiller.h" -#include "../../include/formfiller/FFL_CheckBox.h" -#include "../../include/formfiller/FFL_ComboBox.h" -#include "../../include/formfiller/FFL_ListBox.h" -#include "../../include/formfiller/FFL_PushButton.h" -#include "../../include/formfiller/FFL_RadioButton.h" -#include "../../include/formfiller/FFL_TextField.h" +#include "fpdfsdk/include/formfiller/FFL_CheckBox.h" +#include "fpdfsdk/include/formfiller/FFL_ComboBox.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_ListBox.h" +#include "fpdfsdk/include/formfiller/FFL_PushButton.h" +#include "fpdfsdk/include/formfiller/FFL_RadioButton.h" +#include "fpdfsdk/include/formfiller/FFL_TextField.h" #define FFL_MAXLISTBOXHEIGHT 140.0f diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp index 343683016f..53a7570716 100644 --- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp @@ -4,13 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_ListBox.h" -//#include "../../include/formfiller/FFL_Module.h" -#include "../../include/formfiller/FFL_IFormFiller.h" -//#include "../../include/formfiller/FFL_Undo.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_ListBox.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f diff --git a/fpdfsdk/src/formfiller/FFL_PushButton.cpp b/fpdfsdk/src/formfiller/FFL_PushButton.cpp index 533d786177..66ae68b211 100644 --- a/fpdfsdk/src/formfiller/FFL_PushButton.cpp +++ b/fpdfsdk/src/formfiller/FFL_PushButton.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_PushButton.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_PushButton.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_PushButton * ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp b/fpdfsdk/src/formfiller/FFL_RadioButton.cpp index 7c4f9a9e49..572cfeb29a 100644 --- a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp +++ b/fpdfsdk/src/formfiller/FFL_RadioButton.cpp @@ -4,10 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_RadioButton.h" -//#include "../include/FFL_Undo.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_RadioButton.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_RadioButton * ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index 6a786901ca..253671d554 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FFL_TextField.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_TextField.h" /* ------------------------------- CFFL_TextField * ------------------------------- */ -- cgit v1.2.3