From fb5055947efd78e0e7f8a2bfd5b754c63dbb6076 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 20 Oct 2016 06:44:03 -0700 Subject: Merge the CFWL_*Imp classes into the IFWL_* classes. This Cl merges the implementation classes up into the IFWL classes as the intermediate classes were just acting as proxies. Review-Url: https://chromiumcodereview.appspot.com/2432423002 --- xfa/fwl/theme/cfwl_barcodetp.cpp | 2 +- xfa/fwl/theme/cfwl_carettp.cpp | 2 +- xfa/fwl/theme/cfwl_checkboxtp.cpp | 2 +- xfa/fwl/theme/cfwl_comboboxtp.cpp | 2 +- xfa/fwl/theme/cfwl_datetimepickertp.cpp | 2 +- xfa/fwl/theme/cfwl_edittp.cpp | 2 +- xfa/fwl/theme/cfwl_listboxtp.cpp | 2 +- xfa/fwl/theme/cfwl_monthcalendartp.cpp | 2 +- xfa/fwl/theme/cfwl_pictureboxtp.cpp | 2 +- xfa/fwl/theme/cfwl_pushbuttontp.cpp | 2 +- xfa/fwl/theme/cfwl_scrollbartp.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'xfa/fwl/theme') diff --git a/xfa/fwl/theme/cfwl_barcodetp.cpp b/xfa/fwl/theme/cfwl_barcodetp.cpp index 609add6c0e..c6cc79e488 100644 --- a/xfa/fwl/theme/cfwl_barcodetp.cpp +++ b/xfa/fwl/theme/cfwl_barcodetp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_barcodetp.h" -#include "xfa/fwl/basewidget/ifwl_barcode.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_barcode.h" #include "xfa/fwl/core/ifwl_widget.h" CFWL_BarcodeTP::CFWL_BarcodeTP() {} diff --git a/xfa/fwl/theme/cfwl_carettp.cpp b/xfa/fwl/theme/cfwl_carettp.cpp index b517172fff..28d606a2f3 100644 --- a/xfa/fwl/theme/cfwl_carettp.cpp +++ b/xfa/fwl/theme/cfwl_carettp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_carettp.h" -#include "xfa/fwl/basewidget/ifwl_caret.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_caret.h" #include "xfa/fwl/core/ifwl_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 2eef204a25..b3dffdccf8 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp @@ -8,9 +8,9 @@ #include "core/fxge/cfx_pathdata.h" #include "xfa/fde/tto/fde_textout.h" -#include "xfa/fwl/basewidget/ifwl_checkbox.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themetext.h" +#include "xfa/fwl/core/ifwl_checkbox.h" #include "xfa/fwl/core/ifwl_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 9fdb776820..d322a8e793 100644 --- a/xfa/fwl/theme/cfwl_comboboxtp.cpp +++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_comboboxtp.h" -#include "xfa/fwl/basewidget/ifwl_combobox.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_combobox.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.cpp b/xfa/fwl/theme/cfwl_datetimepickertp.cpp index d43694c6db..36738d9a59 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/basewidget/ifwl_datetimepicker.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_datetimepicker.h" CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() {} diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index 97f2fbc95c..ca37f0c7e8 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_edittp.h" -#include "xfa/fwl/basewidget/ifwl_edit.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_edit.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxfa/app/xfa_fwltheme.h" #include "xfa/fxfa/xfa_ffwidget.h" diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp index 1d381a4280..69fc0719f8 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.cpp +++ b/xfa/fwl/theme/cfwl_listboxtp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_listboxtp.h" -#include "xfa/fwl/basewidget/ifwl_listbox.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_listbox.h" #include "xfa/fwl/core/ifwl_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 3cbe007b5f..01d2854c2d 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp @@ -7,9 +7,9 @@ #include "xfa/fwl/theme/cfwl_monthcalendartp.h" #include "xfa/fde/tto/fde_textout.h" -#include "xfa/fwl/basewidget/ifwl_monthcalendar.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themetext.h" +#include "xfa/fwl/core/ifwl_monthcalendar.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" diff --git a/xfa/fwl/theme/cfwl_pictureboxtp.cpp b/xfa/fwl/theme/cfwl_pictureboxtp.cpp index 439082b052..2604156e41 100644 --- a/xfa/fwl/theme/cfwl_pictureboxtp.cpp +++ b/xfa/fwl/theme/cfwl_pictureboxtp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_pictureboxtp.h" -#include "xfa/fwl/basewidget/ifwl_picturebox.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_picturebox.h" #include "xfa/fwl/core/ifwl_widget.h" CFWL_PictureBoxTP::CFWL_PictureBoxTP() {} diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp index 982a6f4b6d..62b8ffef65 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp +++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_pushbuttontp.h" -#include "xfa/fwl/basewidget/ifwl_pushbutton.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_pushbutton.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp index 40d55786fe..e680bdd6db 100644 --- a/xfa/fwl/theme/cfwl_scrollbartp.cpp +++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp @@ -6,8 +6,8 @@ #include "xfa/fwl/theme/cfwl_scrollbartp.h" -#include "xfa/fwl/basewidget/ifwl_scrollbar.h" #include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/ifwl_scrollbar.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" -- cgit v1.2.3