summaryrefslogtreecommitdiff
path: root/fxbarcode
diff options
context:
space:
mode:
Diffstat (limited to 'fxbarcode')
-rw-r--r--fxbarcode/common/reedsolomon/BC_ReedSolomon.h4
-rw-r--r--fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h4
-rw-r--r--fxbarcode/datamatrix/BC_EncoderContext.h4
-rw-r--r--fxbarcode/oned/BC_OneDimWriter.h4
-rw-r--r--fxbarcode/qrcode/BC_QRCoder.h6
5 files changed, 11 insertions, 11 deletions
diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index d4e3ee8881..e45c8a4976 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/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CBC_ReedSolomonGF256;
class CBC_ReedSolomonGF256Poly;
@@ -26,7 +26,7 @@ class CBC_ReedSolomonEncoder {
private:
CBC_ReedSolomonGF256Poly* BuildGenerator(size_t degree);
- CFX_UnownedPtr<CBC_ReedSolomonGF256> const m_field;
+ UnownedPtr<CBC_ReedSolomonGF256> const m_field;
std::vector<std::unique_ptr<CBC_ReedSolomonGF256Poly>> m_cachedGenerators;
};
diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index 4730625bf8..810b4782bb 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/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CBC_ReedSolomonGF256;
@@ -40,7 +40,7 @@ class CBC_ReedSolomonGF256Poly final {
std::unique_ptr<CBC_ReedSolomonGF256Poly> Clone() const;
private:
- CFX_UnownedPtr<CBC_ReedSolomonGF256> m_field;
+ UnownedPtr<CBC_ReedSolomonGF256> m_field;
std::vector<int32_t> m_coefficients;
};
diff --git a/fxbarcode/datamatrix/BC_EncoderContext.h b/fxbarcode/datamatrix/BC_EncoderContext.h
index 1289a45e68..3881319d61 100644
--- a/fxbarcode/datamatrix/BC_EncoderContext.h
+++ b/fxbarcode/datamatrix/BC_EncoderContext.h
@@ -7,7 +7,7 @@
#ifndef FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
#define FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxcrt/widestring.h"
class CBC_SymbolInfo;
@@ -38,7 +38,7 @@ class CBC_EncoderContext {
WideString m_codewords;
FX_STRSIZE m_pos;
int32_t m_newEncoding;
- CFX_UnownedPtr<CBC_SymbolInfo> m_symbolInfo;
+ UnownedPtr<CBC_SymbolInfo> m_symbolInfo;
private:
FX_STRSIZE getTotalMessageCharCount();
diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h
index 880f60f0b8..5c9ef09e4d 100644
--- a/fxbarcode/oned/BC_OneDimWriter.h
+++ b/fxbarcode/oned/BC_OneDimWriter.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/cfx_renderdevice.h"
#include "fxbarcode/BC_Library.h"
#include "fxbarcode/BC_Writer.h"
@@ -86,7 +86,7 @@ class CBC_OneDimWriter : public CBC_Writer {
bool m_bPrintChecksum;
int32_t m_iDataLenth;
bool m_bCalcChecksum;
- CFX_UnownedPtr<CFX_Font> m_pFont;
+ UnownedPtr<CFX_Font> m_pFont;
float m_fFontSize;
int32_t m_iFontStyle;
uint32_t m_fontColor;
diff --git a/fxbarcode/qrcode/BC_QRCoder.h b/fxbarcode/qrcode/BC_QRCoder.h
index fe34b5250b..af53ded49d 100644
--- a/fxbarcode/qrcode/BC_QRCoder.h
+++ b/fxbarcode/qrcode/BC_QRCoder.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CBC_QRCoderErrorCorrectionLevel;
class CBC_QRCoderMode;
@@ -50,8 +50,8 @@ class CBC_QRCoder {
void SetMatrix(std::unique_ptr<CBC_CommonByteMatrix> pMatrix);
private:
- CFX_UnownedPtr<CBC_QRCoderMode> m_mode;
- CFX_UnownedPtr<const CBC_QRCoderErrorCorrectionLevel> m_ecLevel;
+ UnownedPtr<CBC_QRCoderMode> m_mode;
+ UnownedPtr<const CBC_QRCoderErrorCorrectionLevel> m_ecLevel;
int32_t m_version;
int32_t m_matrixWidth;
int32_t m_maskPattern;