From 398a43d83174d75366da57726ff81f199f04e24c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:51:01 -0400 Subject: Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}. This CL moves and splits the FWL files from the core and basewidget directories into the non-include folders. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1827923002 . --- xfa/fwl/lightwidget/app.cpp | 4 ++-- xfa/fwl/lightwidget/caret.cpp | 2 +- xfa/fwl/lightwidget/checkbox.cpp | 2 +- xfa/fwl/lightwidget/combobox.cpp | 4 ++-- xfa/fwl/lightwidget/datetimepicker.cpp | 7 +++---- xfa/fwl/lightwidget/edit.cpp | 2 +- xfa/fwl/lightwidget/scrollbar.cpp | 2 +- xfa/fwl/lightwidget/theme.cpp | 3 +++ xfa/fwl/lightwidget/widget.cpp | 5 +++-- 9 files changed, 17 insertions(+), 14 deletions(-) (limited to 'xfa/fwl/lightwidget') diff --git a/xfa/fwl/lightwidget/app.cpp b/xfa/fwl/lightwidget/app.cpp index ca6462a2a6..1d5b7d6f8f 100644 --- a/xfa/fwl/lightwidget/app.cpp +++ b/xfa/fwl/lightwidget/app.cpp @@ -7,8 +7,8 @@ #include "xfa/include/fwl/lightwidget/app.h" #include "core/fxcrt/include/fx_coordinates.h" -#include "xfa/include/fwl/core/fwl_app.h" -#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/fwl/core/fwl_error.h" +#include "xfa/fwl/core/ifwl_app.h" #include "xfa/include/fwl/lightwidget/theme.h" CFWL_App::CFWL_App() : m_pIface(IFWL_App::Create(nullptr)), m_pTheme(nullptr) {} diff --git a/xfa/fwl/lightwidget/caret.cpp b/xfa/fwl/lightwidget/caret.cpp index b81c6c2b08..5415aa5560 100644 --- a/xfa/fwl/lightwidget/caret.cpp +++ b/xfa/fwl/lightwidget/caret.cpp @@ -8,9 +8,9 @@ #include +#include "xfa/fwl/basewidget/ifwl_caret.h" #include "xfa/fwl/core/fwl_targetimp.h" #include "xfa/fxgraphics/cfx_color.h" -#include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/lightwidget/edit.h" CFWL_Caret* CFWL_Caret::Create() { diff --git a/xfa/fwl/lightwidget/checkbox.cpp b/xfa/fwl/lightwidget/checkbox.cpp index 6b7a370973..1d921993d6 100644 --- a/xfa/fwl/lightwidget/checkbox.cpp +++ b/xfa/fwl/lightwidget/checkbox.cpp @@ -8,7 +8,7 @@ #include -#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/fwl/core/fwl_error.h" CFWL_CheckBox* CFWL_CheckBox::Create() { return new CFWL_CheckBox; diff --git a/xfa/fwl/lightwidget/combobox.cpp b/xfa/fwl/lightwidget/combobox.cpp index aadb0d5ab6..7ea1370341 100644 --- a/xfa/fwl/lightwidget/combobox.cpp +++ b/xfa/fwl/lightwidget/combobox.cpp @@ -8,8 +8,8 @@ #include -#include "xfa/include/fwl/core/fwl_error.h" -#include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/fwl/core/fwl_error.h" +#include "xfa/fwl/core/ifwl_widget.h" CFWL_ComboBox* CFWL_ComboBox::Create() { return new CFWL_ComboBox; diff --git a/xfa/fwl/lightwidget/datetimepicker.cpp b/xfa/fwl/lightwidget/datetimepicker.cpp index bf1d976d90..3372c53829 100644 --- a/xfa/fwl/lightwidget/datetimepicker.cpp +++ b/xfa/fwl/lightwidget/datetimepicker.cpp @@ -8,10 +8,9 @@ #include -#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" -#include "xfa/include/fwl/core/fwl_error.h" -#include "xfa/include/fwl/core/fwl_note.h" -#include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/fwl/basewidget/ifwl_datetimepicker.h" +#include "xfa/fwl/core/fwl_error.h" +#include "xfa/fwl/core/ifwl_widget.h" CFWL_DateTimePicker* CFWL_DateTimePicker::Create() { return new CFWL_DateTimePicker; diff --git a/xfa/fwl/lightwidget/edit.cpp b/xfa/fwl/lightwidget/edit.cpp index 303943a8f6..612d5a4ac2 100644 --- a/xfa/fwl/lightwidget/edit.cpp +++ b/xfa/fwl/lightwidget/edit.cpp @@ -9,7 +9,7 @@ #include #include -#include "xfa/include/fwl/basewidget/fwl_edit.h" +#include "xfa/fwl/basewidget/ifwl_edit.h" CFWL_Edit* CFWL_Edit::Create() { return new CFWL_Edit; diff --git a/xfa/fwl/lightwidget/scrollbar.cpp b/xfa/fwl/lightwidget/scrollbar.cpp index cc927e724e..a070483183 100644 --- a/xfa/fwl/lightwidget/scrollbar.cpp +++ b/xfa/fwl/lightwidget/scrollbar.cpp @@ -8,7 +8,7 @@ #include -#include "xfa/include/fwl/basewidget/fwl_scrollbar.h" +#include "xfa/fwl/basewidget/ifwl_scrollbar.h" CFWL_ScrollBar* CFWL_ScrollBar::Create() { return new CFWL_ScrollBar; diff --git a/xfa/fwl/lightwidget/theme.cpp b/xfa/fwl/lightwidget/theme.cpp index fe9f55928b..950d70e944 100644 --- a/xfa/fwl/lightwidget/theme.cpp +++ b/xfa/fwl/lightwidget/theme.cpp @@ -8,6 +8,9 @@ #include +#include "xfa/fwl/core/cfwl_themebackground.h" +#include "xfa/fwl/core/cfwl_themepart.h" +#include "xfa/fwl/core/cfwl_themetext.h" #include "xfa/include/fwl/theme/barcodetp.h" #include "xfa/include/fwl/theme/carettp.h" #include "xfa/include/fwl/theme/checkboxtp.h" diff --git a/xfa/fwl/lightwidget/widget.cpp b/xfa/fwl/lightwidget/widget.cpp index daaab3c300..ae1f147502 100644 --- a/xfa/fwl/lightwidget/widget.cpp +++ b/xfa/fwl/lightwidget/widget.cpp @@ -7,13 +7,14 @@ #include "xfa/include/fwl/lightwidget/widget.h" #include "xfa/fde/tto/fde_textout.h" +#include "xfa/fwl/core/cfwl_themetext.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/fwl_targetimp.h" #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/fwl_widgetmgrimp.h" -#include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/include/fwl/core/fwl_thread.h" +#include "xfa/fwl/core/ifwl_notethread.h" +#include "xfa/fwl/core/ifwl_themeprovider.h" CFWL_WidgetImpProperties CFWL_WidgetProperties::MakeWidgetImpProperties( IFWL_DataProvider* pDataProvider) const { -- cgit v1.2.3