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

xfa/fwl/lightwidget/cfwl_barcode.h

Index: xfa/fwl/lightwidget/cfwl_barcode.h
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/fwl/lightwidget/cfwl_barcode.h
similarity index 95%
rename from xfa/include/fwl/lightwidget/barcode.h
rename to xfa/fwl/lightwidget/cfwl_barcode.h
index 2aa05a2a3c5237277b90d1d349eedf1f5bb2f97f..e1e7e658d58fc2c57632a54dab3aaa850f85fca7 100644
--- a/xfa/include/fwl/lightwidget/barcode.h
+++ b/xfa/fwl/lightwidget/cfwl_barcode.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
-#define XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
+#ifndef XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
+#define XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
 
 #include "xfa/fwl/basewidget/ifwl_barcode.h"
 #include "xfa/fwl/core/fwl_error.h"
-#include "xfa/include/fwl/lightwidget/edit.h"
+#include "xfa/fwl/lightwidget/cfwl_edit.h"
 
 class CFWL_Widget;
 class CFWL_WidgetProperties;
@@ -21,7 +21,6 @@ class CFWL_Barcode : public CFWL_Edit {
   void SetType(BC_TYPE type);
   FX_BOOL IsProtectedType();
 
- public:
   void SetCharEncoding(BC_CHAR_ENCODING encoding) {
     m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_CHARENCODING;
     m_barcodeData.m_eCharEncoding = encoding;
@@ -80,6 +79,7 @@ class CFWL_Barcode : public CFWL_Edit {
  protected:
   CFWL_Barcode();
   virtual ~CFWL_Barcode();
+
   class CFWL_BarcodeDP : public IFWL_BarcodeDP {
    public:
     virtual FWL_ERR GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption);
@@ -117,4 +117,4 @@ class CFWL_Barcode : public CFWL_Edit {
   CFWL_BarcodeDP m_barcodeData;
 };
 
-#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
+#endif  // XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_