summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-10-30 15:36:43 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-10-30 15:36:43 +0000
commit0ead5426591630db17a4dbed34e43dfab84379d1 (patch)
tree89196d5823e4ec3ddd3c8f95c9d52e666a7a7342 /fpdfsdk
parent51230323263024ec7f27ce868609fe5ab3d4323b (diff)
downloadpdfium-0ead5426591630db17a4dbed34e43dfab84379d1.tar.xz
Rename Icon to cjs_icon
This CL renames Icon.{cpp|h} to cjs_icon.{cpp|h}. Change-Id: Ie0554771441cfa7011205e0c4f461bb7526bb068 Reviewed-on: https://pdfium-review.googlesource.com/17034 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/javascript/cjs_document.cpp2
-rw-r--r--fpdfsdk/javascript/cjs_field.cpp2
-rw-r--r--fpdfsdk/javascript/cjs_icon.cpp (renamed from fpdfsdk/javascript/Icon.cpp)6
-rw-r--r--fpdfsdk/javascript/cjs_icon.h (renamed from fpdfsdk/javascript/Icon.h)8
-rw-r--r--fpdfsdk/javascript/cjs_runtime.cpp2
5 files changed, 7 insertions, 13 deletions
diff --git a/fpdfsdk/javascript/cjs_document.cpp b/fpdfsdk/javascript/cjs_document.cpp
index abbc61be61..df7001bd8f 100644
--- a/fpdfsdk/javascript/cjs_document.cpp
+++ b/fpdfsdk/javascript/cjs_document.cpp
@@ -19,11 +19,11 @@
#include "fpdfsdk/cpdfsdk_annotiteration.h"
#include "fpdfsdk/cpdfsdk_interform.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/javascript/Icon.h"
#include "fpdfsdk/javascript/app.h"
#include "fpdfsdk/javascript/cjs_annot.h"
#include "fpdfsdk/javascript/cjs_delaydata.h"
#include "fpdfsdk/javascript/cjs_field.h"
+#include "fpdfsdk/javascript/cjs_icon.h"
#include "fpdfsdk/javascript/cjs_printparamsobj.h"
const JSPropertySpec CJS_Document::PropertySpecs[] = {
diff --git a/fpdfsdk/javascript/cjs_field.cpp b/fpdfsdk/javascript/cjs_field.cpp
index 110c8ee51a..4de5da1747 100644
--- a/fpdfsdk/javascript/cjs_field.cpp
+++ b/fpdfsdk/javascript/cjs_field.cpp
@@ -15,9 +15,9 @@
#include "fpdfsdk/cpdfsdk_interform.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/javascript/Icon.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/Icon.cpp b/fpdfsdk/javascript/cjs_icon.cpp
index df7561ea8b..2606b8213d 100644
--- a/fpdfsdk/javascript/Icon.cpp
+++ b/fpdfsdk/javascript/cjs_icon.cpp
@@ -4,11 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/javascript/Icon.h"
-
-#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/JS_Object.h"
-#include "fpdfsdk/javascript/JS_Value.h"
+#include "fpdfsdk/javascript/cjs_icon.h"
const JSPropertySpec CJS_Icon::PropertySpecs[] = {
{"name", get_name_static, set_name_static},
diff --git a/fpdfsdk/javascript/Icon.h b/fpdfsdk/javascript/cjs_icon.h
index 9f6366178d..dd33426bf7 100644
--- a/fpdfsdk/javascript/Icon.h
+++ b/fpdfsdk/javascript/cjs_icon.h
@@ -4,13 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_JAVASCRIPT_ICON_H_
-#define FPDFSDK_JAVASCRIPT_ICON_H_
+#ifndef FPDFSDK_JAVASCRIPT_CJS_ICON_H_
+#define FPDFSDK_JAVASCRIPT_CJS_ICON_H_
#include "fpdfsdk/javascript/JS_Define.h"
-class CPDF_Stream;
-
class Icon : public CJS_EmbedObj {
public:
explicit Icon(CJS_Object* pJSObject);
@@ -41,4 +39,4 @@ class CJS_Icon : public CJS_Object {
static const JSPropertySpec PropertySpecs[];
};
-#endif // FPDFSDK_JAVASCRIPT_ICON_H_
+#endif // FPDFSDK_JAVASCRIPT_CJS_ICON_H_
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 9421d3dee3..177a6f43ac 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -9,7 +9,6 @@
#include <algorithm>
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
-#include "fpdfsdk/javascript/Icon.h"
#include "fpdfsdk/javascript/JS_Define.h"
#include "fpdfsdk/javascript/JS_GlobalData.h"
#include "fpdfsdk/javascript/JS_Object.h"
@@ -28,6 +27,7 @@
#include "fpdfsdk/javascript/cjs_globalarrays.h"
#include "fpdfsdk/javascript/cjs_globalconsts.h"
#include "fpdfsdk/javascript/cjs_highlight.h"
+#include "fpdfsdk/javascript/cjs_icon.h"
#include "fpdfsdk/javascript/cjs_position.h"
#include "fpdfsdk/javascript/cjs_printparamsobj.h"
#include "fpdfsdk/javascript/cjs_scalehow.h"