From 9332e0c2fced598a632e3bbe905b6f63b1f5b06b Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 9 Mar 2016 13:49:00 -0500 Subject: Cleanup the xfa/src/fgas directory. This CL moves the code from xfa/src/fgas/src up one level. It then takes the headers in xfa/src/fgas/include and moves them to their correct folder. The src/ and include/ directories are then removed. In some cases, when moving from include/ there was another header with the same name. Those headers were either folded together, or the content of the conflicting folder moved to an anonymous namespace in the cpp file as they were not used anywhere else. Files with duplicate names as core/src/crt were renamed to be fgas_ instead of fx_. (e.g. fgas_system.h, fgas_memory.h, fgas_stream.h) R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1776303002 . --- xfa/src/fxfa/parser/xfa_basic_imp.cpp | 6 +++--- xfa/src/fxfa/parser/xfa_basic_imp.h | 2 +- xfa/src/fxfa/parser/xfa_document_serialize.cpp | 2 +- xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp | 2 +- xfa/src/fxfa/parser/xfa_locale.h | 2 +- xfa/src/fxfa/parser/xfa_localemgr.h | 4 ++-- xfa/src/fxfa/parser/xfa_object_imp.cpp | 4 ++-- xfa/src/fxfa/parser/xfa_parser_imp.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'xfa/src/fxfa/parser') diff --git a/xfa/src/fxfa/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/parser/xfa_basic_imp.cpp index dc4c8d1778..a0aa56d8be 100644 --- a/xfa/src/fxfa/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/parser/xfa_basic_imp.cpp @@ -7,9 +7,9 @@ #include "xfa/src/fxfa/parser/xfa_basic_imp.h" #include "core/include/fxcrt/fx_ext.h" -#include "xfa/src/fgas/include/fx_alg.h" -#include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/crt/fgas_algorithm.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" +#include "xfa/src/fgas/crt/fgas_system.h" #include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h" #include "xfa/src/fxfa/parser/xfa_basic_data.h" #include "xfa/src/fxfa/parser/xfa_docdata.h" diff --git a/xfa/src/fxfa/parser/xfa_basic_imp.h b/xfa/src/fxfa/parser/xfa_basic_imp.h index 55b3c1d4cb..562cf15909 100644 --- a/xfa/src/fxfa/parser/xfa_basic_imp.h +++ b/xfa/src/fxfa/parser/xfa_basic_imp.h @@ -8,7 +8,7 @@ #define XFA_SRC_FXFA_PARSER_XFA_BASIC_IMP_H_ #include "xfa/include/fxfa/fxfa_basic.h" -#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/crt/fgas_stream.h" struct XFA_NOTSUREATTRIBUTE { XFA_ELEMENT eElement; diff --git a/xfa/src/fxfa/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/parser/xfa_document_serialize.cpp index 53f93f5f71..66a9b75e0c 100644 --- a/xfa/src/fxfa/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/parser/xfa_document_serialize.cpp @@ -6,7 +6,7 @@ #include "xfa/src/fxfa/parser/xfa_document_serialize.h" -#include "xfa/src/fgas/include/fx_cpg.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" #include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h" #include "xfa/src/fxfa/parser/xfa_docdata.h" #include "xfa/src/fxfa/parser/xfa_doclayout.h" diff --git a/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp index 16fe2da8ac..cdf327826b 100644 --- a/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp @@ -9,7 +9,7 @@ #include #include -#include "xfa/src/fgas/include/fx_alg.h" +#include "xfa/src/fgas/crt/fgas_algorithm.h" #include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h" #include "xfa/src/fxfa/parser/xfa_docdata.h" #include "xfa/src/fxfa/parser/xfa_doclayout.h" diff --git a/xfa/src/fxfa/parser/xfa_locale.h b/xfa/src/fxfa/parser/xfa_locale.h index 07953f290d..f4b128e67e 100644 --- a/xfa/src/fxfa/parser/xfa_locale.h +++ b/xfa/src/fxfa/parser/xfa_locale.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FXFA_PARSER_XFA_LOCALE_H_ #define XFA_SRC_FXFA_PARSER_XFA_LOCALE_H_ -#include "xfa/src/fgas/include/fx_locale.h" +#include "xfa/src/fgas/localization/fgas_locale.h" #include "xfa/src/fxfa/parser/xfa_object.h" class CXFA_XMLLocale : public IFX_Locale { diff --git a/xfa/src/fxfa/parser/xfa_localemgr.h b/xfa/src/fxfa/parser/xfa_localemgr.h index c76674c969..0af6f5f2d3 100644 --- a/xfa/src/fxfa/parser/xfa_localemgr.h +++ b/xfa/src/fxfa/parser/xfa_localemgr.h @@ -8,8 +8,8 @@ #define XFA_SRC_FXFA_PARSER_XFA_LOCALEMGR_H_ #include "xfa/include/fxfa/fxfa_objectacc.h" -#include "xfa/src/fgas/include/fx_datetime.h" -#include "xfa/src/fgas/include/fx_locale.h" +#include "xfa/src/fgas/localization/fgas_datetime.h" +#include "xfa/src/fgas/localization/fgas_locale.h" #include "xfa/src/fxfa/parser/xfa_localemgr.h" class CXFA_Node; diff --git a/xfa/src/fxfa/parser/xfa_object_imp.cpp b/xfa/src/fxfa/parser/xfa_object_imp.cpp index f2cea35ff4..23b0644074 100644 --- a/xfa/src/fxfa/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/parser/xfa_object_imp.cpp @@ -7,8 +7,8 @@ #include "xfa/src/fxfa/parser/xfa_object.h" #include "core/include/fxcrt/fx_ext.h" -#include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" +#include "xfa/src/fgas/crt/fgas_system.h" #include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h" #include "xfa/src/fxfa/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/parser/xfa_docdata.h" diff --git a/xfa/src/fxfa/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/parser/xfa_parser_imp.cpp index fe90f004b2..a3d4f94089 100644 --- a/xfa/src/fxfa/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/parser/xfa_parser_imp.cpp @@ -6,7 +6,7 @@ #include "xfa/src/fxfa/parser/xfa_parser_imp.h" -#include "xfa/src/fgas/include/fx_cpg.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" #include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h" #include "xfa/src/fxfa/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/parser/xfa_docdata.h" -- cgit v1.2.3