From a8a28e0702a1874d29d3c9f2b155bce1557eb4fd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:41:39 -0400 Subject: Move core/include/fxcrt to core/fxcrt/include. This CL moves the fxcrt code into the core/fxcrt directory. The only exception was fx_bidi.h which was moved into core/fxcrt as it is not used outside of core/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1825953002 . --- xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h | 2 +- xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h | 2 +- xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h | 2 +- xfa/fxbarcode/qrcode/BC_QRCodeReader.h | 2 +- xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp | 2 +- xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h | 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/qrcode/BC_QRDataBlock.h | 2 +- xfa/fxbarcode/qrcode/BC_QRDataMask.h | 2 +- xfa/fxbarcode/qrcode/BC_QRDetector.h | 2 +- xfa/fxbarcode/qrcode/BC_QRDetectorResult.h | 2 +- xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp | 2 +- xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h | 2 +- xfa/fxbarcode/qrcode/BC_QRGridSampler.h | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) (limited to 'xfa/fxbarcode/qrcode') diff --git a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h index 0acb106856..1091d6723d 100644 --- a/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h +++ b/xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_ #define XFA_FXBARCODE_QRCODE_BC_FINDERPATTERNINFO_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_QRFinderPattern; diff --git a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h index 0b1a2a7ca7..d227708fd8 100644 --- a/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h +++ b/xfa/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_ #define XFA_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERNFINDER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/utils.h" class CBC_CommonBitMatrix; diff --git a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h index 6bb1064cd2..66b28d924b 100644 --- a/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h +++ b/xfa/fxbarcode/qrcode/BC_QRBitMatrixParser.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_ #define XFA_FXBARCODE_QRCODE_BC_QRBITMATRIXPARSER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; class CBC_QRCoderVersion; diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeReader.h b/xfa/fxbarcode/qrcode/BC_QRCodeReader.h index 72dd453953..c11ccd1f26 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCodeReader.h +++ b/xfa/fxbarcode/qrcode/BC_QRCodeReader.h @@ -9,7 +9,7 @@ #include -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" #include "xfa/fxbarcode/BC_Reader.h" class CBC_BinaryBitmap; diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp index a225f61fbb..b928b0a857 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/include/fxcrt/fx_memory.h" +#include "core/fxcrt/include/fx_memory.h" #include "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h" #include "xfa/fxbarcode/utils.h" diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h index b6c381cc9d..3a588b6293 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderDecoder.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_ #define XFA_FXBARCODE_QRCODE_BC_QRCODERDECODER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; class CBC_ReedSolomonDecoder; diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h index c1a5b34194..5209a5f8d8 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/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_QRCoderECB; diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h index 8330dc2d1a..bbdec5bf1e 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/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/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 377137ae91..9b3a256c07 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/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" class CBC_QRCoderErrorCorrectionLevel { private: diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/fxbarcode/qrcode/BC_QRCoderMode.h index e36f7a13b5..91a991f898 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderMode.h @@ -9,7 +9,7 @@ #include -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" class CBC_QRCoderVersion; diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h index dd2b0c6be8..0cbace0251 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/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_QRCoderECBlocks; class CBC_CommonBitMatrix; diff --git a/xfa/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/fxbarcode/qrcode/BC_QRDataBlock.h index 8e11ab845c..873904f7c6 100644 --- a/xfa/fxbarcode/qrcode/BC_QRDataBlock.h +++ b/xfa/fxbarcode/qrcode/BC_QRDataBlock.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_ #define XFA_FXBARCODE_QRCODE_BC_QRDATABLOCK_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_QRCoderVersion; class CBC_QRCoderErrorCorrectionLevel; diff --git a/xfa/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/fxbarcode/qrcode/BC_QRDataMask.h index 5893149d3b..88aa1140ea 100644 --- a/xfa/fxbarcode/qrcode/BC_QRDataMask.h +++ b/xfa/fxbarcode/qrcode/BC_QRDataMask.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRDATAMASK_H_ #define XFA_FXBARCODE_QRCODE_BC_QRDATAMASK_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; diff --git a/xfa/fxbarcode/qrcode/BC_QRDetector.h b/xfa/fxbarcode/qrcode/BC_QRDetector.h index 4c171847cb..91eed25415 100644 --- a/xfa/fxbarcode/qrcode/BC_QRDetector.h +++ b/xfa/fxbarcode/qrcode/BC_QRDetector.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRDETECTOR_H_ #define XFA_FXBARCODE_QRCODE_BC_QRDETECTOR_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_ResultPoint; class CBC_CommonBitMatrix; diff --git a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h index c6145ecbbe..1570777afe 100644 --- a/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h +++ b/xfa/fxbarcode/qrcode/BC_QRDetectorResult.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_ #define XFA_FXBARCODE_QRCODE_BC_QRDETECTORRESULT_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index 5ccbd9804b..ea08f1550d 100644 --- a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -24,7 +24,7 @@ #include -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/BC_ResultPoint.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/fxbarcode/qrcode/BC_FinderPatternInfo.h" diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h index 058f65df31..ada224787b 100644 --- a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h +++ b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_ #define XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; class CBC_QRFinderPattern; diff --git a/xfa/fxbarcode/qrcode/BC_QRGridSampler.h b/xfa/fxbarcode/qrcode/BC_QRGridSampler.h index 4e10c5627a..70bfb9e085 100644 --- a/xfa/fxbarcode/qrcode/BC_QRGridSampler.h +++ b/xfa/fxbarcode/qrcode/BC_QRGridSampler.h @@ -7,7 +7,7 @@ #ifndef XFA_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_ #define XFA_FXBARCODE_QRCODE_BC_QRGRIDSAMPLER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; -- cgit v1.2.3