summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authordan sinclair <dsinclair@chromium.org>2017-10-25 20:25:04 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-10-26 16:59:37 +0000
commit95460d82634a7464670d697b8c9f0d58a298f3a4 (patch)
tree8e75bed8fed3087bddeb80f60ecf2baee7c46ead /fpdfsdk
parent993a19931a6ad343310b7d5d076d9e45af0ed528 (diff)
downloadpdfium-95460d82634a7464670d697b8c9f0d58a298f3a4.tar.xz
Rename Annot to cjs_annot
Thist CL renames Annot.{h|cpp} to cjs_annot.{h|cpp} to better match the primary class. Change-Id: I9c3e2fcbb149d97e90098018f42205568ef179b1 Reviewed-on: https://pdfium-review.googlesource.com/16851 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/javascript/Document.cpp2
-rw-r--r--fpdfsdk/javascript/cjs_annot.cpp (renamed from fpdfsdk/javascript/Annot.cpp)2
-rw-r--r--fpdfsdk/javascript/cjs_annot.h (renamed from fpdfsdk/javascript/Annot.h)6
-rw-r--r--fpdfsdk/javascript/cjs_runtime.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index fbd7763201..d72f83822b 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -24,7 +24,6 @@
#include "fpdfsdk/cpdfsdk_interform.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/javascript/Annot.h"
#include "fpdfsdk/javascript/Field.h"
#include "fpdfsdk/javascript/Icon.h"
#include "fpdfsdk/javascript/JS_Define.h"
@@ -32,6 +31,7 @@
#include "fpdfsdk/javascript/JS_Object.h"
#include "fpdfsdk/javascript/JS_Value.h"
#include "fpdfsdk/javascript/app.h"
+#include "fpdfsdk/javascript/cjs_annot.h"
#include "fpdfsdk/javascript/cjs_event_context.h"
#include "fpdfsdk/javascript/cjs_runtime.h"
#include "fpdfsdk/javascript/resource.h"
diff --git a/fpdfsdk/javascript/Annot.cpp b/fpdfsdk/javascript/cjs_annot.cpp
index 4240bbc974..e69f7ceb64 100644
--- a/fpdfsdk/javascript/Annot.cpp
+++ b/fpdfsdk/javascript/cjs_annot.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/javascript/Annot.h"
+#include "fpdfsdk/javascript/cjs_annot.h"
#include "fpdfsdk/javascript/JS_Define.h"
#include "fpdfsdk/javascript/JS_Object.h"
diff --git a/fpdfsdk/javascript/Annot.h b/fpdfsdk/javascript/cjs_annot.h
index b7c951b310..d63043147e 100644
--- a/fpdfsdk/javascript/Annot.h
+++ b/fpdfsdk/javascript/cjs_annot.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_JAVASCRIPT_ANNOT_H_
-#define FPDFSDK_JAVASCRIPT_ANNOT_H_
+#ifndef FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
+#define FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
#include "fpdfsdk/cpdfsdk_baannot.h"
#include "fpdfsdk/javascript/JS_Define.h"
@@ -41,4 +41,4 @@ class CJS_Annot : public CJS_Object {
JS_STATIC_PROP(type, type, Annot);
};
-#endif // FPDFSDK_JAVASCRIPT_ANNOT_H_
+#endif // FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 0209933748..05bdb7c235 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/Annot.h"
#include "fpdfsdk/javascript/Document.h"
#include "fpdfsdk/javascript/Field.h"
#include "fpdfsdk/javascript/Icon.h"
@@ -20,6 +19,7 @@
#include "fpdfsdk/javascript/JS_Value.h"
#include "fpdfsdk/javascript/PublicMethods.h"
#include "fpdfsdk/javascript/app.h"
+#include "fpdfsdk/javascript/cjs_annot.h"
#include "fpdfsdk/javascript/cjs_border.h"
#include "fpdfsdk/javascript/cjs_display.h"
#include "fpdfsdk/javascript/cjs_event_context.h"