Move xfa/include/fwl/{theme,lightwidget} to xfa/fwl

xfa/fwl/lightwidget/cfwl_app.cpp

Index: xfa/fwl/lightwidget/cfwl_app.cpp
diff --git a/xfa/fwl/lightwidget/app.cpp b/xfa/fwl/lightwidget/cfwl_app.cpp
similarity index 88%
rename from xfa/fwl/lightwidget/app.cpp
rename to xfa/fwl/lightwidget/cfwl_app.cpp
index 1d5b7d6f8fdc182b57aabff1d40e7edad3f90b2b..c09e5c0a262afd85946c7559fb9622abff67eb51 100644
--- a/xfa/fwl/lightwidget/app.cpp
+++ b/xfa/fwl/lightwidget/cfwl_app.cpp
@@ -4,28 +4,30 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/include/fwl/lightwidget/app.h"
+#include "xfa/fwl/lightwidget/cfwl_app.h"
 
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "xfa/fwl/core/fwl_error.h"
 #include "xfa/fwl/core/ifwl_app.h"
-#include "xfa/include/fwl/lightwidget/theme.h"
+#include "xfa/fwl/lightwidget/cfwl_theme.h"
 
 CFWL_App::CFWL_App() : m_pIface(IFWL_App::Create(nullptr)), m_pTheme(nullptr) {}
+
 CFWL_App::~CFWL_App() {
   if (m_pTheme) {
     m_pTheme->Finalize();
     delete m_pTheme;
-    m_pTheme = NULL;
   }
   m_pIface->Release();
 }
+
 FWL_ERR CFWL_App::Initialize() {
   m_pTheme = new CFWL_Theme;
   m_pTheme->Initialize();
   m_pIface->SetThemeProvider(m_pTheme);
   return m_pIface->Initialize();
 }
+
 FWL_ERR CFWL_App::Exit(int32_t iExitCode) {
   if (!m_pIface)
     return FWL_ERR_Indefinite;