From aa403d3f68a966e24a6d8e8c109970930f096afb Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 15 Mar 2016 14:57:22 -0400 Subject: core/include/fdpfapi cleanup Part I. This Cl moves a bunch of the files from core/include/fpdfapi to their correct location outside the core/include tree. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1805603002 . --- fpdfsdk/pdfwindow/PWL_Caret.cpp | 2 ++ fpdfsdk/pdfwindow/PWL_ComboBox.cpp | 1 + fpdfsdk/pdfwindow/PWL_Edit.cpp | 2 ++ fpdfsdk/pdfwindow/PWL_FontMap.cpp | 5 +++-- fpdfsdk/pdfwindow/PWL_Icon.cpp | 4 +++- fpdfsdk/pdfwindow/PWL_ListCtrl.cpp | 1 + fpdfsdk/pdfwindow/PWL_Note.cpp | 1 + fpdfsdk/pdfwindow/PWL_ScrollBar.cpp | 2 ++ fpdfsdk/pdfwindow/PWL_Signature.cpp | 1 + fpdfsdk/pdfwindow/PWL_Utils.cpp | 1 + 10 files changed, 17 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/pdfwindow') diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp index 320b2bf62f..94a9c7e588 100644 --- a/fpdfsdk/pdfwindow/PWL_Caret.cpp +++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp @@ -5,6 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "fpdfsdk/include/pdfwindow/PWL_Caret.h" + +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_Utils.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp index 6edd6bdd85..1d98a51d26 100644 --- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp @@ -6,6 +6,7 @@ #include "fpdfsdk/include/pdfwindow/PWL_ComboBox.h" +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_Edit.h" #include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" #include "fpdfsdk/include/pdfwindow/PWL_ListBox.h" diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index c4a5bf03fd..c2b3864074 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp @@ -8,8 +8,10 @@ #include +#include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fxcrt/fx_safe_types.h" #include "core/include/fxcrt/fx_xml.h" +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_Caret.h" #include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp index 0a70357efd..2b9f17cf59 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp @@ -6,8 +6,9 @@ #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" -#include "core/include/fpdfapi/cpdf_document.h" -#include "core/include/fpdfapi/fpdf_module.h" +#include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" +#include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/include/fpdfapi/fpdf_page.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" namespace { diff --git a/fpdfsdk/pdfwindow/PWL_Icon.cpp b/fpdfsdk/pdfwindow/PWL_Icon.cpp index 2a33b96cf9..6fa65cf1e5 100644 --- a/fpdfsdk/pdfwindow/PWL_Icon.cpp +++ b/fpdfsdk/pdfwindow/PWL_Icon.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fpdfapi/cpdf_array.h" #include "fpdfsdk/include/pdfwindow/PWL_Icon.h" + +#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" +#include "core/include/fpdfapi/fpdf_page.h" #include "fpdfsdk/include/pdfwindow/PWL_Utils.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp index 7c2c1f4d17..f9482878b9 100644 --- a/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_ListCtrl.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_Note.cpp b/fpdfsdk/pdfwindow/PWL_Note.cpp index 7ba6f6ad66..ec7c1c9cde 100644 --- a/fpdfsdk/pdfwindow/PWL_Note.cpp +++ b/fpdfsdk/pdfwindow/PWL_Note.cpp @@ -6,6 +6,7 @@ #include "fpdfsdk/include/pdfwindow/PWL_Note.h" +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_Button.h" #include "fpdfsdk/include/pdfwindow/PWL_Caret.h" #include "fpdfsdk/include/pdfwindow/PWL_Edit.h" diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp index 03bf3238fa..8b7cfd5b4c 100644 --- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp +++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp @@ -5,6 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" + +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_Utils.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_Signature.cpp b/fpdfsdk/pdfwindow/PWL_Signature.cpp index ffb4461878..a928e4eeb5 100644 --- a/fpdfsdk/pdfwindow/PWL_Signature.cpp +++ b/fpdfsdk/pdfwindow/PWL_Signature.cpp @@ -6,6 +6,7 @@ #include "fpdfsdk/include/pdfwindow/PWL_Signature.h" +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_Icon.h" #include "fpdfsdk/include/pdfwindow/PWL_Label.h" #include "fpdfsdk/include/pdfwindow/PWL_Utils.h" diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp index 926ab3f0b7..23bddcdf1e 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp @@ -8,6 +8,7 @@ #include +#include "core/include/fxge/fx_ge.h" #include "fpdfsdk/include/pdfwindow/PWL_Icon.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" -- cgit v1.2.3