From a52ab741019342fbca0468e43a01deb44fa5f1bd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 13:59:29 -0700 Subject: Move core/fxcrt/include to core/fxcrt BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2382723003 --- fpdfsdk/javascript/Field.h | 2 +- fpdfsdk/javascript/JS_EventHandler.h | 4 ++-- fpdfsdk/javascript/JS_GlobalData.h | 2 +- fpdfsdk/javascript/JS_KeyValue.h | 2 +- fpdfsdk/javascript/JS_Value.h | 2 +- fpdfsdk/javascript/PublicMethods.cpp | 2 +- fpdfsdk/javascript/cjs_context.h | 4 ++-- fpdfsdk/javascript/cjs_runtime.h | 4 ++-- fpdfsdk/javascript/global.cpp | 2 +- fpdfsdk/javascript/ijs_context.h | 4 ++-- fpdfsdk/javascript/ijs_runtime.h | 4 ++-- fpdfsdk/javascript/public_methods_embeddertest.cpp | 2 +- fpdfsdk/javascript/resource.h | 2 +- fpdfsdk/javascript/util.cpp | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) (limited to 'fpdfsdk/javascript') diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h index 56cfd20d83..e559780154 100644 --- a/fpdfsdk/javascript/Field.h +++ b/fpdfsdk/javascript/Field.h @@ -10,7 +10,7 @@ #include #include -#include "core/fxcrt/include/cfx_observable.h" +#include "core/fxcrt/cfx_observable.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" // For CPWL_Color. diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h index 41d37056a5..02d5e82595 100644 --- a/fpdfsdk/javascript/JS_EventHandler.h +++ b/fpdfsdk/javascript/JS_EventHandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ #define FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" class CJS_Context; class CPDFSDK_Annot; diff --git a/fpdfsdk/javascript/JS_GlobalData.h b/fpdfsdk/javascript/JS_GlobalData.h index cda8533fad..38ab9256f9 100644 --- a/fpdfsdk/javascript/JS_GlobalData.h +++ b/fpdfsdk/javascript/JS_GlobalData.h @@ -10,7 +10,7 @@ #include #include -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "fpdfsdk/javascript/JS_KeyValue.h" class CPDFSDK_Environment; diff --git a/fpdfsdk/javascript/JS_KeyValue.h b/fpdfsdk/javascript/JS_KeyValue.h index 43f6687b8d..a571588870 100644 --- a/fpdfsdk/javascript/JS_KeyValue.h +++ b/fpdfsdk/javascript/JS_KeyValue.h @@ -10,7 +10,7 @@ #include #include -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" enum class JS_GlobalDataType { NUMBER = 0, BOOLEAN, STRING, OBJECT, NULLOBJ }; diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h index c567a7cbf2..ef79d7b91b 100644 --- a/fpdfsdk/javascript/JS_Value.h +++ b/fpdfsdk/javascript/JS_Value.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "fxjs/include/fxjs_v8.h" class CJS_Array; diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index c7f7b85f45..6a96466b5a 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -10,7 +10,7 @@ #include #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h" diff --git a/fpdfsdk/javascript/cjs_context.h b/fpdfsdk/javascript/cjs_context.h index 41f2042b7e..ef65486269 100644 --- a/fpdfsdk/javascript/cjs_context.h +++ b/fpdfsdk/javascript/cjs_context.h @@ -9,8 +9,8 @@ #include -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "fpdfsdk/javascript/ijs_context.h" class CJS_EventHandler; diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fpdfsdk/javascript/cjs_runtime.h index da7e384321..d438e46a6d 100644 --- a/fpdfsdk/javascript/cjs_runtime.h +++ b/fpdfsdk/javascript/cjs_runtime.h @@ -13,8 +13,8 @@ #include #include -#include "core/fxcrt/include/cfx_observable.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/cfx_observable.h" +#include "core/fxcrt/fx_basic.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "fxjs/include/fxjs_v8.h" diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/global.cpp index b55953907f..144b5ee42a 100644 --- a/fpdfsdk/javascript/global.cpp +++ b/fpdfsdk/javascript/global.cpp @@ -8,7 +8,7 @@ #include -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_GlobalData.h" diff --git a/fpdfsdk/javascript/ijs_context.h b/fpdfsdk/javascript/ijs_context.h index 587ff8110c..cfeed3050d 100644 --- a/fpdfsdk/javascript/ijs_context.h +++ b/fpdfsdk/javascript/ijs_context.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_JAVASCRIPT_IJS_CONTEXT_H_ #define FPDFSDK_JAVASCRIPT_IJS_CONTEXT_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" class CPDF_Bookmark; class CPDF_FormField; diff --git a/fpdfsdk/javascript/ijs_runtime.h b/fpdfsdk/javascript/ijs_runtime.h index ee024fe2fd..be0cd042d2 100644 --- a/fpdfsdk/javascript/ijs_runtime.h +++ b/fpdfsdk/javascript/ijs_runtime.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_JAVASCRIPT_IJS_RUNTIME_H_ #define FPDFSDK_JAVASCRIPT_IJS_RUNTIME_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #ifdef PDF_ENABLE_XFA #include "fxjs/include/fxjse.h" diff --git a/fpdfsdk/javascript/public_methods_embeddertest.cpp b/fpdfsdk/javascript/public_methods_embeddertest.cpp index 80ec6492ee..24793667b0 100644 --- a/fpdfsdk/javascript/public_methods_embeddertest.cpp +++ b/fpdfsdk/javascript/public_methods_embeddertest.cpp @@ -4,7 +4,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/javascript/PublicMethods.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/js_embedder_test.h" diff --git a/fpdfsdk/javascript/resource.h b/fpdfsdk/javascript/resource.h index 7f041cd21a..663cf3b04d 100644 --- a/fpdfsdk/javascript/resource.h +++ b/fpdfsdk/javascript/resource.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_JAVASCRIPT_RESOURCE_H_ #define FPDFSDK_JAVASCRIPT_RESOURCE_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CJS_Context; diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp index 44511f591f..50c4c56ee9 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -12,7 +12,7 @@ #include #include -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" -- cgit v1.2.3