From a52ab741019342fbca0468e43a01deb44fa5f1bd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 13:59:29 -0700 Subject: Move core/fxcrt/include to core/fxcrt BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2382723003 --- xfa/fxbarcode/BC_Dimension.h | 2 +- xfa/fxbarcode/BC_UtilCodingConvert.h | 2 +- xfa/fxbarcode/BC_Utils.cpp | 2 +- xfa/fxbarcode/BC_Writer.h | 2 +- xfa/fxbarcode/cbc_codabar.h | 4 ++-- xfa/fxbarcode/cbc_code128.h | 4 ++-- xfa/fxbarcode/cbc_code39.h | 4 ++-- xfa/fxbarcode/cbc_codebase.h | 2 +- xfa/fxbarcode/cbc_datamatrix.h | 4 ++-- xfa/fxbarcode/cbc_ean13.h | 4 ++-- xfa/fxbarcode/cbc_ean8.h | 4 ++-- xfa/fxbarcode/cbc_onecode.h | 4 ++-- xfa/fxbarcode/cbc_pdf417i.h | 4 ++-- xfa/fxbarcode/cbc_qrcode.h | 4 ++-- xfa/fxbarcode/cbc_upca.h | 4 ++-- xfa/fxbarcode/common/BC_CommonBitArray.h | 2 +- xfa/fxbarcode/common/BC_CommonBitMatrix.h | 2 +- xfa/fxbarcode/common/BC_CommonByteArray.h | 2 +- xfa/fxbarcode/common/BC_CommonByteMatrix.cpp | 2 +- xfa/fxbarcode/common/BC_CommonByteMatrix.h | 2 +- xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h | 2 +- xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h | 2 +- xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h | 2 +- xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h | 2 +- xfa/fxbarcode/datamatrix/BC_SymbolInfo.h | 4 ++-- xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h | 4 ++-- xfa/fxbarcode/oned/BC_OnedCode128Writer.h | 4 ++-- xfa/fxbarcode/oned/BC_OnedEAN13Writer.h | 4 ++-- xfa/fxbarcode/oned/BC_OnedEAN8Writer.h | 4 ++-- xfa/fxbarcode/oned/BC_OnedUPCAWriter.h | 4 ++-- xfa/fxbarcode/pdf417/BC_PDF417.h | 2 +- xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h | 2 +- xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h | 2 +- xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h | 2 +- xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h | 4 ++-- xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp | 2 +- xfa/fxbarcode/pdf417/BC_PDF417Writer.h | 4 ++-- xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp | 2 +- xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h | 2 +- xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h | 4 ++-- xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h | 2 +- xfa/fxbarcode/qrcode/BC_QRCoderMode.h | 2 +- xfa/fxbarcode/qrcode/BC_QRCoderVersion.h | 2 +- xfa/fxbarcode/utils.h | 2 +- 44 files changed, 63 insertions(+), 63 deletions(-) (limited to 'xfa/fxbarcode') diff --git a/xfa/fxbarcode/BC_Dimension.h b/xfa/fxbarcode/BC_Dimension.h index 2dd37683a0..2050b0faaf 100644 --- a/xfa/fxbarcode/BC_Dimension.h +++ b/xfa/fxbarcode/BC_Dimension.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CBC_Dimension { public: diff --git a/xfa/fxbarcode/BC_UtilCodingConvert.h b/xfa/fxbarcode/BC_UtilCodingConvert.h index ea36d481b6..698cd857d7 100644 --- a/xfa/fxbarcode/BC_UtilCodingConvert.h +++ b/xfa/fxbarcode/BC_UtilCodingConvert.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_BC_UTILCODINGCONVERT_H_ #define XFA_FXBARCODE_BC_UTILCODINGCONVERT_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_UtilCodingConvert { public: diff --git a/xfa/fxbarcode/BC_Utils.cpp b/xfa/fxbarcode/BC_Utils.cpp index ccc620218a..d750f9d6fe 100644 --- a/xfa/fxbarcode/BC_Utils.cpp +++ b/xfa/fxbarcode/BC_Utils.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "xfa/fxbarcode/utils.h" FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst, diff --git a/xfa/fxbarcode/BC_Writer.h b/xfa/fxbarcode/BC_Writer.h index 9b5d037335..8e4eaf1f5e 100644 --- a/xfa/fxbarcode/BC_Writer.h +++ b/xfa/fxbarcode/BC_Writer.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_BC_WRITER_H_ #define XFA_FXBARCODE_BC_WRITER_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/utils.h" diff --git a/xfa/fxbarcode/cbc_codabar.h b/xfa/fxbarcode/cbc_codabar.h index 9f83d8bb53..b0a587b2d9 100644 --- a/xfa/fxbarcode/cbc_codabar.h +++ b/xfa/fxbarcode/cbc_codabar.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_CODABAR_H_ #define XFA_FXBARCODE_CBC_CODABAR_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" diff --git a/xfa/fxbarcode/cbc_code128.h b/xfa/fxbarcode/cbc_code128.h index 05ef125e1b..2088bdd714 100644 --- a/xfa/fxbarcode/cbc_code128.h +++ b/xfa/fxbarcode/cbc_code128.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_CODE128_H_ #define XFA_FXBARCODE_CBC_CODE128_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" diff --git a/xfa/fxbarcode/cbc_code39.h b/xfa/fxbarcode/cbc_code39.h index 104ec4a217..51f1759ca0 100644 --- a/xfa/fxbarcode/cbc_code39.h +++ b/xfa/fxbarcode/cbc_code39.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_CODE39_H_ #define XFA_FXBARCODE_CBC_CODE39_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" diff --git a/xfa/fxbarcode/cbc_codebase.h b/xfa/fxbarcode/cbc_codebase.h index f13c15395f..a6448db741 100644 --- a/xfa/fxbarcode/cbc_codebase.h +++ b/xfa/fxbarcode/cbc_codebase.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/include/BC_Library.h" diff --git a/xfa/fxbarcode/cbc_datamatrix.h b/xfa/fxbarcode/cbc_datamatrix.h index 8edd1a90f7..51d7c3d3f9 100644 --- a/xfa/fxbarcode/cbc_datamatrix.h +++ b/xfa/fxbarcode/cbc_datamatrix.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_DATAMATRIX_H_ #define XFA_FXBARCODE_CBC_DATAMATRIX_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_codebase.h" diff --git a/xfa/fxbarcode/cbc_ean13.h b/xfa/fxbarcode/cbc_ean13.h index 02497a7159..fae8c50915 100644 --- a/xfa/fxbarcode/cbc_ean13.h +++ b/xfa/fxbarcode/cbc_ean13.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_EAN13_H_ #define XFA_FXBARCODE_CBC_EAN13_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" diff --git a/xfa/fxbarcode/cbc_ean8.h b/xfa/fxbarcode/cbc_ean8.h index d82e9cd726..c345af3a9c 100644 --- a/xfa/fxbarcode/cbc_ean8.h +++ b/xfa/fxbarcode/cbc_ean8.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_EAN8_H_ #define XFA_FXBARCODE_CBC_EAN8_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" diff --git a/xfa/fxbarcode/cbc_onecode.h b/xfa/fxbarcode/cbc_onecode.h index 20b9e12797..f6c992bde1 100644 --- a/xfa/fxbarcode/cbc_onecode.h +++ b/xfa/fxbarcode/cbc_onecode.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_ONECODE_H_ #define XFA_FXBARCODE_CBC_ONECODE_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/cbc_codebase.h" class CFX_DIBitmap; diff --git a/xfa/fxbarcode/cbc_pdf417i.h b/xfa/fxbarcode/cbc_pdf417i.h index d69562d3e5..ca6ac11b26 100644 --- a/xfa/fxbarcode/cbc_pdf417i.h +++ b/xfa/fxbarcode/cbc_pdf417i.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_PDF417I_H_ #define XFA_FXBARCODE_CBC_PDF417I_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_codebase.h" diff --git a/xfa/fxbarcode/cbc_qrcode.h b/xfa/fxbarcode/cbc_qrcode.h index 42fc50f22a..e8c9ced56e 100644 --- a/xfa/fxbarcode/cbc_qrcode.h +++ b/xfa/fxbarcode/cbc_qrcode.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_QRCODE_H_ #define XFA_FXBARCODE_CBC_QRCODE_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_codebase.h" diff --git a/xfa/fxbarcode/cbc_upca.h b/xfa/fxbarcode/cbc_upca.h index aa1afc44f7..7e869b6ace 100644 --- a/xfa/fxbarcode/cbc_upca.h +++ b/xfa/fxbarcode/cbc_upca.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_CBC_UPCA_H_ #define XFA_FXBARCODE_CBC_UPCA_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" diff --git a/xfa/fxbarcode/common/BC_CommonBitArray.h b/xfa/fxbarcode/common/BC_CommonBitArray.h index 04cb96b752..6955d5b288 100644 --- a/xfa/fxbarcode/common/BC_CommonBitArray.h +++ b/xfa/fxbarcode/common/BC_CommonBitArray.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_CommonBitArray { public: diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/fxbarcode/common/BC_CommonBitMatrix.h index 48a26b9f8c..98291f0130 100644 --- a/xfa/fxbarcode/common/BC_CommonBitMatrix.h +++ b/xfa/fxbarcode/common/BC_CommonBitMatrix.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CBC_CommonBitArray; diff --git a/xfa/fxbarcode/common/BC_CommonByteArray.h b/xfa/fxbarcode/common/BC_CommonByteArray.h index cdda41b4fd..bdac6a6963 100644 --- a/xfa/fxbarcode/common/BC_CommonByteArray.h +++ b/xfa/fxbarcode/common/BC_CommonByteArray.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_ #define XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" // TODO(weili): The usage of this class should be replaced by // std::vector. diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp index 234b384d7a..0e7ce80e29 100644 --- a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp +++ b/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_memory.h" #include "xfa/fxbarcode/common/BC_CommonByteMatrix.h" CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) { diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/fxbarcode/common/BC_CommonByteMatrix.h index 9bc2a88e8a..13cf5c330e 100644 --- a/xfa/fxbarcode/common/BC_CommonByteMatrix.h +++ b/xfa/fxbarcode/common/BC_CommonByteMatrix.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CBC_CommonByteMatrix { public: diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h index 695da46c79..34e94fb0fd 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_ #define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_ReedSolomonGF256; class CBC_ReedSolomonGF256Poly; diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h index ec0f1ff549..16f1ad17f7 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "xfa/fxbarcode/utils.h" class CBC_ReedSolomonGF256Poly; diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h index 03580c2350..3e840f528b 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_ #define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_ReedSolomonGF256; diff --git a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h index f86cacee66..f9b44621b1 100644 --- a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h +++ b/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_ #define XFA_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_DefaultPlacement { public: diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h index 96196da21c..b5778d5a3a 100644 --- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h +++ b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_ #define XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h" class CBC_Dimension; diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h index 02b6b66bea..8eb20fa754 100644 --- a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h +++ b/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_ #define XFA_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h b/xfa/fxbarcode/oned/BC_OnedCode128Writer.h index 9d2285f0c6..7c85af102d 100644 --- a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h +++ b/xfa/fxbarcode/oned/BC_OnedCode128Writer.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_ #define XFA_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" class CBC_OnedCode128Writer : public CBC_OneDimWriter { diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h index b2b85d20e9..f30a74fda0 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h +++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_ #define XFA_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" class CFX_DIBitmap; diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h index dab1b25de0..d6a293a250 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h +++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_ #define XFA_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h index b38a235076..8575572820 100644 --- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h +++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h @@ -9,8 +9,8 @@ #include -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" class CBC_OnedEAN13Writer; diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.h b/xfa/fxbarcode/pdf417/BC_PDF417.h index eeffc1e6ee..c3a9f4c477 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h" class CBC_BarcodeRow; diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h index 16da60f5cd..853b9eea98 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_ #define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_BarcodeRow; diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h index 9bf1b3cbce..4325acc05f 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_ #define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_BarcodeRow { public: diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h index 20717b118b..6822ae4e11 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CBC_PDF417ErrorCorrection { public: diff --git a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h index 29c56174a5..fb7664d4a3 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_ #define XFA_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h" class CBC_PDF417HighLevelEncoder { diff --git a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp index 92d1e5682d..a1b753e3ee 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp +++ b/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" #include "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h b/xfa/fxbarcode/pdf417/BC_PDF417Writer.h index e16c51474e..12b8e8baa9 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Writer.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_PDF417_BC_PDF417WRITER_H_ #define XFA_FXBARCODE_PDF417_BC_PDF417WRITER_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fxbarcode/BC_TwoDimWriter.h" class CBC_PDF417Writer : public CBC_TwoDimWriter { diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp index b928b0a857..c770c15392 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp +++ b/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_memory.h" #include "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h" #include "xfa/fxbarcode/utils.h" diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h index cd1539a7b7..a428f06355 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_ #define XFA_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_QRCoderECB; diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h index be0a76c337..6303d7c1c5 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h @@ -7,8 +7,8 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_ #define XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" class CBC_QRCoder; class CBC_QRCoderErrorCorrectionLevel; diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h index a5fdb0808c..e433ee1127 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_ #define XFA_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CBC_QRCoderErrorCorrectionLevel { public: diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/fxbarcode/qrcode/BC_QRCoderMode.h index 63048dca43..f876d81f03 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderMode.h @@ -11,7 +11,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CBC_QRCoderVersion; diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h index deae8933e6..43b4b6062e 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_ #define XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CBC_CommonBitMatrix; class CBC_QRCoderECBlocks; diff --git a/xfa/fxbarcode/utils.h b/xfa/fxbarcode/utils.h index dadf34859d..b4474501a7 100644 --- a/xfa/fxbarcode/utils.h +++ b/xfa/fxbarcode/utils.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_UTILS_H_ #define XFA_FXBARCODE_UTILS_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" typedef CFX_MapPtrTemplate CFX_PtrToInt32; FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst, -- cgit v1.2.3