From 08fea801054f3afadb95d0a54efe7da6683c5c5d Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 12 Jul 2016 10:37:52 -0700 Subject: Rename fxjse/ to fxjs/ update files to match class names. This Cl moves the fxjse/ directory to fxjs/ in anticipation of merging in fpdfsdk/jsapi. In the process the filenames are updated to better match the class contents. Static methods are moved to anonymous namespaces as possible. Review-Url: https://codereview.chromium.org/2136213002 --- xfa/fxfa/DEPS | 2 +- xfa/fxfa/app/xfa_ffnotify.cpp | 2 +- xfa/fxfa/app/xfa_ffwidgetacc.cpp | 2 +- xfa/fxfa/fm2js/xfa_fm2jscontext.cpp | 6 +++--- xfa/fxfa/fm2js/xfa_fm2jscontext.h | 3 ++- xfa/fxfa/include/fxfa_basic.h | 4 ++-- xfa/fxfa/parser/cxfa_valuearray.h | 2 +- xfa/fxfa/parser/xfa_object.h | 2 +- xfa/fxfa/parser/xfa_object_imp.cpp | 2 +- xfa/fxfa/parser/xfa_script.h | 2 +- xfa/fxfa/parser/xfa_script_datawindow.cpp | 2 +- xfa/fxfa/parser/xfa_script_datawindow.h | 2 +- xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp | 2 +- xfa/fxfa/parser/xfa_script_eventpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp | 2 +- xfa/fxfa/parser/xfa_script_hostpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_imp.cpp | 6 +++--- xfa/fxfa/parser/xfa_script_imp.h | 2 +- xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp | 2 +- xfa/fxfa/parser/xfa_script_layoutpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_logpseudomodel.cpp | 2 +- xfa/fxfa/parser/xfa_script_logpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp | 2 +- xfa/fxfa/parser/xfa_script_signaturepseudomodel.h | 2 +- 24 files changed, 30 insertions(+), 29 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/DEPS b/xfa/fxfa/DEPS index 19fdfab516..589b532e2c 100644 --- a/xfa/fxfa/DEPS +++ b/xfa/fxfa/DEPS @@ -1,3 +1,3 @@ include_rules = [ - '+fxjse/include', + '+fxjs/include', ] diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index d8c32f9ed9..be8268a9d4 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/app/xfa_ffnotify.h" -#include "fxjse/include/cfxjse_value.h" +#include "fxjs/include/cfxjse_value.h" #include "xfa/fxfa/app/xfa_ffbarcode.h" #include "xfa/fxfa/app/xfa_ffcheckbutton.h" #include "xfa/fxfa/app/xfa_ffchoicelist.h" diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index dabb31610a..fec0c20c58 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -9,7 +9,7 @@ #include #include -#include "fxjse/include/cfxjse_value.h" +#include "fxjs/include/cfxjse_value.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fxfa/app/xfa_ffcheckbutton.h" diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 6826094b1d..b5bc6757c4 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -9,9 +9,9 @@ #include #include "core/fxcrt/include/fx_ext.h" -#include "fxjse/include/cfxjse_arguments.h" -#include "fxjse/include/cfxjse_class.h" -#include "fxjse/include/cfxjse_value.h" +#include "fxjs/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_class.h" +#include "fxjs/include/cfxjse_value.h" #include "xfa/fgas/localization/fgas_locale.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/fm2js/xfa_program.h" diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h index 344c4bcda8..fc98dbbd4a 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h @@ -7,7 +7,8 @@ #ifndef XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_ #define XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_ -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_context.h" #include "xfa/fxfa/parser/xfa_script.h" class CXFA_FM2JSContext : public CFXJSE_HostObject { diff --git a/xfa/fxfa/include/fxfa_basic.h b/xfa/fxfa/include/fxfa_basic.h index 9fe2650ffc..2a379736e5 100644 --- a/xfa/fxfa/include/fxfa_basic.h +++ b/xfa/fxfa/include/fxfa_basic.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_INCLUDE_FXFA_BASIC_H_ #define XFA_FXFA_INCLUDE_FXFA_BASIC_H_ -#include "fxjse/include/cfxjse_arguments.h" -#include "fxjse/include/fxjse.h" +#include "fxjs/include/cfxjse_arguments.h" +#include "fxjs/include/fxjse.h" class CXFA_Measurement; enum class XFA_ObjectType; diff --git a/xfa/fxfa/parser/cxfa_valuearray.h b/xfa/fxfa/parser/cxfa_valuearray.h index 3907b4dbbd..4bc59c79d2 100644 --- a/xfa/fxfa/parser/cxfa_valuearray.h +++ b/xfa/fxfa/parser/cxfa_valuearray.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_ #define XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_ -#include "fxjse/include/cfxjse_value.h" +#include "fxjs/include/cfxjse_value.h" #include "xfa/fxfa/include/fxfa.h" class CXFA_ValueArray : public CFX_ArrayTemplate { diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h index a838b17578..268d5c4c79 100644 --- a/xfa/fxfa/parser/xfa_object.h +++ b/xfa/fxfa/parser/xfa_object.h @@ -9,7 +9,7 @@ #include -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fde/xml/fde_xml.h" #include "xfa/fxfa/parser/xfa_utils.h" diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp index 871286d24e..e3d9f6bcdf 100644 --- a/xfa/fxfa/parser/xfa_object_imp.cpp +++ b/xfa/fxfa/parser/xfa_object_imp.cpp @@ -9,7 +9,7 @@ #include #include "core/fxcrt/include/fx_ext.h" -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "third_party/base/stl_util.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" diff --git a/xfa/fxfa/parser/xfa_script.h b/xfa/fxfa/parser/xfa_script.h index 020e809881..038d2dbdd3 100644 --- a/xfa/fxfa/parser/xfa_script.h +++ b/xfa/fxfa/parser/xfa_script.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_H_ -#include "fxjse/include/cfxjse_value.h" +#include "fxjs/include/cfxjse_value.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/cxfa_valuearray.h" diff --git a/xfa/fxfa/parser/xfa_script_datawindow.cpp b/xfa/fxfa/parser/xfa_script_datawindow.cpp index 8e37e00911..e953206c4d 100644 --- a/xfa/fxfa/parser/xfa_script_datawindow.cpp +++ b/xfa/fxfa/parser/xfa_script_datawindow.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_datawindow.h" -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_localemgr.h" diff --git a/xfa/fxfa/parser/xfa_script_datawindow.h b/xfa/fxfa/parser/xfa_script_datawindow.h index 05ecf8dc53..ea8e6ad242 100644 --- a/xfa/fxfa/parser/xfa_script_datawindow.h +++ b/xfa/fxfa/parser/xfa_script_datawindow.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_DATAWINDOW_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_DATAWINDOW_H_ -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" class CScript_DataWindow : public CXFA_Object { diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp index ef724e49f2..507aef3c6a 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_eventpseudomodel.h" -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/include/xfa_ffwidgethandler.h" diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h index 9eb3912e9e..c52d3ce5fa 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" enum class XFA_Event { diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp index 37ed181714..8bc71699b4 100644 --- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_hostpseudomodel.h" -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h index e131b6fe7e..cabaabca4a 100644 --- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp index 95298e4799..e426c1ecf7 100644 --- a/xfa/fxfa/parser/xfa_script_imp.cpp +++ b/xfa/fxfa/parser/xfa_script_imp.cpp @@ -7,9 +7,9 @@ #include "xfa/fxfa/parser/xfa_script_imp.h" #include "core/fxcrt/include/fx_ext.h" -#include "fxjse/include/cfxjse_arguments.h" -#include "fxjse/include/cfxjse_class.h" -#include "fxjse/include/cfxjse_value.h" +#include "fxjs/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_class.h" +#include "fxjs/include/cfxjse_value.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/parser/xfa_doclayout.h" diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h index c6bb14862e..5356679636 100644 --- a/xfa/fxfa/parser/xfa_script_imp.h +++ b/xfa/fxfa/parser/xfa_script_imp.h @@ -11,7 +11,7 @@ #include #include -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/parser/xfa_document.h" diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp index 3567a5a138..977b83ff03 100644 --- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp @@ -8,7 +8,7 @@ #include -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "third_party/base/stl_util.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/xfa_doclayout.h" diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h index 0977f32a94..1e61c42064 100644 --- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp index 800a8059d5..57909cdd79 100644 --- a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_logpseudomodel.h" -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_localemgr.h" diff --git a/xfa/fxfa/parser/xfa_script_logpseudomodel.h b/xfa/fxfa/parser/xfa_script_logpseudomodel.h index d344fd5157..917bbdcf0d 100644 --- a/xfa/fxfa/parser/xfa_script_logpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_logpseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" class CScript_LogPseudoModel : public CXFA_Object { diff --git a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp index 45c0f7c0d0..0341fc12de 100644 --- a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_script_signaturepseudomodel.h" -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" diff --git a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h index 0ced36c841..56f5e5de43 100644 --- a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ -#include "fxjse/include/cfxjse_arguments.h" +#include "fxjs/include/cfxjse_arguments.h" #include "xfa/fxfa/parser/xfa_object.h" class CScript_SignaturePseudoModel : public CXFA_Object { -- cgit v1.2.3