summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-12 21:17:40 -0800
committerLei Zhang <thestig@chromium.org>2015-11-12 21:17:40 -0800
commit22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228 (patch)
tree2efddfef7327e6ab3af34305ee451563abc62bf7 /fpdfsdk
parent4274ea205ca2219f6a4cfc54025284c1aa3b14b8 (diff)
downloadpdfium-22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228.tar.xz
Remove relative includes.
That refer to parent directories. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1434223002 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h2
-rw-r--r--fpdfsdk/include/formfiller/FormFiller.h6
-rw-r--r--fpdfsdk/include/fxedit/fxet_stub.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PDFWindow.h4
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_EditCtrl.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_FontMap.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ListBox.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Utils.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Wnd.h2
-rw-r--r--fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp4
-rw-r--r--fpdfsdk/src/formfiller/FFL_CheckBox.cpp6
-rw-r--r--fpdfsdk/src/formfiller/FFL_ComboBox.cpp10
-rw-r--r--fpdfsdk/src/formfiller/FFL_FormFiller.cpp4
-rw-r--r--fpdfsdk/src/formfiller/FFL_IFormFiller.cpp16
-rw-r--r--fpdfsdk/src/formfiller/FFL_ListBox.cpp12
-rw-r--r--fpdfsdk/src/formfiller/FFL_PushButton.cpp6
-rw-r--r--fpdfsdk/src/formfiller/FFL_RadioButton.cpp7
-rw-r--r--fpdfsdk/src/formfiller/FFL_TextField.cpp4
-rw-r--r--fpdfsdk/src/fpdf_dataavail.cpp2
-rw-r--r--fpdfsdk/src/fpdf_ext.cpp2
-rw-r--r--fpdfsdk/src/fpdf_flatten.cpp2
-rw-r--r--fpdfsdk/src/fpdf_progressive.cpp4
-rw-r--r--fpdfsdk/src/fpdf_sysfontinfo.cpp4
-rw-r--r--fpdfsdk/src/fpdf_transformpage.cpp2
-rw-r--r--fpdfsdk/src/fpdfdoc.cpp2
-rw-r--r--fpdfsdk/src/fpdfeditimg.cpp2
-rw-r--r--fpdfsdk/src/fpdfeditpage.cpp2
-rw-r--r--fpdfsdk/src/fpdfformfill.cpp4
-rw-r--r--fpdfsdk/src/fpdfppo.cpp2
-rw-r--r--fpdfsdk/src/fpdfsave.cpp2
-rw-r--r--fpdfsdk/src/fpdftext.cpp2
-rw-r--r--fpdfsdk/src/fpdfview.cpp8
-rw-r--r--fpdfsdk/src/fsdk_actionhandler.cpp8
-rw-r--r--fpdfsdk/src/fsdk_annothandler.cpp8
-rw-r--r--fpdfsdk/src/fsdk_baseannot.cpp6
-rw-r--r--fpdfsdk/src/fsdk_baseform.cpp15
-rw-r--r--fpdfsdk/src/fsdk_mgr.cpp8
-rw-r--r--fpdfsdk/src/fsdk_rendercontext.cpp2
-rw-r--r--fpdfsdk/src/fxedit/fxet_ap.cpp6
-rw-r--r--fpdfsdk/src/fxedit/fxet_edit.cpp4
-rw-r--r--fpdfsdk/src/fxedit/fxet_list.cpp6
-rw-r--r--fpdfsdk/src/fxedit/fxet_module.cpp6
-rw-r--r--fpdfsdk/src/fxedit/fxet_pageobjs.cpp6
-rw-r--r--fpdfsdk/src/javascript/Consts.cpp2
-rw-r--r--fpdfsdk/src/javascript/Document.cpp4
-rw-r--r--fpdfsdk/src/javascript/Field.cpp4
-rw-r--r--fpdfsdk/src/javascript/Field.h2
-rw-r--r--fpdfsdk/src/javascript/Icon.cpp2
-rw-r--r--fpdfsdk/src/javascript/JS_Context.cpp2
-rw-r--r--fpdfsdk/src/javascript/JS_Context.h2
-rw-r--r--fpdfsdk/src/javascript/JS_Define.h4
-rw-r--r--fpdfsdk/src/javascript/JS_EventHandler.cpp2
-rw-r--r--fpdfsdk/src/javascript/JS_GlobalData.cpp2
-rw-r--r--fpdfsdk/src/javascript/JS_Object.cpp4
-rw-r--r--fpdfsdk/src/javascript/JS_Object.h4
-rw-r--r--fpdfsdk/src/javascript/JS_Runtime.cpp4
-rw-r--r--fpdfsdk/src/javascript/JS_Runtime.h4
-rw-r--r--fpdfsdk/src/javascript/JS_Runtime_Stub.cpp4
-rw-r--r--fpdfsdk/src/javascript/JS_Value.h2
-rw-r--r--fpdfsdk/src/javascript/PublicMethods.cpp4
-rw-r--r--fpdfsdk/src/javascript/app.cpp4
-rw-r--r--fpdfsdk/src/javascript/color.cpp8
-rw-r--r--fpdfsdk/src/javascript/color.h2
-rw-r--r--fpdfsdk/src/javascript/console.cpp6
-rw-r--r--fpdfsdk/src/javascript/event.cpp8
-rw-r--r--fpdfsdk/src/javascript/global.cpp2
-rw-r--r--fpdfsdk/src/javascript/report.cpp2
-rw-r--r--fpdfsdk/src/javascript/resource.h2
-rw-r--r--fpdfsdk/src/javascript/util.cpp2
-rw-r--r--fpdfsdk/src/jsapi/fxjs_v8.cpp2
-rw-r--r--fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp4
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Button.cpp8
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Caret.cpp8
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp14
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Edit.cpp16
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp14
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_FontMap.cpp6
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Icon.cpp8
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_IconList.cpp14
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Label.cpp8
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ListBox.cpp14
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp6
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Note.cpp26
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp8
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Signature.cpp12
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp10
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Utils.cpp8
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Wnd.cpp8
88 files changed, 243 insertions, 247 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
index 3e1331839e..0215b868dd 100644
--- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
+++ b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
-#include "../pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
class CPDF_Dictionary;
class CPDFSDK_Annot;
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index acbf52eddf..1f517d56e9 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 "../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"
+#include "fpdfsdk/include/fsdk_mgr.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
+#include "fpdfsdk/include/pdfwindow/IPDFWindow.h"
#endif // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
diff --git a/fpdfsdk/include/fxedit/fxet_stub.h b/fpdfsdk/include/fxedit/fxet_stub.h
index b752bff7f2..a5a512bb1c 100644
--- a/fpdfsdk/include/fxedit/fxet_stub.h
+++ b/fpdfsdk/include/fxedit/fxet_stub.h
@@ -7,10 +7,10 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
#define FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
-#include "../fx_systemhandler.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfapi/fpdf_pageobj.h"
#include "core/include/fpdfapi/fpdf_render.h"
#include "core/include/fpdfdoc/fpdf_vt.h"
+#include "fpdfsdk/include/fx_systemhandler.h"
#endif // FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index fb2ccb5b98..fe9723b913 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -7,11 +7,11 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
-#include "../fx_systemhandler.h"
-#include "../fxedit/fx_edit.h"
#include "core/include/fpdfapi/fpdf_module.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
#include "core/include/fpdfdoc/fpdf_vt.h"
+#include "fpdfsdk/include/fx_systemhandler.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
#include "public/fpdf_fwlevent.h"
#endif // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index b4f019bf2d..284de9ed7f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
-#include "../fxedit/fx_edit.h"
#include "PWL_Wnd.h"
#include "core/include/fxcrt/fx_string.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
class CPWL_Caret;
class CPWL_Edit;
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index c7d4490280..c17483439c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
-#include "../fxedit/fx_edit.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
#include "public/fpdf_sysfontinfo.h"
class CPDF_Document;
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index 942a568836..9d5827cd26 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
-#include "../fxedit/fx_edit.h"
#include "PWL_Wnd.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
class CPDF_ListCtrl;
class CPWL_List_Notify;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index f8f1358577..9658341162 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -7,10 +7,10 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
-#include "../fxedit/fx_edit.h"
#include "PWL_Wnd.h"
#include "core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point.
#include "core/include/fpdfdoc/fpdf_vt.h" // For CPVT_WordRange.
+#include "fpdfsdk/include/fxedit/fx_edit.h"
class CFX_PathData;
struct CPWL_Color;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 7216bf508a..37ddefbbce 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
-#include "../fx_systemhandler.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
#include "core/include/fxcrt/fx_basic.h"
+#include "fpdfsdk/include/fx_systemhandler.h"
class CPWL_MsgControl;
class CPWL_ScrollBar;
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 3925e14347..ddaa519214 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 38a5c49c38..0dab3076f4 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 92a44eb65e..b820d7fa0d 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 b95ac9356f..f5cde16813 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
* ------------------------------- */
diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp
index 55ded0e4e0..63f9b4cec0 100644
--- a/fpdfsdk/src/fpdf_dataavail.cpp
+++ b/fpdfsdk/src/fpdf_dataavail.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_dataavail.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdf_formfill.h"
// These checks are here because core/ and public/ cannot depend on each other.
diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp
index 325a33e504..d9f8624249 100644
--- a/fpdfsdk/src/fpdf_ext.cpp
+++ b/fpdfsdk/src/fpdf_ext.cpp
@@ -6,8 +6,8 @@
#include "public/fpdf_ext.h"
-#include "../include/fsdk_define.h"
#include "core/include/fxcrt/fx_xml.h"
+#include "fpdfsdk/include/fsdk_define.h"
#define FPDFSDK_UNSUPPORT_CALL 100
diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp
index a816750912..3943e9d636 100644
--- a/fpdfsdk/src/fpdf_flatten.cpp
+++ b/fpdfsdk/src/fpdf_flatten.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_flatten.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
typedef CFX_ArrayTemplate<CPDF_Rect> CPDF_RectArray;
diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp
index 0586e9d089..fdb9e20555 100644
--- a/fpdfsdk/src/fpdf_progressive.cpp
+++ b/fpdfsdk/src/fpdf_progressive.cpp
@@ -6,8 +6,8 @@
#include "public/fpdf_progressive.h"
-#include "../include/fsdk_define.h"
-#include "../include/fsdk_rendercontext.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_rendercontext.h"
#include "public/fpdfview.h"
// These checks are here because core/ and public/ cannot depend on each other.
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp
index 9c388292a8..71fa94472c 100644
--- a/fpdfsdk/src/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp
@@ -6,8 +6,8 @@
#include "public/fpdf_sysfontinfo.h"
-#include "../include/fsdk_define.h"
-#include "../include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
class CFX_ExternalFontInfo final : public IFX_SystemFontInfo {
public:
diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp
index 134117dcd3..50a3a3266d 100644
--- a/fpdfsdk/src/fpdf_transformpage.cpp
+++ b/fpdfsdk/src/fpdf_transformpage.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_transformpage.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
namespace {
diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp
index 72231eb1cc..abe2a32ca4 100644
--- a/fpdfsdk/src/fpdfdoc.cpp
+++ b/fpdfsdk/src/fpdfdoc.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_doc.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
namespace {
diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp
index c4fa2d654e..de5c72f659 100644
--- a/fpdfsdk/src/fpdfeditimg.cpp
+++ b/fpdfsdk/src/fpdfeditimg.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_edit.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
DLLEXPORT FPDF_PAGEOBJECT STDCALL
FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) {
diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp
index 6ba8700802..f86c8df729 100644
--- a/fpdfsdk/src/fpdfeditpage.cpp
+++ b/fpdfsdk/src/fpdfeditpage.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_edit.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdf_formfill.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp
index 80c1cd01a2..06ea2ce755 100644
--- a/fpdfsdk/src/fpdfformfill.cpp
+++ b/fpdfsdk/src/fpdfformfill.cpp
@@ -6,8 +6,8 @@
#include "public/fpdf_formfill.h"
-#include "../include/fsdk_define.h"
-#include "../include/fsdk_mgr.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
#include "public/fpdfview.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp
index efa25ccd0e..fb3510c083 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/src/fpdfppo.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_ppo.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
#include "third_party/base/nonstd_unique_ptr.h"
class CPDF_PageOrganizer {
diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp
index fee4e7cab7..e4baa47ba4 100644
--- a/fpdfsdk/src/fpdfsave.cpp
+++ b/fpdfsdk/src/fpdfsave.cpp
@@ -6,7 +6,7 @@
#include "public/fpdf_save.h"
-#include "../include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdf_edit.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp
index 998efeb39d..fa215d21f1 100644
--- a/fpdfsdk/src/fpdftext.cpp
+++ b/fpdfsdk/src/fpdftext.cpp
@@ -6,9 +6,9 @@
#include "public/fpdf_text.h"
-#include "../include/fsdk_define.h"
#include "core/include/fpdfdoc/fpdf_doc.h"
#include "core/include/fpdftext/fpdf_text.h"
+#include "fpdfsdk/include/fsdk_define.h"
#ifdef _WIN32
#include <tchar.h>
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index d87785c3ce..795ef3fbd0 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -6,12 +6,12 @@
#include "public/fpdfview.h"
-#include "../include/fsdk_define.h"
-#include "../include/fsdk_mgr.h"
-#include "../include/fsdk_rendercontext.h"
-#include "../include/javascript/IJavaScript.h"
#include "core/include/fxcodec/fx_codec.h"
#include "core/include/fxcrt/fx_safe_types.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
+#include "fpdfsdk/include/fsdk_rendercontext.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "public/fpdf_ext.h"
#include "public/fpdf_progressive.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp
index 023dc5b2fa..736b4074f4 100644
--- a/fpdfsdk/src/fsdk_actionhandler.cpp
+++ b/fpdfsdk/src/fsdk_actionhandler.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../include/fsdk_define.h"
-#include "../include/fsdk_mgr.h"
-#include "../include/fsdk_actionhandler.h"
-#include "../include/javascript/IJavaScript.h"
+#include "fpdfsdk/include/fsdk_actionhandler.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
CPDFSDK_ActionHandler::CPDFSDK_ActionHandler()
: m_pFormActionHandler(new CPDFSDK_FormActionHandler) {
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index d3d6567ccd..9209a46f49 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -6,10 +6,10 @@
#include <algorithm>
-#include "../include/fsdk_define.h"
-#include "../include/fsdk_mgr.h"
-#include "../include/formfiller/FFL_FormFiller.h"
-#include "../include/fsdk_annothandler.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/include/fsdk_annothandler.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp) {
m_pApp = pApp;
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 52f34fae8e..f6ead75f9f 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../include/fsdk_define.h"
-#include "../include/fsdk_mgr.h"
-#include "../include/fsdk_baseannot.h"
+#include "fpdfsdk/include/fsdk_baseannot.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
int _gAfxGetTimeZoneInSeconds(FX_CHAR tzhour, uint8_t tzminute) {
return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60);
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index 87530c4456..7a66842c9b 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -4,16 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../include/formfiller/FFL_FormFiller.h"
-#include "../include/fsdk_actionhandler.h"
-#include "../include/fsdk_baseannot.h"
-#include "../include/fsdk_baseform.h"
-#include "../include/fsdk_define.h"
-#include "../include/fsdk_mgr.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/include/fsdk_actionhandler.h"
+#include "fpdfsdk/include/fsdk_baseannot.h"
+#include "fpdfsdk/include/fsdk_baseform.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "third_party/base/nonstd_unique_ptr.h"
-#include "../include/javascript/IJavaScript.h"
-
#define IsFloatZero(f) ((f) < 0.01 && (f) > -0.01)
#define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
#define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 0884cb4987..b8d69805a0 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -6,11 +6,11 @@
#include <algorithm>
-#include "../include/fsdk_mgr.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
-#include "../include/formfiller/FFL_FormFiller.h"
-#include "../include/fsdk_define.h"
-#include "../include/javascript/IJavaScript.h"
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "public/fpdf_ext.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/fpdfsdk/src/fsdk_rendercontext.cpp b/fpdfsdk/src/fsdk_rendercontext.cpp
index e282d01db7..3b671caea6 100644
--- a/fpdfsdk/src/fsdk_rendercontext.cpp
+++ b/fpdfsdk/src/fsdk_rendercontext.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../include/fsdk_rendercontext.h"
+#include "fpdfsdk/include/fsdk_rendercontext.h"
void CRenderContext::Clear() {
m_pDevice = NULL;
diff --git a/fpdfsdk/src/fxedit/fxet_ap.cpp b/fpdfsdk/src/fxedit/fxet_ap.cpp
index 4e92099417..bdce7c05db 100644
--- a/fpdfsdk/src/fxedit/fxet_ap.cpp
+++ b/fpdfsdk/src/fxedit/fxet_ap.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/fxedit/fxet_stub.h"
-#include "../../include/fxedit/fx_edit.h"
-#include "../../include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_stub.h"
CFX_ByteString GetPDFWordString(IFX_Edit_FontMap* pFontMap,
int32_t nFontIndex,
diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/src/fxedit/fxet_edit.cpp
index 218ed16165..cca0319eb5 100644
--- a/fpdfsdk/src/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/src/fxedit/fxet_edit.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/fxedit/fxet_stub.h"
-#include "../../include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_stub.h"
#define FX_EDIT_UNDO_MAXITEM 10000
diff --git a/fpdfsdk/src/fxedit/fxet_list.cpp b/fpdfsdk/src/fxedit/fxet_list.cpp
index ff4723e514..19d41ccf41 100644
--- a/fpdfsdk/src/fxedit/fxet_list.cpp
+++ b/fpdfsdk/src/fxedit/fxet_list.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/fxedit/fxet_stub.h"
-#include "../../include/fxedit/fxet_edit.h"
-#include "../../include/fxedit/fxet_list.h"
+#include "fpdfsdk/include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_list.h"
+#include "fpdfsdk/include/fxedit/fxet_stub.h"
/* ------------------------------- CFX_ListItem
* ---------------------------------- */
diff --git a/fpdfsdk/src/fxedit/fxet_module.cpp b/fpdfsdk/src/fxedit/fxet_module.cpp
index 5c0086ae21..12f2c86e03 100644
--- a/fpdfsdk/src/fxedit/fxet_module.cpp
+++ b/fpdfsdk/src/fxedit/fxet_module.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/fxedit/fxet_stub.h"
-#include "../../include/fxedit/fxet_edit.h"
-#include "../../include/fxedit/fxet_list.h"
+#include "fpdfsdk/include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_list.h"
+#include "fpdfsdk/include/fxedit/fxet_stub.h"
/* ---------------------- IFX_Edit ---------------------- */
diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
index 9c18943a81..88f97da7f8 100644
--- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
+++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/fxedit/fxet_stub.h"
-#include "../../include/fxedit/fx_edit.h"
-#include "../../include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_edit.h"
+#include "fpdfsdk/include/fxedit/fxet_stub.h"
#define FX_EDIT_UNDERLINEHALFWIDTH 0.5f
#define FX_EDIT_CROSSOUTHALFWIDTH 0.5f
diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp
index d71c71129d..7f6b8f8c6a 100644
--- a/fpdfsdk/src/javascript/Consts.cpp
+++ b/fpdfsdk/src/javascript/Consts.cpp
@@ -6,10 +6,10 @@
#include "Consts.h"
-#include "../../include/javascript/IJavaScript.h"
#include "JS_Define.h"
#include "JS_Object.h"
#include "JS_Value.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* ------------------------------ border ------------------------------ */
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index 190bb20b24..9e352a1ab6 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp
@@ -6,8 +6,6 @@
#include "Document.h"
-#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
-#include "../../include/javascript/IJavaScript.h"
#include "Field.h"
#include "Icon.h"
#include "JS_Context.h"
@@ -17,6 +15,8 @@
#include "JS_Runtime.h"
#include "JS_Value.h"
#include "app.h"
+#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "resource.h"
#include "third_party/base/numerics/safe_math.h"
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp
index 9ab084feba..39d67d00dc 100644
--- a/fpdfsdk/src/javascript/Field.cpp
+++ b/fpdfsdk/src/javascript/Field.cpp
@@ -6,8 +6,6 @@
#include "Field.h"
-#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
-#include "../../include/javascript/IJavaScript.h"
#include "Document.h"
#include "Icon.h"
#include "JS_Context.h"
@@ -18,6 +16,8 @@
#include "JS_Value.h"
#include "PublicMethods.h"
#include "color.h"
+#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* ---------------------- Field ---------------------- */
diff --git a/fpdfsdk/src/javascript/Field.h b/fpdfsdk/src/javascript/Field.h
index 4899ee2a96..cd817956d4 100644
--- a/fpdfsdk/src/javascript/Field.h
+++ b/fpdfsdk/src/javascript/Field.h
@@ -9,8 +9,8 @@
#include <string> // For std::wstring.
-#include "../../include/pdfwindow/PWL_Wnd.h" // For CPWL_Color.
#include "JS_Define.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color.
class CPDFSDK_Widget;
class Document;
diff --git a/fpdfsdk/src/javascript/Icon.cpp b/fpdfsdk/src/javascript/Icon.cpp
index 5dfa7a08d4..bce66c0d99 100644
--- a/fpdfsdk/src/javascript/Icon.cpp
+++ b/fpdfsdk/src/javascript/Icon.cpp
@@ -6,10 +6,10 @@
#include "Icon.h"
-#include "../../include/javascript/IJavaScript.h"
#include "JS_Define.h"
#include "JS_Object.h"
#include "JS_Value.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* ---------------------- Icon ---------------------- */
diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp
index cfca043333..8d54cddc41 100644
--- a/fpdfsdk/src/javascript/JS_Context.cpp
+++ b/fpdfsdk/src/javascript/JS_Context.cpp
@@ -6,9 +6,9 @@
#include "JS_Context.h"
-#include "../../include/javascript/IJavaScript.h"
#include "JS_EventHandler.h"
#include "JS_Runtime.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "resource.h"
/* -------------------------- CJS_Context -------------------------- */
diff --git a/fpdfsdk/src/javascript/JS_Context.h b/fpdfsdk/src/javascript/JS_Context.h
index e450ba5703..93ef1523a3 100644
--- a/fpdfsdk/src/javascript/JS_Context.h
+++ b/fpdfsdk/src/javascript/JS_Context.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_
#define FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_
-#include "../../include/javascript/IJavaScript.h"
#include "core/include/fxcrt/fx_string.h"
#include "core/include/fxcrt/fx_system.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
class CJS_EventHandler;
class CJS_Runtime;
diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h
index 605439136e..02b36f9322 100644
--- a/fpdfsdk/src/javascript/JS_Define.h
+++ b/fpdfsdk/src/javascript/JS_Define.h
@@ -7,10 +7,10 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_
#define FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_
-#include "../../include/jsapi/fxjs_v8.h"
-#include "resource.h"
#include "JS_Object.h"
#include "JS_Value.h"
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
+#include "resource.h"
struct JSConstSpec {
const wchar_t* pName;
diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp
index cb86fde24d..df7f9791c2 100644
--- a/fpdfsdk/src/javascript/JS_EventHandler.cpp
+++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp
@@ -6,7 +6,6 @@
#include "JS_EventHandler.h"
-#include "../../include/javascript/IJavaScript.h"
#include "Document.h"
#include "Field.h"
#include "JS_Context.h"
@@ -14,6 +13,7 @@
#include "JS_Object.h"
#include "JS_Runtime.h"
#include "JS_Value.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* ---------------------------- CJS_EventHandler ---------------------------- */
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp
index 36b81a20ac..d9a07a8507 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp
@@ -6,8 +6,8 @@
#include "JS_GlobalData.h"
-#include "../../include/javascript/IJavaScript.h"
#include "core/include/fdrm/fx_crypt.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#define JS_MAXGLOBALDATA (1024 * 4 - 8)
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp
index 1e649ae791..529b540237 100644
--- a/fpdfsdk/src/javascript/JS_Object.cpp
+++ b/fpdfsdk/src/javascript/JS_Object.cpp
@@ -6,10 +6,10 @@
#include "JS_Object.h"
-#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
-#include "../../include/javascript/IJavaScript.h"
#include "JS_Context.h"
#include "JS_Define.h"
+#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
namespace {
diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h
index 8872a4eca4..d72696caeb 100644
--- a/fpdfsdk/src/javascript/JS_Object.h
+++ b/fpdfsdk/src/javascript/JS_Object.h
@@ -9,9 +9,9 @@
#include <map>
-#include "../../include/fsdk_define.h" // For FX_UINT
-#include "../../include/jsapi/fxjs_v8.h"
#include "JS_Runtime.h"
+#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
#include "third_party/base/nonstd_unique_ptr.h"
class CJS_Context;
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 74d9a44a1c..f52e23a094 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -6,8 +6,6 @@
#include "JS_Runtime.h"
-#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
-#include "../../include/javascript/IJavaScript.h"
#include "Consts.h"
#include "Document.h"
#include "Field.h"
@@ -23,6 +21,8 @@
#include "color.h"
#include "console.h"
#include "event.h"
+#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "global.h"
#include "report.h"
#include "util.h"
diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/src/javascript/JS_Runtime.h
index 1bdd8e6fdd..fcac7a9021 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.h
+++ b/fpdfsdk/src/javascript/JS_Runtime.h
@@ -11,10 +11,10 @@
#include <utility>
#include <vector>
-#include "../../include/javascript/IJavaScript.h"
-#include "../../include/jsapi/fxjs_v8.h"
#include "JS_EventHandler.h"
#include "core/include/fxcrt/fx_basic.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
class CJS_Context;
diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
index 1232001609..f7b1124a6e 100644
--- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
-#include "../../include/javascript/IJavaScript.h"
+#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "third_party/base/nonstd_unique_ptr.h"
class CJS_ContextStub final : public IJS_Context {
diff --git a/fpdfsdk/src/javascript/JS_Value.h b/fpdfsdk/src/javascript/JS_Value.h
index 875ab18ca9..8517b76dac 100644
--- a/fpdfsdk/src/javascript/JS_Value.h
+++ b/fpdfsdk/src/javascript/JS_Value.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_
#define FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_
-#include "../../include/jsapi/fxjs_v8.h"
#include "core/include/fxcrt/fx_basic.h"
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
class CJS_Array;
class CJS_Date;
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 66b08d20a8..cd71e7074c 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -6,8 +6,6 @@
#include "PublicMethods.h"
-#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
-#include "../../include/javascript/IJavaScript.h"
#include "Field.h"
#include "JS_Context.h"
#include "JS_Define.h"
@@ -16,6 +14,8 @@
#include "JS_Runtime.h"
#include "JS_Value.h"
#include "color.h"
+#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "resource.h"
#include "util.h"
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp
index 072e31f7df..205673e6d5 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/src/javascript/app.cpp
@@ -6,8 +6,6 @@
#include "app.h"
-#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
-#include "../../include/javascript/IJavaScript.h"
#include "Document.h"
#include "JS_Context.h"
#include "JS_Define.h"
@@ -15,6 +13,8 @@
#include "JS_Object.h"
#include "JS_Runtime.h"
#include "JS_Value.h"
+#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "resource.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp
index d00ac70e80..b9c4804727 100644
--- a/fpdfsdk/src/javascript/color.cpp
+++ b/fpdfsdk/src/javascript/color.cpp
@@ -6,13 +6,13 @@
#include "color.h"
-#include "../../include/javascript/IJavaScript.h"
+#include "JS_Context.h"
#include "JS_Define.h"
-#include "JS_Object.h"
-#include "JS_Value.h"
#include "JS_EventHandler.h"
-#include "JS_Context.h"
+#include "JS_Object.h"
#include "JS_Runtime.h"
+#include "JS_Value.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* -------------------------- color -------------------------- */
diff --git a/fpdfsdk/src/javascript/color.h b/fpdfsdk/src/javascript/color.h
index 360f66709c..0cc3f3c289 100644
--- a/fpdfsdk/src/javascript/color.h
+++ b/fpdfsdk/src/javascript/color.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_COLOR_H_
#define FPDFSDK_SRC_JAVASCRIPT_COLOR_H_
-#include "../../include/pdfwindow/PWL_Wnd.h" // For CPWL_Color.
#include "JS_Define.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color.
class color : public CJS_EmbedObj {
public:
diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp
index f8dbd527d8..072e5b7f0d 100644
--- a/fpdfsdk/src/javascript/console.cpp
+++ b/fpdfsdk/src/javascript/console.cpp
@@ -6,12 +6,12 @@
#include "console.h"
-#include "../../include/javascript/IJavaScript.h"
+#include "JS_Context.h"
#include "JS_Define.h"
+#include "JS_EventHandler.h"
#include "JS_Object.h"
#include "JS_Value.h"
-#include "JS_EventHandler.h"
-#include "JS_Context.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* ------------------------ console ------------------------ */
diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp
index a6bd5dca1f..5ad1ca513f 100644
--- a/fpdfsdk/src/javascript/event.cpp
+++ b/fpdfsdk/src/javascript/event.cpp
@@ -6,13 +6,13 @@
#include "event.h"
-#include "../../include/javascript/IJavaScript.h"
+#include "Field.h"
+#include "JS_Context.h"
#include "JS_Define.h"
+#include "JS_EventHandler.h"
#include "JS_Object.h"
#include "JS_Value.h"
-#include "JS_EventHandler.h"
-#include "JS_Context.h"
-#include "Field.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* -------------------------- event -------------------------- */
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index f7c71e88b1..2d9799dd4e 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -6,7 +6,6 @@
#include "global.h"
-#include "../../include/javascript/IJavaScript.h"
#include "JS_Context.h"
#include "JS_Define.h"
#include "JS_EventHandler.h"
@@ -14,6 +13,7 @@
#include "JS_Object.h"
#include "JS_Value.h"
#include "core/include/fxcrt/fx_ext.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "resource.h"
/* ---------------------------- global ---------------------------- */
diff --git a/fpdfsdk/src/javascript/report.cpp b/fpdfsdk/src/javascript/report.cpp
index 40fb682fbe..2ec07fb1e4 100644
--- a/fpdfsdk/src/javascript/report.cpp
+++ b/fpdfsdk/src/javascript/report.cpp
@@ -6,10 +6,10 @@
#include "report.h"
-#include "../../include/javascript/IJavaScript.h"
#include "JS_Define.h"
#include "JS_Object.h"
#include "JS_Value.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
/* ---------------------- report ---------------------- */
diff --git a/fpdfsdk/src/javascript/resource.h b/fpdfsdk/src/javascript/resource.h
index 8e07d47768..be3ae13d90 100644
--- a/fpdfsdk/src/javascript/resource.h
+++ b/fpdfsdk/src/javascript/resource.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_
#define FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_
-#include "../../include/fsdk_define.h" // For FX_UINT.
#include "core/include/fxcrt/fx_string.h" // For CFX_WideString.
+#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT.
class CJS_Context;
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp
index 2c28cc55e3..c021ec9e95 100644
--- a/fpdfsdk/src/javascript/util.cpp
+++ b/fpdfsdk/src/javascript/util.cpp
@@ -6,7 +6,6 @@
#include "util.h"
-#include "../../include/javascript/IJavaScript.h"
#include "JS_Context.h"
#include "JS_Define.h"
#include "JS_EventHandler.h"
@@ -14,6 +13,7 @@
#include "JS_Runtime.h"
#include "JS_Value.h"
#include "PublicMethods.h"
+#include "fpdfsdk/include/javascript/IJavaScript.h"
#include "resource.h"
#if _FX_OS_ == _FX_ANDROID_
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp
index d21970e595..4e069d52a3 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/jsapi/fxjs_v8.h"
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
#include "core/include/fxcrt/fx_basic.h"
diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
index eaaee86d67..4b99ef2d83 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "../../../testing/embedder_test.h"
-#include "../../include/jsapi/fxjs_v8.h"
#include "core/include/fpdfapi/fpdf_parser.h"
+#include "fpdfsdk/include/jsapi/fxjs_v8.h"
+#include "testing/embedder_test.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/base/nonstd_unique_ptr.h"
diff --git a/fpdfsdk/src/pdfwindow/PWL_Button.cpp b/fpdfsdk/src/pdfwindow/PWL_Button.cpp
index 9eca10c90d..e9c2647aa2 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Button.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Button.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Button.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* ------------------------------- CPWL_Button
* ---------------------------------- */
diff --git a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
index f35385e7f7..adb296d8e1 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Caret.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define PWL_CARET_FLASHINTERVAL 500
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
index 2043da5bff..f6e6d754d5 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_EditCtrl.h"
-#include "../../include/pdfwindow/PWL_Edit.h"
-#include "../../include/pdfwindow/PWL_ListBox.h"
-#include "../../include/pdfwindow/PWL_ComboBox.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ComboBox.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define PWLCB_DEFAULTFONTSIZE 12.0f
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index ce9bd26050..29e7c2eea7 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Caret.h"
-#include "../../include/pdfwindow/PWL_Edit.h"
-#include "../../include/pdfwindow/PWL_EditCtrl.h"
-#include "../../include/pdfwindow/PWL_FontMap.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
#include "core/include/fxcrt/fx_safe_types.h"
#include "core/include/fxcrt/fx_xml.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* ---------------------------- CPWL_Edit ------------------------------ */
diff --git a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
index eb6324ee7e..0794be653c 100644
--- a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_EditCtrl.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
-#include "../../include/pdfwindow/PWL_Caret.h"
-#include "../../include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
#define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp
index 06ddeeb2a2..cd65c383ff 100644
--- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define DEFAULT_FONT_NAME "Helvetica"
diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
index 29e0aa86f5..166b4e7ba1 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Icon.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* ------------------------------- CPWL_Image ----------------------------------
*/
diff --git a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
index 24d2dad5fa..cc8b352af1 100644
--- a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_ListCtrl.h"
-#include "../../include/pdfwindow/PWL_IconList.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
-#include "../../include/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_IconList.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define PWL_IconList_ITEM_ICON_LEFTMARGIN 10.0f
#define PWL_IconList_ITEM_WIDTH 20.0f
diff --git a/fpdfsdk/src/pdfwindow/PWL_Label.cpp b/fpdfsdk/src/pdfwindow/PWL_Label.cpp
index 797270ebba..4beeada721 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Label.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Label.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Label.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* ---------------------------- CPWL_Label ------------------------------ */
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
index 4bdcb5d1f3..229c1dd81e 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_ListBox.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
-#include "../../include/pdfwindow/PWL_EditCtrl.h"
-#include "../../include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
#define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp
index e01ce5c203..e578f9b860 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* ---------------------------- CPWL_ListCtrl ---------------------------- */
diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
index 6b05dde3b8..553a20f1dd 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
@@ -4,19 +4,19 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Button.h"
-#include "../../include/pdfwindow/PWL_EditCtrl.h"
-#include "../../include/pdfwindow/PWL_Edit.h"
-#include "../../include/pdfwindow/PWL_ListCtrl.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
-#include "../../include/pdfwindow/PWL_Note.h"
-#include "../../include/pdfwindow/PWL_Label.h"
-#include "../../include/pdfwindow/PWL_Edit.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
-#include "../../include/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Note.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define POPUP_ITEM_HEAD_BOTTOM 3.0f
#define POPUP_ITEM_BOTTOMWIDTH 1.0f
diff --git a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
index c762b4cd92..94f14fd3b8 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
#define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
diff --git a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
index bfe32ae8ad..f872bb4a62 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Icon.h"
-#include "../../include/pdfwindow/PWL_Signature.h"
-#include "../../include/pdfwindow/PWL_Label.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Label.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Signature.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* --------------------------------- CPWL_Signature_Image
* --------------------------------- */
diff --git a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp b/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp
index 7f125ad1d7..e22076edd2 100644
--- a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Button.h"
-#include "../../include/pdfwindow/PWL_SpecialButton.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Button.h"
+#include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* --------------------------- CPWL_PushButton ---------------------------- */
diff --git a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
index 52b22b548a..fafdf1e7cf 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
-#include "../../include/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
#define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
#define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
diff --git a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
index 7b765f3e4f..d8f3904021 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
@@ -6,10 +6,10 @@
#include <map>
-#include "../../include/pdfwindow/PDFWindow.h"
-#include "../../include/pdfwindow/PWL_Wnd.h"
-#include "../../include/pdfwindow/PWL_Utils.h"
-#include "../../include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PDFWindow.h"
+#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
/* -------------------------- CPWL_Timer -------------------------- */