From c909ce872d999a17ffd44afdc88caf2de43e6cba Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 8 Jan 2016 15:44:36 -0800 Subject: XFA: Remove many relative includes in xfa/ Also remove useless files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1570743002 . --- xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp | 4 ++-- xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp | 4 ++-- xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp | 6 +++--- .../datamatrix/BC_DataMatrixBitMatrixParser.cpp | 4 ++-- xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp | 2 +- .../datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp | 6 +++--- xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp | 8 ++++---- xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp | 14 +++++++------- xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp | 10 +++++----- .../fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp | 16 ++++++++-------- xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp | 6 +++--- xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp | 8 ++++---- xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp | 8 ++++---- xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp | 6 +++--- xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp | 6 +++--- xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp | 6 +++--- 22 files changed, 63 insertions(+), 63 deletions(-) (limited to 'xfa/src/fxbarcode/datamatrix') diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp index 3663b9f84e..2c25c7a8b7 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp index 9df28e1b5b..14f35ab70c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp index 7e58d8ef06..b2b003848c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp index 52738a1527..1989c8d2f4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_DataMatrixVersion.h" #include "BC_DataMatrixBitMatrixParser.h" CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp index ef9f5582b6..0f3239d552 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_DataMatrixVersion.h" #include "BC_DataMatrixDataBlock.h" CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp index 8ac6468b3a..1938fb4bb4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonDecoderResult.h" -#include "../common/BC_CommonBitSource.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" #include "BC_DataMatrixDecodedBitStreamParser.h" const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_BASIC_SET_CHARS[] = { '*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp index 5767c95555..8d886201cd 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/reedsolomon/BC_ReedSolomonDecoder.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "BC_DataMatrixDecoder.h" #include "BC_DataMatrixBitMatrixParser.h" #include "BC_DataMatrixVersion.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp index 641d2761bb..c930f0e45d 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -20,13 +20,13 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_WhiteRectangleDetector.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../qrcode/BC_QRFinderPatternFinder.h" -#include "../qrcode/BC_QRDetectorResult.h" -#include "../qrcode/BC_QRGridSampler.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" #include "BC_DataMatrixDetector.h" const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4}; CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image) diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp index 4c4be46176..9c0c367b75 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_Reader.h" -#include "../qrcode/BC_QRDetectorResult.h" -#include "../common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "BC_DataMatrixDecoder.h" #include "BC_DataMatrixDetector.h" #include "BC_DataMatrixReader.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp index d6176be909..93cb541dbf 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp index 69257b1b06..d4af9c6d3e 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_DataMatrixVersion.h" CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL; void CBC_DataMatrixVersion::Initialize() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index d2f2507729..22a04b1ab0 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" -#include "../BC_TwoDimWriter.h" -#include "../BC_Dimension.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "BC_Encoder.h" #include "BC_DefaultPlacement.h" #include "BC_SymbolShapeHint.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp index 86c2a80210..076657b6ff 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" #include "BC_DefaultPlacement.h" CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords, diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp index 60b796a196..a0a999fb99 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp index 4858e19fb8..38beb6c87f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" CBC_Encoder::CBC_Encoder() {} CBC_Encoder::~CBC_Encoder() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp index 8b3093c836..9823642818 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp index ffb52350c9..dff07db8e3 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index 4a0e09528b..0b14ef3595 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index b6a19328a8..985eb7be38 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp index d0f0e45846..f3c3d1d6f6 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_SymbolShapeHint.h" CBC_SymbolShapeHint::CBC_SymbolShapeHint() {} CBC_SymbolShapeHint::~CBC_SymbolShapeHint() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp index ecd20cd5e5..0a6b381c79 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp index a15362f542..690a3245b0 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" -- cgit v1.2.3