From 447b1f3ffc7e0df233d15300bbf8a85ce2bc7278 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 8 Dec 2016 10:06:32 -0800 Subject: Move xfa/fwl/core to xfa/fwl. The core/ directory in FWL no-longer provides any context. This Cl moves all of the core/ files up to the fwl/ folder. As well, the CFWL_EvtFoo files are renamed CFWL_EventFoo and the CFWL_MsgFoo files are renamed CFWL_MessageFoo. The event and message preceed the type in order to keep the files sorted together and to make it clear that they're all related. Review-Url: https://codereview.chromium.org/2559173002 --- xfa/fwl/theme/cfwl_barcodetp.cpp | 6 +++--- xfa/fwl/theme/cfwl_carettp.cpp | 6 +++--- xfa/fwl/theme/cfwl_checkboxtp.cpp | 8 ++++---- xfa/fwl/theme/cfwl_comboboxtp.cpp | 8 ++++---- xfa/fwl/theme/cfwl_datetimepickertp.cpp | 4 ++-- xfa/fwl/theme/cfwl_edittp.cpp | 6 +++--- xfa/fwl/theme/cfwl_listboxtp.cpp | 6 +++--- xfa/fwl/theme/cfwl_monthcalendartp.cpp | 10 +++++----- xfa/fwl/theme/cfwl_pictureboxtp.cpp | 6 +++--- xfa/fwl/theme/cfwl_pushbuttontp.cpp | 8 ++++---- xfa/fwl/theme/cfwl_scrollbartp.cpp | 8 ++++---- xfa/fwl/theme/cfwl_widgettp.cpp | 12 ++++++------ xfa/fwl/theme/cfwl_widgettp.h | 2 +- 13 files changed, 45 insertions(+), 45 deletions(-) (limited to 'xfa/fwl/theme') diff --git a/xfa/fwl/theme/cfwl_barcodetp.cpp b/xfa/fwl/theme/cfwl_barcodetp.cpp index 96112e209b..f123857e51 100644 --- a/xfa/fwl/theme/cfwl_barcodetp.cpp +++ b/xfa/fwl/theme/cfwl_barcodetp.cpp @@ -6,9 +6,9 @@ #include "xfa/fwl/theme/cfwl_barcodetp.h" -#include "xfa/fwl/core/cfwl_barcode.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" +#include "xfa/fwl/cfwl_barcode.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" CFWL_BarcodeTP::CFWL_BarcodeTP() {} diff --git a/xfa/fwl/theme/cfwl_carettp.cpp b/xfa/fwl/theme/cfwl_carettp.cpp index ff8c036ecb..63d6270f77 100644 --- a/xfa/fwl/theme/cfwl_carettp.cpp +++ b/xfa/fwl/theme/cfwl_carettp.cpp @@ -6,9 +6,9 @@ #include "xfa/fwl/theme/cfwl_carettp.h" -#include "xfa/fwl/core/cfwl_caret.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" +#include "xfa/fwl/cfwl_caret.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 5ea849e089..4ff2ccd2a6 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp @@ -8,10 +8,10 @@ #include "core/fxge/cfx_pathdata.h" #include "xfa/fde/tto/fde_textout.h" -#include "xfa/fwl/core/cfwl_checkbox.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_themetext.h" -#include "xfa/fwl/core/cfwl_widget.h" +#include "xfa/fwl/cfwl_checkbox.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_themetext.h" +#include "xfa/fwl/cfwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_comboboxtp.cpp b/xfa/fwl/theme/cfwl_comboboxtp.cpp index 8b4041b729..3e06e665ae 100644 --- a/xfa/fwl/theme/cfwl_comboboxtp.cpp +++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp @@ -6,10 +6,10 @@ #include "xfa/fwl/theme/cfwl_comboboxtp.h" -#include "xfa/fwl/core/cfwl_combobox.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" -#include "xfa/fwl/core/ifwl_themeprovider.h" +#include "xfa/fwl/cfwl_combobox.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" +#include "xfa/fwl/ifwl_themeprovider.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.cpp b/xfa/fwl/theme/cfwl_datetimepickertp.cpp index 3b5befb65c..ef8d0c869b 100644 --- a/xfa/fwl/theme/cfwl_datetimepickertp.cpp +++ b/xfa/fwl/theme/cfwl_datetimepickertp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_datetimepickertp.h" -#include "xfa/fwl/core/cfwl_datetimepicker.h" -#include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_datetimepicker.h" +#include "xfa/fwl/cfwl_themebackground.h" CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() {} diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index bd12939fc0..f2fc5cb7a3 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -6,9 +6,9 @@ #include "xfa/fwl/theme/cfwl_edittp.h" -#include "xfa/fwl/core/cfwl_edit.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" +#include "xfa/fwl/cfwl_edit.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" #include "xfa/fxfa/app/xfa_fwltheme.h" #include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp index 8356820606..6f082a8729 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.cpp +++ b/xfa/fwl/theme/cfwl_listboxtp.cpp @@ -6,9 +6,9 @@ #include "xfa/fwl/theme/cfwl_listboxtp.h" -#include "xfa/fwl/core/cfwl_listbox.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" +#include "xfa/fwl/cfwl_listbox.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp index d090e70c9d..3684e77c66 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp @@ -7,11 +7,11 @@ #include "xfa/fwl/theme/cfwl_monthcalendartp.h" #include "xfa/fde/tto/fde_textout.h" -#include "xfa/fwl/core/cfwl_monthcalendar.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_themetext.h" -#include "xfa/fwl/core/cfwl_widget.h" -#include "xfa/fwl/core/ifwl_themeprovider.h" +#include "xfa/fwl/cfwl_monthcalendar.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_themetext.h" +#include "xfa/fwl/cfwl_widget.h" +#include "xfa/fwl/ifwl_themeprovider.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_pictureboxtp.cpp b/xfa/fwl/theme/cfwl_pictureboxtp.cpp index 600de0e355..75c60387b4 100644 --- a/xfa/fwl/theme/cfwl_pictureboxtp.cpp +++ b/xfa/fwl/theme/cfwl_pictureboxtp.cpp @@ -6,9 +6,9 @@ #include "xfa/fwl/theme/cfwl_pictureboxtp.h" -#include "xfa/fwl/core/cfwl_picturebox.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" +#include "xfa/fwl/cfwl_picturebox.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" CFWL_PictureBoxTP::CFWL_PictureBoxTP() {} diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp index 3b37b613aa..31f6b7ade1 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp +++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp @@ -6,10 +6,10 @@ #include "xfa/fwl/theme/cfwl_pushbuttontp.h" -#include "xfa/fwl/core/cfwl_pushbutton.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" -#include "xfa/fwl/core/ifwl_themeprovider.h" +#include "xfa/fwl/cfwl_pushbutton.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" +#include "xfa/fwl/ifwl_themeprovider.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp index 19022cad26..0129f353ad 100644 --- a/xfa/fwl/theme/cfwl_scrollbartp.cpp +++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp @@ -6,10 +6,10 @@ #include "xfa/fwl/theme/cfwl_scrollbartp.h" -#include "xfa/fwl/core/cfwl_scrollbar.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_widget.h" -#include "xfa/fwl/core/ifwl_themeprovider.h" +#include "xfa/fwl/cfwl_scrollbar.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_widget.h" +#include "xfa/fwl/ifwl_themeprovider.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index d578435d8a..efc1e96335 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -12,12 +12,12 @@ #include "xfa/fde/tto/fde_textout.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_gefont.h" -#include "xfa/fwl/core/cfwl_themebackground.h" -#include "xfa/fwl/core/cfwl_themepart.h" -#include "xfa/fwl/core/cfwl_themetext.h" -#include "xfa/fwl/core/cfwl_widget.h" -#include "xfa/fwl/core/cfwl_widgetmgr.h" -#include "xfa/fwl/core/ifwl_themeprovider.h" +#include "xfa/fwl/cfwl_themebackground.h" +#include "xfa/fwl/cfwl_themepart.h" +#include "xfa/fwl/cfwl_themetext.h" +#include "xfa/fwl/cfwl_widget.h" +#include "xfa/fwl/cfwl_widgetmgr.h" +#include "xfa/fwl/ifwl_themeprovider.h" #include "xfa/fwl/theme/cfwl_arrowdata.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 998d3c76e8..761cc89415 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -12,7 +12,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "xfa/fwl/core/fwl_error.h" +#include "xfa/fwl/fwl_error.h" #include "xfa/fwl/theme/cfwl_utils.h" #include "xfa/fxgraphics/cfx_graphics.h" -- cgit v1.2.3