diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_color.cpp (renamed from fpdfsdk/javascript/color.cpp) | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_color.h (renamed from fpdfsdk/javascript/color.h) | 6 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_field.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_publicmethods.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_runtime.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
@@ -1200,6 +1200,8 @@ static_library("javascript") { "fpdfsdk/javascript/cjs_app.h", "fpdfsdk/javascript/cjs_border.cpp", "fpdfsdk/javascript/cjs_border.h", + "fpdfsdk/javascript/cjs_color.cpp", + "fpdfsdk/javascript/cjs_color.h", "fpdfsdk/javascript/cjs_delaydata.cpp", "fpdfsdk/javascript/cjs_delaydata.h", "fpdfsdk/javascript/cjs_display.cpp", @@ -1248,8 +1250,6 @@ static_library("javascript") { "fpdfsdk/javascript/cjs_timerobj.h", "fpdfsdk/javascript/cjs_zoomtype.cpp", "fpdfsdk/javascript/cjs_zoomtype.h", - "fpdfsdk/javascript/color.cpp", - "fpdfsdk/javascript/color.h", "fpdfsdk/javascript/console.cpp", "fpdfsdk/javascript/console.h", "fpdfsdk/javascript/event.cpp", diff --git a/fpdfsdk/javascript/color.cpp b/fpdfsdk/javascript/cjs_color.cpp index 0f9ed0a4b8..0c0d9640d1 100644 --- a/fpdfsdk/javascript/color.cpp +++ b/fpdfsdk/javascript/cjs_color.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/javascript/color.h" +#include "fpdfsdk/javascript/cjs_color.h" #include <vector> diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/cjs_color.h index 4a5aa5f025..1942f3dd38 100644 --- a/fpdfsdk/javascript/color.h +++ b/fpdfsdk/javascript/cjs_color.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_JAVASCRIPT_COLOR_H_ -#define FPDFSDK_JAVASCRIPT_COLOR_H_ +#ifndef FPDFSDK_JAVASCRIPT_CJS_COLOR_H_ +#define FPDFSDK_JAVASCRIPT_CJS_COLOR_H_ #include <vector> @@ -112,4 +112,4 @@ class CJS_Color : public CJS_Object { static const JSMethodSpec MethodSpecs[]; }; -#endif // FPDFSDK_JAVASCRIPT_COLOR_H_ +#endif // FPDFSDK_JAVASCRIPT_CJS_COLOR_H_ diff --git a/fpdfsdk/javascript/cjs_field.cpp b/fpdfsdk/javascript/cjs_field.cpp index 4de5da1747..84c0d6ab10 100644 --- a/fpdfsdk/javascript/cjs_field.cpp +++ b/fpdfsdk/javascript/cjs_field.cpp @@ -15,10 +15,10 @@ #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/cpdfsdk_widget.h" +#include "fpdfsdk/javascript/cjs_color.h" #include "fpdfsdk/javascript/cjs_delaydata.h" #include "fpdfsdk/javascript/cjs_document.h" #include "fpdfsdk/javascript/cjs_icon.h" -#include "fpdfsdk/javascript/color.h" namespace { diff --git a/fpdfsdk/javascript/cjs_publicmethods.cpp b/fpdfsdk/javascript/cjs_publicmethods.cpp index c62bf7be67..27bb869f0d 100644 --- a/fpdfsdk/javascript/cjs_publicmethods.cpp +++ b/fpdfsdk/javascript/cjs_publicmethods.cpp @@ -20,12 +20,12 @@ #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/javascript/JS_Define.h" +#include "fpdfsdk/javascript/cjs_color.h" #include "fpdfsdk/javascript/cjs_event_context.h" #include "fpdfsdk/javascript/cjs_eventhandler.h" #include "fpdfsdk/javascript/cjs_field.h" #include "fpdfsdk/javascript/cjs_object.h" #include "fpdfsdk/javascript/cjs_runtime.h" -#include "fpdfsdk/javascript/color.h" #include "fpdfsdk/javascript/resource.h" #include "fpdfsdk/javascript/util.h" diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index d940f082d3..0eb5233b0e 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -14,6 +14,7 @@ #include "fpdfsdk/javascript/cjs_annot.h" #include "fpdfsdk/javascript/cjs_app.h" #include "fpdfsdk/javascript/cjs_border.h" +#include "fpdfsdk/javascript/cjs_color.h" #include "fpdfsdk/javascript/cjs_display.h" #include "fpdfsdk/javascript/cjs_document.h" #include "fpdfsdk/javascript/cjs_event_context.h" @@ -34,7 +35,6 @@ #include "fpdfsdk/javascript/cjs_style.h" #include "fpdfsdk/javascript/cjs_timerobj.h" #include "fpdfsdk/javascript/cjs_zoomtype.h" -#include "fpdfsdk/javascript/color.h" #include "fpdfsdk/javascript/console.h" #include "fpdfsdk/javascript/event.h" #include "fpdfsdk/javascript/report.h" |