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/include/pdfwindow/PDFWindow.h | 4 ++-- fpdfsdk/include/pdfwindow/PWL_EditCtrl.h | 2 +- fpdfsdk/include/pdfwindow/PWL_FontMap.h | 2 +- fpdfsdk/include/pdfwindow/PWL_ListBox.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Utils.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Wnd.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/include/pdfwindow') 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; -- cgit v1.2.3