From 61046b948a7a15a605147635d317ff3bb27fb452 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 18 Feb 2016 14:48:48 -0500 Subject: Sort headers in non-xfa directories. This CL runs the chromium sort-headers.py script over the non-xfa code. XFA will be done after the includes have been updated to full paths. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1711793002 . --- fpdfsdk/include/formfiller/FFL_ComboBox.h | 2 +- fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 1 + fpdfsdk/include/fsdk_define.h | 2 +- fpdfsdk/include/jsapi/fxjs_v8.h | 2 +- fpdfsdk/src/fpdfdoc_embeddertest.cpp | 2 +- fpdfsdk/src/fpdftext_embeddertest.cpp | 2 +- fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp | 6 +++--- fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp | 8 ++++---- fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 6 +++--- fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp | 2 +- fpdfsdk/src/javascript/JS_Object.cpp | 2 +- fpdfsdk/src/javascript/console.cpp | 2 +- fpdfsdk/src/javascript/public_methods_embeddertest.cpp | 2 +- fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | 2 +- 14 files changed, 21 insertions(+), 20 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h index 590a646d1d..672b0b2b7c 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 "fpdfsdk/include/formfiller/FFL_FormFiller.h" #include "core/include/fxcrt/fx_string.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" class CBA_FontMap; class CPDFSDK_Document; diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h index 6cb07915ed..9678453db6 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h @@ -9,6 +9,7 @@ #include +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" #include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" #define JS_STR_VIEWERTYPE_STANDARD L"Exchange" diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 7f9c38791e..e7e29e6866 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -28,8 +28,8 @@ #endif // PDF_ENABLE_XFA #ifdef _WIN32 -#include #include +#include #endif // Convert a #FX_ARGB to a #FX_COLORREF. diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index 50b2656e91..76373ac4bc 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -14,8 +14,8 @@ #ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_ #define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_ -#include #include +#include #include diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/src/fpdfdoc_embeddertest.cpp index 1c66a15bad..a789dade36 100644 --- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp +++ b/fpdfsdk/src/fpdfdoc_embeddertest.cpp @@ -7,8 +7,8 @@ #include "public/fpdfview.h" #include "testing/embedder_test.h" #include "testing/fx_string_testhelpers.h" -#include "testing/test_support.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/test_support.h" class FPDFDocEmbeddertest : public EmbedderTest {}; diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp index e84a96e966..3eaa5815d9 100644 --- a/fpdfsdk/src/fpdftext_embeddertest.cpp +++ b/fpdfsdk/src/fpdftext_embeddertest.cpp @@ -6,8 +6,8 @@ #include "public/fpdf_text.h" #include "public/fpdfview.h" #include "testing/embedder_test.h" -#include "testing/test_support.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/test_support.h" namespace { diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp index 1006bf9c44..7c686092d0 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" #include "fpdfsdk/include/javascript/IJavaScript.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" #include "public/fpdf_formfill.h" CPDFXFA_App* CPDFXFA_App::g_pApp = NULL; diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index b937af4f2c..7bea8b65c9 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/fsdk_mgr.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" #include "fpdfsdk/include/javascript/IJavaScript.h" #include "public/fpdf_formfill.h" diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp index 24c1ed156d..fab90a26d3 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/fsdk_mgr.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index) : m_pPDFPage(NULL), diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp index bd817a45df..03f1cfc358 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_mgr.h" -#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" std::vector CXFA_FWLAdapterTimerMgr::s_TimerArray; diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index ca9bd00774..3f0fe8cb48 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -7,9 +7,9 @@ #include "fpdfsdk/src/javascript/JS_Object.h" #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "fpdfsdk/src/javascript/JS_Context.h" #include "fpdfsdk/src/javascript/JS_Define.h" -#include "fpdfsdk/include/javascript/IJavaScript.h" namespace { diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp index 5666bec255..2f56c1e090 100644 --- a/fpdfsdk/src/javascript/console.cpp +++ b/fpdfsdk/src/javascript/console.cpp @@ -6,12 +6,12 @@ #include "fpdfsdk/src/javascript/console.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "fpdfsdk/src/javascript/JS_Context.h" #include "fpdfsdk/src/javascript/JS_Define.h" #include "fpdfsdk/src/javascript/JS_EventHandler.h" #include "fpdfsdk/src/javascript/JS_Object.h" #include "fpdfsdk/src/javascript/JS_Value.h" -#include "fpdfsdk/include/javascript/IJavaScript.h" /* ------------------------ console ------------------------ */ diff --git a/fpdfsdk/src/javascript/public_methods_embeddertest.cpp b/fpdfsdk/src/javascript/public_methods_embeddertest.cpp index c61215aa29..cf6f96802b 100644 --- a/fpdfsdk/src/javascript/public_methods_embeddertest.cpp +++ b/fpdfsdk/src/javascript/public_methods_embeddertest.cpp @@ -6,8 +6,8 @@ #include "core/include/fxcrt/fx_string.h" #include "fpdfsdk/src/javascript/PublicMethods.h" -#include "testing/js_embedder_test.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/js_embedder_test.h" namespace { diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp index 8fce27b7c3..b7700c8b60 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "testing/js_embedder_test.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/js_embedder_test.h" namespace { -- cgit v1.2.3