diff options
Diffstat (limited to 'fxbarcode')
21 files changed, 10 insertions, 25 deletions
diff --git a/fxbarcode/BC_UtilCodingConvert.h b/fxbarcode/BC_UtilCodingConvert.h index 5aaa53c726..de6b30eb7c 100644 --- a/fxbarcode/BC_UtilCodingConvert.h +++ b/fxbarcode/BC_UtilCodingConvert.h @@ -9,7 +9,7 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" class CBC_UtilCodingConvert { public: diff --git a/fxbarcode/BC_Utils.cpp b/fxbarcode/BC_Utils.cpp index 6a6ed3e0a4..284322e832 100644 --- a/fxbarcode/BC_Utils.cpp +++ b/fxbarcode/BC_Utils.cpp @@ -6,7 +6,6 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" #include "fxbarcode/utils.h" bool BC_FX_ByteString_Replace(CFX_ByteString& dst, diff --git a/fxbarcode/cbc_codebase.h b/fxbarcode/cbc_codebase.h index 7b83fd70d2..ac9aaabcbb 100644 --- a/fxbarcode/cbc_codebase.h +++ b/fxbarcode/cbc_codebase.h @@ -9,6 +9,7 @@ #include <memory> +#include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_dib.h" #include "fxbarcode/BC_Library.h" diff --git a/fxbarcode/common/BC_CommonBitArray.h b/fxbarcode/common/BC_CommonBitArray.h index f3d0a5ed83..1f98e54e53 100644 --- a/fxbarcode/common/BC_CommonBitArray.h +++ b/fxbarcode/common/BC_CommonBitArray.h @@ -9,8 +9,6 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" - class CBC_CommonBitArray { public: explicit CBC_CommonBitArray(CBC_CommonBitArray* array); diff --git a/fxbarcode/common/BC_CommonByteArray.cpp b/fxbarcode/common/BC_CommonByteArray.cpp index 80ae07d1ad..d66568c596 100644 --- a/fxbarcode/common/BC_CommonByteArray.cpp +++ b/fxbarcode/common/BC_CommonByteArray.cpp @@ -19,10 +19,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "fxbarcode/common/BC_CommonByteArray.h" #include <algorithm> -#include "fxbarcode/common/BC_CommonByteArray.h" +#include "core/fxcrt/fx_memory.h" CBC_CommonByteArray::CBC_CommonByteArray() { m_bytes = nullptr; diff --git a/fxbarcode/common/BC_CommonByteArray.h b/fxbarcode/common/BC_CommonByteArray.h index 9270adcf42..86b4ea1544 100644 --- a/fxbarcode/common/BC_CommonByteArray.h +++ b/fxbarcode/common/BC_CommonByteArray.h @@ -9,8 +9,6 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" - // TODO(weili): The usage of this class should be replaced by // std::vector<uint8_t>. class CBC_CommonByteArray { diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h index 2838e13cee..d4e3ee8881 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomon.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_unowned_ptr.h" class CBC_ReedSolomonGF256; class CBC_ReedSolomonGF256Poly; diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h index 6d8225dfb0..693d943042 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h @@ -9,7 +9,6 @@ #include <memory> -#include "core/fxcrt/fx_basic.h" #include "fxbarcode/utils.h" class CBC_ReedSolomonGF256Poly; diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h index f7aea2bf53..4730625bf8 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_unowned_ptr.h" class CBC_ReedSolomonGF256; diff --git a/fxbarcode/datamatrix/BC_DefaultPlacement.h b/fxbarcode/datamatrix/BC_DefaultPlacement.h index 5036b121e5..17ecac9f5c 100644 --- a/fxbarcode/datamatrix/BC_DefaultPlacement.h +++ b/fxbarcode/datamatrix/BC_DefaultPlacement.h @@ -9,7 +9,7 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" class CBC_DefaultPlacement { public: diff --git a/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp b/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp index dc3a38f674..fbff8041cc 100644 --- a/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp +++ b/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "fxbarcode/oned/BC_OnedCode128Writer.h" -#include "core/fxcrt/fx_basic.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/fxbarcode/pdf417/BC_PDF417.h b/fxbarcode/pdf417/BC_PDF417.h index f5ca2de60f..e6140a8fd7 100644 --- a/fxbarcode/pdf417/BC_PDF417.h +++ b/fxbarcode/pdf417/BC_PDF417.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" #include "fxbarcode/pdf417/BC_PDF417Compaction.h" class CBC_BarcodeRow; diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h index 785633d150..71ada98872 100644 --- a/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h +++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h @@ -10,8 +10,6 @@ #include <memory> #include <vector> -#include "core/fxcrt/fx_basic.h" - class CBC_BarcodeRow; class CBC_BarcodeMatrix { diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/fxbarcode/pdf417/BC_PDF417BarcodeRow.h index d9d8f69089..45b79c7368 100644 --- a/fxbarcode/pdf417/BC_PDF417BarcodeRow.h +++ b/fxbarcode/pdf417/BC_PDF417BarcodeRow.h @@ -9,8 +9,6 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" - class CBC_BarcodeRow { public: explicit CBC_BarcodeRow(size_t width); diff --git a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h index 023f3dbb25..32482dc22b 100644 --- a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h +++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h @@ -9,7 +9,6 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_string.h" #include "fxbarcode/pdf417/BC_PDF417Compaction.h" diff --git a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp index 478fcf50df..14311742f1 100644 --- a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp +++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fxcrt/fx_basic.h" #include "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/fxbarcode/qrcode/BC_QRCoderECBlocks.h index 4ea7a7abd5..999faca791 100644 --- a/fxbarcode/qrcode/BC_QRCoderECBlocks.h +++ b/fxbarcode/qrcode/BC_QRCoderECBlocks.h @@ -9,8 +9,6 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" - struct CBC_QRCoderECBlockData; class CBC_QRCoderECBlocks { diff --git a/fxbarcode/qrcode/BC_QRCoderECBlocksData.h b/fxbarcode/qrcode/BC_QRCoderECBlocksData.h index 0f1ae20b84..7ed4ca4689 100644 --- a/fxbarcode/qrcode/BC_QRCoderECBlocksData.h +++ b/fxbarcode/qrcode/BC_QRCoderECBlocksData.h @@ -7,7 +7,7 @@ #ifndef FXBARCODE_QRCODE_BC_QRCODERECBLOCKSDATA_H_ #define FXBARCODE_QRCODE_BC_QRCODERECBLOCKSDATA_H_ -#include "core/fxcrt/fx_basic.h" +#include <stdint.h> struct CBC_QRCoderECBlockData { uint8_t ecCodeWordsPerBlock; diff --git a/fxbarcode/qrcode/BC_QRCoderEncoder.h b/fxbarcode/qrcode/BC_QRCoderEncoder.h index 1c68b3b883..6bba889bd4 100644 --- a/fxbarcode/qrcode/BC_QRCoderEncoder.h +++ b/fxbarcode/qrcode/BC_QRCoderEncoder.h @@ -10,7 +10,6 @@ #include <utility> #include <vector> -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_string.h" class CBC_QRCoder; diff --git a/fxbarcode/qrcode/BC_QRCoderVersion.h b/fxbarcode/qrcode/BC_QRCoderVersion.h index 0c9509b457..bfa213ccbb 100644 --- a/fxbarcode/qrcode/BC_QRCoderVersion.h +++ b/fxbarcode/qrcode/BC_QRCoderVersion.h @@ -10,7 +10,6 @@ #include <memory> #include <vector> -#include "core/fxcrt/fx_basic.h" #include "fxbarcode/qrcode/BC_QRCoderECBlocks.h" class CBC_QRCoderErrorCorrectionLevel; diff --git a/fxbarcode/utils.h b/fxbarcode/utils.h index 60a38af6c8..df7d1f08d1 100644 --- a/fxbarcode/utils.h +++ b/fxbarcode/utils.h @@ -9,7 +9,7 @@ #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" bool BC_FX_ByteString_Replace(CFX_ByteString& dst, uint32_t first, |