Merge to XFA: Kill CFX_Object.

Not just a simple merge, but changes to remove CFX_Object from XFA.

Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1087053002

78 files changed, 87 insertions, 145 deletions

diff --git a/xfa/src/fxbarcode/BC_Binarizer.h b/xfa/src/fxbarcode/BC_Binarizer.h
index 357aef67c2..730829aba1 100644
--- a/xfa/src/fxbarcode/BC_Binarizer.h
+++ b/xfa/src/fxbarcode/BC_Binarizer.h
@@ -10,7 +10,7 @@ class CBC_LuminanceSource;
 class CBC_CommonBitMatrix;

 class CBC_CommonBitArray;

 class CBC_BinaryBitmap;

-class CBC_Binarizer  : public CFX_Object

+class CBC_Binarizer

 {

 public:

     CBC_Binarizer(CBC_LuminanceSource *source);

diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.h b/xfa/src/fxbarcode/BC_BinaryBitmap.h
index 638d16f5a9..e555a2b42c 100644
--- a/xfa/src/fxbarcode/BC_BinaryBitmap.h
+++ b/xfa/src/fxbarcode/BC_BinaryBitmap.h
@@ -10,7 +10,7 @@ class CBC_Binarizer;
 class CBC_CommonBitMatrix;

 class CBC_CommonBitArray;

 class CBC_BinaryBitmap;

-class CBC_BinaryBitmap : public CFX_Object

+class CBC_BinaryBitmap

 {

 public:

     CBC_BinaryBitmap(CBC_Binarizer *binarizer);

diff --git a/xfa/src/fxbarcode/BC_DecoderResult.h b/xfa/src/fxbarcode/BC_DecoderResult.h
index ff98b2c407..9655d66383 100644
--- a/xfa/src/fxbarcode/BC_DecoderResult.h
+++ b/xfa/src/fxbarcode/BC_DecoderResult.h
@@ -7,7 +7,7 @@
 #ifndef _BC_DECODERRESULT_H_

 #define _BC_DECODERRESULT_H_

 class CBC_DecoderResult;

-class CBC_DecoderResult : public CFX_Object

+class CBC_DecoderResult

 {

 public:

     CBC_DecoderResult(CFX_ByteArray* rawBytes, CFX_ByteString text,  CFX_ByteString ecLevel);

@@ -19,14 +19,14 @@ public:
     void setErrorsCorrected(FX_INT32 errorsCorrected);

     FX_INT32 getErasures();

     void setErasures(FX_INT32 erasures);

-    CFX_Object* getOther();

-    void setOther(CFX_Object* other);

+    void* getOther();

+    void setOther(void* other);

 private:

     CFX_ByteArray* m_rawBytes;

     CFX_ByteString m_text;

     CFX_ByteString m_ecLevel;

     FX_INT32 m_errorsCorrected;

     FX_INT32 m_erasures;

-    CFX_Object* m_other;

+    void* m_other;

 };

 #endif

diff --git a/xfa/src/fxbarcode/BC_Dimension.h b/xfa/src/fxbarcode/BC_Dimension.h
index ff4aecace4..42c87a6cb3 100644
--- a/xfa/src/fxbarcode/BC_Dimension.h
+++ b/xfa/src/fxbarcode/BC_Dimension.h
@@ -7,7 +7,7 @@
 #ifndef _BC_DIMENSION_H_

 #define _BC_DIMENSION_H_

 class CBC_Dimension;

-class CBC_Dimension : public CFX_Object

+class CBC_Dimension

 {

 public:

     CBC_Dimension();

diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.h b/xfa/src/fxbarcode/BC_LuminanceSource.h
index 6aa85101c9..013f1b84f3 100644
--- a/xfa/src/fxbarcode/BC_LuminanceSource.h
+++ b/xfa/src/fxbarcode/BC_LuminanceSource.h
@@ -7,7 +7,7 @@
 #ifndef _BC_LUMINANCESOURCE_H

 #define _BC_LUMINANCESOURCE_H

 class CBC_LuminanceSource;

-class CBC_LuminanceSource  : public CFX_Object

+class CBC_LuminanceSource

 {

 public:

     CBC_LuminanceSource(FX_INT32 width, FX_INT32 height);

diff --git a/xfa/src/fxbarcode/BC_Reader.h b/xfa/src/fxbarcode/BC_Reader.h
index 42b2aa11f5..74c12b6e2c 100644
--- a/xfa/src/fxbarcode/BC_Reader.h
+++ b/xfa/src/fxbarcode/BC_Reader.h
@@ -8,7 +8,7 @@
 #define _BC_READER_H_

 class CBC_BinaryBitmap;

 class CBC_Reader;

-class CBC_Reader : public CFX_Object

+class CBC_Reader

 {

 public:

     CBC_Reader();

diff --git a/xfa/src/fxbarcode/BC_ResultPoint.h b/xfa/src/fxbarcode/BC_ResultPoint.h
index 7001cfa2a5..03a23d417b 100644
--- a/xfa/src/fxbarcode/BC_ResultPoint.h
+++ b/xfa/src/fxbarcode/BC_ResultPoint.h
@@ -7,7 +7,7 @@
 #ifndef _BC_RESULTPOINT_H_

 #define _BC_RESULTPOINT_H_

 class CBC_ResultPoint;

-class CBC_ResultPoint : public CFX_Object

+class CBC_ResultPoint

 {

 public:

     CBC_ResultPoint();

diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.h b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
index 1ee3a8c64c..c5dc5a415e 100644
--- a/xfa/src/fxbarcode/BC_UtilCodingConvert.h
+++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
@@ -7,7 +7,7 @@
 #ifndef _BC_UTILCODINGCONVERT_H_

 #define _BC_UTILCODINGCONVERT_H_

 class  CBC_UtilCodingConvert;

-class CBC_UtilCodingConvert : public CFX_Object

+class CBC_UtilCodingConvert

 {

 public:

     CBC_UtilCodingConvert();

diff --git a/xfa/src/fxbarcode/BC_UtilRSS.h b/xfa/src/fxbarcode/BC_UtilRSS.h
index 37834eaa76..076e2f263d 100644
--- a/xfa/src/fxbarcode/BC_UtilRSS.h
+++ b/xfa/src/fxbarcode/BC_UtilRSS.h
@@ -7,7 +7,7 @@
 #ifndef _BC_UTILRESS_H_

 #define _BC_UTILRESS_H_

 class CBC_RssPair;

-class CBC_UtilRSS : public CFX_Object

+class CBC_UtilRSS

 {

 public:

     virtual ~CBC_UtilRSS();

diff --git a/xfa/src/fxbarcode/BC_Writer.h b/xfa/src/fxbarcode/BC_Writer.h
index deb68c07be..d92dc9b2ea 100644
--- a/xfa/src/fxbarcode/BC_Writer.h
+++ b/xfa/src/fxbarcode/BC_Writer.h
@@ -7,7 +7,7 @@
 #ifndef _BC_WRITER_H_

 #define _BC_WRITER_H_

 class CBC_Writer;

-class CBC_Writer : public CFX_Object

+class CBC_Writer

 {

 public:

     CBC_Writer();

diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.h b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
index 484d87d5a7..d1c8f6d528 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBITARRAY_H_

 #define _BC_COMMONBITARRAY_H_

-class CBC_CommonBitArray;

-class CBC_CommonBitArray  : public CFX_Object

+class CBC_CommonBitArray

 {

 public:

     CBC_CommonBitArray(CBC_CommonBitArray* array);

diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
index f69d7a0e33..8641ef1f63 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
@@ -7,8 +7,7 @@
 #ifndef _BC_COMMONBITMATRIX_H_

 #define _BC_COMMONBITMATRIX_H_

 class CBC_CommonBitArray;

-class CBC_CommonBitMatrix;

-class CBC_CommonBitMatrix  : public CFX_Object

+class CBC_CommonBitMatrix

 {

 public:

     CBC_CommonBitMatrix();

diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.h b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
index 53891cf671..f6a5985ae2 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitSource.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBITSOURCE_H_

 #define _BC_COMMONBITSOURCE_H_

-class CBC_CommonBitSource;

-class CBC_CommonBitSource  : public CFX_Object

+class CBC_CommonBitSource

 {

 public:

     CBC_CommonBitSource(CFX_ByteArray *bytes);

diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.h b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
index fe0a67ffd1..b9baf8a964 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBYTEARRAY_H_

 #define _BC_COMMONBYTEARRAY_H_

-class CBC_CommonByteArray;

-class CBC_CommonByteArray  : public CFX_Object

+class CBC_CommonByteArray

 {

 private:

     FX_INT32 m_size;

diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
index 3d831d1911..55277660f3 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONBYTEMATRIX_H_

 #define _BC_COMMONBYTEMATRIX_H_

-class CBC_CommonByteMatrix;

-class CBC_CommonByteMatrix  : public CFX_Object

+class CBC_CommonByteMatrix

 {

 public:

     CBC_CommonByteMatrix(FX_INT32 width, FX_INT32 height);

diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
index 808203bd01..5f41afc774 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
@@ -8,8 +8,7 @@
 #define _BC_COMMONDECODERRESULT_H_

 class CBC_QRCoderErrorCorrectionLevel;

 class CBC_PDF417ResultMetadata;

-class CBC_CommonDecoderResult;

-class CBC_CommonDecoderResult  : public CFX_Object

+class CBC_CommonDecoderResult

 {

 public:

     CBC_CommonDecoderResult();

diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.h b/xfa/src/fxbarcode/common/BC_CommonECI.h
index 3907066066..7a4ae6b8a6 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONECI_H_

 #define _BC_COMMONECI_H_

-class CBC_CommonECI;

-class CBC_CommonECI  : public CFX_Object

+class CBC_CommonECI

 {

 public:

     CBC_CommonECI(FX_INT32 value);

diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
index 5c42a1a6a7..cf7f804a2c 100644
--- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_COMMONPERSPECTIVETRANSFORM_H_

 #define _BC_COMMONPERSPECTIVETRANSFORM_H_

-class CBC_CommonPerspectiveTransform;

-class CBC_CommonPerspectiveTransform : public CFX_Object

+class CBC_CommonPerspectiveTransform

 {

 public:

     CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, FX_FLOAT a31,

diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
index 83d91ced92..40146d39de 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
@@ -8,8 +8,7 @@
 #define _BC_WHITERECTANLEDETECTOR_H_

 class CBC_CommonBitMatrix;

 class CBC_ResultPoint;

-class CBC_WhiteRectangleDetector;

-class CBC_WhiteRectangleDetector : public CFX_Object

+class CBC_WhiteRectangleDetector

 {

 public:

     CBC_WhiteRectangleDetector(CBC_CommonBitMatrix *image);

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 2950b8f315..713f343d98 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -8,8 +8,7 @@
 #define _BC_READSOLOMON_H_

 class CBC_ReedSolomonGF256;

 class CBC_ReedSolomonGF256Poly;

-class  CBC_ReedSolomonEncoder;

-class CBC_ReedSolomonEncoder : public CFX_Object

+class CBC_ReedSolomonEncoder

 {

 private:

     CBC_ReedSolomonGF256* m_field;

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
index c1dd0f03f5..db026edd01 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
@@ -8,8 +8,7 @@
 #define _BC_REEDSOLOMONDECODER_H_

 class CBC_ReedSolomonGF256;

 class CBC_ReedSolomonGF256Poly;

-class CBC_ReedSolomonDecoder;

-class CBC_ReedSolomonDecoder : public CFX_Object

+class CBC_ReedSolomonDecoder

 {

 private:

     CBC_ReedSolomonGF256 * m_field;

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index 1687b95e09..40e7ffef28 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -7,8 +7,7 @@
 #ifndef _BC_REEDSOLOMONGF256_H_

 #define _BC_REEDSOLOMONGF256_H_

 class CBC_ReedSolomonGF256Poly;

-class CBC_ReedSolomonGF256;

-class CBC_ReedSolomonGF256 : public CFX_Object

+class CBC_ReedSolomonGF256

 {

 public:

     static void Initialize();

diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index a6db24e231..5c9ae6cce6 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
@@ -7,8 +7,7 @@
 #ifndef _BC_READSOLOMONGF256POLY_H_

 #define _BC_READSOLOMONGF256POLY_H_

 class CBC_ReedSolomonGF256;

-class CBC_ReedSolomonGF256Poly;

-class CBC_ReedSolomonGF256Poly : public CFX_Object

+class CBC_ReedSolomonGF256Poly

 {

 public:

     CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field, FX_INT32 coefficients);

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index c5f1f3f7a0..812aa6424f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
@@ -8,8 +8,7 @@
 #define _BC_DATAMATRIXBITMATRIXPARSER_H_

 class CBC_CommonBitMatrix;

 class CBC_DataMatrixVersion;

-class CBC_DataMatrixBitMatrixParser;

-class CBC_DataMatrixBitMatrixParser : public CFX_Object

+class CBC_DataMatrixBitMatrixParser

 {

 public:

     CBC_DataMatrixBitMatrixParser();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index 1dd62fe1fe..d0f4af036e 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
@@ -7,8 +7,7 @@
 #ifndef _BC_DATAMATRIXDATABLOCK_H_

 #define _BC_DATAMATRIXDATABLOCK_H_

 class CBC_DataMatrixVersion;

-class CBC_DataMatrixDataBlock;

-class CBC_DataMatrixDataBlock : public CFX_Object

+class CBC_DataMatrixDataBlock

 {

 public:

     virtual ~CBC_DataMatrixDataBlock();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
index 060972d53a..45db800176 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
@@ -8,8 +8,7 @@
 #define _BC_DATAMATRIXDECODEDBITSTREAMPARSER_H_

 class CBC_CommonDecoderResult;

 class CBC_CommonBitSource;

-class CBC_DataMatrixDecodedBitStreamParser;

-class CBC_DataMatrixDecodedBitStreamParser : public CFX_Object

+class CBC_DataMatrixDecodedBitStreamParser

 {

 public:

     CBC_DataMatrixDecodedBitStreamParser();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
index 44f7efc7b7..1d6059379b 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
@@ -9,8 +9,7 @@
 class CBC_ReedSolomonDecoder;

 class CBC_CommonDecoderResult;

 class CBC_CommonBitMatrix;

-class  CBC_DataMatrixDecoder;

-class CBC_DataMatrixDecoder  : public CFX_Object

+class CBC_DataMatrixDecoder

 {

 public:

     CBC_DataMatrixDecoder();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
index 2d3ca744fe..a9e244c5f4 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
@@ -12,7 +12,7 @@ class CBC_ResultPoint;
 class CBC_QRDetectorResult;

 class CBC_DataMatrixDetector;

 class ResultPointsAndTransitions;

-class CBC_ResultPointsAndTransitions : public CFX_Object

+class CBC_ResultPointsAndTransitions

 {

 public:

     CBC_ResultPointsAndTransitions(CBC_ResultPoint *from, CBC_ResultPoint *to, FX_INT32 transitions)

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 41d2f23db6..9661834bd8 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -6,10 +6,9 @@
 

 #ifndef _BC_DATAMATRIXVERSION_H_

 #define _BC_DATAMATRIXVERSION_H_

-class ECB;

 class ECBlocks;

 class CBC_DataMatrixVersion;

-class ECB : public CFX_Object

+class ECB

 {

 public:

     ECB(FX_INT32 count, FX_INT32 dataCodewords)

@@ -31,7 +30,7 @@ private:
     FX_INT32 m_count;

     FX_INT32 m_dataCodewords;

 };

-class ECBlocks : public CFX_Object

+class ECBlocks

 {

 public:

     ECBlocks(FX_INT32 ecCodewords, ECB *ecBlocks)

@@ -67,7 +66,7 @@ private:
     FX_INT32 m_ecCodewords;

     CFX_PtrArray m_ecBlocks;

 };

-class CBC_DataMatrixVersion  : public CFX_Object

+class CBC_DataMatrixVersion

 {

 public:

     CBC_DataMatrixVersion(FX_INT32 versionNumber,

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
index ba2da03408..2194e9f18a 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_DEFAULTPLACEMENT_H_

 #define _BC_DEFAULTPLACEMENT_H_

-class CBC_DefaultPlacement;

-class CBC_DefaultPlacement : public CFX_Object

+class CBC_DefaultPlacement

 {

 public:

     CBC_DefaultPlacement(CFX_WideString codewords, FX_INT32 numcols, FX_INT32 numrows);

diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
index 10ac8763e5..7d1a1b5b62 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
@@ -7,8 +7,7 @@
 #ifndef _BC_ENCODER_H_

 #define _BC_ENCODER_H_

 class CBC_EncoderContext;

-class CBC_Encoder;

-class CBC_Encoder : public CFX_Object

+class CBC_Encoder

 {

 public:

     CBC_Encoder();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
index 973ff33b8e..0bc71cdeb5 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
@@ -7,8 +7,7 @@
 #ifndef _BC_ERRORCORRECTION_H_

 #define _BC_ERRORCORRECTION_H_

 class CBC_SymbolInfo;

-class CBC_ErrorCorrection;

-class CBC_ErrorCorrection : public CFX_Object

+class CBC_ErrorCorrection

 {

 public:

     CBC_ErrorCorrection();

diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
index 2b030012a3..adda8c8ea8 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_SYMBOLSHAPEHINT_H_

 #define _BC_SYMBOLSHAPEHINT_H_

-class CBC_SymbolShapeHint;

-class CBC_SymbolShapeHint : public CFX_Object

+class CBC_SymbolShapeHint

 {

 public:

     CBC_SymbolShapeHint();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
index ab31244add..928afe80d2 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
@@ -9,8 +9,7 @@
 class CBC_Compaction;

 class CBC_BarcodeRow;

 class CBC_BarcodeMatrix;

-class CBC_PDF417;

-class CBC_PDF417 : public CFX_Object

+class CBC_PDF417

 {

 public:

     CBC_PDF417();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index d8a0c5d0ae..ce0681bfa8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -7,8 +7,7 @@
 #ifndef _BC_BARCODEMATRIX_H_

 #define _BC_BARCODEMATRIX_H_

 class CBC_BarcodeRow;

-class CBC_BarcodeMatrix;

-class CBC_BarcodeMatrix : public CFX_Object

+class CBC_BarcodeMatrix

 {

 public:

     CBC_BarcodeMatrix();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
index 62b1282827..6e2aa4d952 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
@@ -7,7 +7,7 @@
 #ifndef _BC_BARCODEMETADATA_H_

 #define _BC_BARCODEMETADATA_H_

 class CBC_BarcodeMetadata;

-class CBC_BarcodeMetadata : public CFX_Object

+class CBC_BarcodeMetadata

 {

 public:

     CBC_BarcodeMetadata(FX_INT32 columnCount, FX_INT32 rowCountUpperPart, FX_INT32 rowCountLowerPart, FX_INT32 errorCorrectionLevel);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index 75fd15b653..c5520f6440 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_BARCODEROW_H_

 #define _BC_BARCODEROW_H_

-class CBC_BarcodeRow;

-class CBC_BarcodeRow : public CFX_Object

+class CBC_BarcodeRow

 {

 public:

     CBC_BarcodeRow(FX_INT32 width);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
index 1695c8ac5a..6922d410f0 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_BARCODEVALUE_H_

 #define _BC_BARCODEVALUE_H_

-class CBC_BarcodeValue;

-class CBC_BarcodeValue : public CFX_Object

+class CBC_BarcodeValue

 {

 public:

     CBC_BarcodeValue();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index efae2b706f..26bd1881c3 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
@@ -8,8 +8,7 @@
 #define _BC_BOUNDINGBOX_H_

 class CBC_CommonBitMatrix;

 class CBC_ResultPoint;

-class CBC_BoundingBox;

-class CBC_BoundingBox : public CFX_Object

+class CBC_BoundingBox

 {

 public:

     CBC_BoundingBox(CBC_CommonBitMatrix* image, CBC_ResultPoint* topLeft, CBC_ResultPoint* bottomLeft, CBC_ResultPoint* topRight, CBC_ResultPoint* bottomRight, FX_INT32 &e);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
index 93b3cf6bb3..ea0524cbf8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_CODEWORD_H_

 #define _BC_CODEWORD_H_

-class CBC_Codeword;

-class CBC_Codeword : public CFX_Object

+class CBC_Codeword

 {

 public:

     CBC_Codeword(FX_INT32 startX, FX_INT32 endX, FX_INT32 bucket, FX_INT32 value);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
index da22683bfa..f76d16d015 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
@@ -6,10 +6,10 @@
 

 #ifndef _BC_PDF417CODEWORDDECODER_H_

 #define _BC_PDF417CODEWORDDECODER_H_

-class CBC_PDF417Common;

 class CBC_PDF417CodewordDecoder;

 #define    column     8

-class CBC_PDF417CodewordDecoder : public CFX_Object

+class CBC_PDF417Common;

+class CBC_PDF417CodewordDecoder

 {

 public:

     CBC_PDF417CodewordDecoder();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
index 19e3fe57da..2d6258951e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_PDF417COMMON_H_

 #define _BC_PDF417COMMON_H_

-class CBC_PDF417Common;

-class CBC_PDF417Common : public CFX_Object

+class CBC_PDF417Common

 {

 public:

     CBC_PDF417Common();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
index 774a23fbdf..34af4ac0f6 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
@@ -13,7 +13,7 @@ enum Compaction {
     BYTES,

     NUMERIC

 };

-class CBC_Compaction : public CFX_Object

+class CBC_Compaction

 {

 public:

     CBC_Compaction();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
index 64ae2aee53..4c97bc3f24 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
@@ -8,8 +8,7 @@
 #define _BC_DECODEDBITSTREAMPARSER_H_

 class CBC_CommonDecoderResult;

 class CBC_PDF417ResultMetadata;

-class CBC_DecodedBitStreamPaser;

-class CBC_DecodedBitStreamPaser : public CFX_Object

+class CBC_DecodedBitStreamPaser

 {

 public:

     CBC_DecodedBitStreamPaser();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
index 9c3401459b..55a5a8f134 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
@@ -10,8 +10,7 @@ class CBC_BarcodeMetadata;
 class CBC_BoundingBox;

 class CBC_Codeword;

 class CBC_DetectionResultColumn;

-class CBC_DetectionResult;

-class CBC_DetectionResult : public CFX_Object

+class CBC_DetectionResult

 {

 public:

     CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
index eddc3bce6d..202272d2e9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
@@ -8,8 +8,7 @@
 #define _BC_DETECTIONRESULTCOLUMN_H_

 class CBC_Codeword;

 class CBC_BoundingBox;

-class CBC_DetectionResultColumn;

-class CBC_DetectionResultColumn : public CFX_Object

+class CBC_DetectionResultColumn

 {

 public:

     CBC_DetectionResultColumn(CBC_BoundingBox* boundingBox);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
index 557559e1f7..c160779122 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
@@ -10,8 +10,7 @@ class CBC_PDF417DetectorResult;
 class CBC_BinaryBitmap;

 class CBC_CommonBitMatrix;

 class CBC_CommonBitArray;

-class CBC_Detector;

-class CBC_Detector : public CFX_Object

+class CBC_Detector

 {

 public:

     CBC_Detector();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
index ba557f1541..dabffe4c07 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
@@ -7,8 +7,7 @@
 #ifndef _BC_PDF417DETECTORRESULT_H_

 #define _BC_PDF417DETECTORRESULT_H_

 class CBC_CommonBitMatrix;

-class CBC_PDF417DetectorResult;

-class CBC_PDF417DetectorResult : public CFX_Object

+class CBC_PDF417DetectorResult

 {

 public:

     CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
index 6f8eaffed7..b8e9763081 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_DIMENSIONS_H_

 #define _BC_DIMENSIONS_H_

-class CBC_Dimensions;

-class CBC_Dimensions : public CFX_Object

+class CBC_Dimensions

 {

 public:

     CBC_Dimensions(FX_INT32 minCols, FX_INT32 maxCols, FX_INT32 minRows, FX_INT32 maxRows);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
index 4ce8eda7d6..0fca2e6c39 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
@@ -8,8 +8,7 @@
 #define _BC_PDF417ECERRORCORRECTION_H_

 class CBC_PDF417ECModulusGF;

 class CBC_PDF417ECModulusPoly;

-class CBC_PDF417ECErrorCorrection;

-class CBC_PDF417ECErrorCorrection : public CFX_Object

+class CBC_PDF417ECErrorCorrection

 {

 public:

     CBC_PDF417ECErrorCorrection();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
index 7ebe33ecfd..fbb79e3586 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
@@ -8,8 +8,7 @@
 #define _BC_PDF417ECMODULUSGF_H_

 class CBC_PDF417ECModulusPoly;

 class CBC_PDF417Common;

-class CBC_PDF417ECModulusGF;

-class CBC_PDF417ECModulusGF : public CFX_Object

+class CBC_PDF417ECModulusGF

 {

 public:

     CBC_PDF417ECModulusGF(FX_INT32 modulus, FX_INT32 generator, FX_INT32 &e);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
index 9a9d6c16f2..172cc76cc8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
@@ -7,8 +7,7 @@
 #ifndef _BC_PDF417ECMODULUSPOLY_H_

 #define _BC_PDF417ECMODULUSPOLY_H_

 class CBC_PDF417ECModulusGF;

-class CBC_PDF417ECModulusPoly;

-class CBC_PDF417ECModulusPoly : public CFX_Object

+class CBC_PDF417ECModulusPoly

 {

 public:

     CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field, CFX_Int32Array &coefficients, FX_INT32 &e);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index 4e3aee8d26..9af8b72f17 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_PDF417ERRORCORRECTION_H_

 #define _BC_PDF417ERRORCORRECTION_H_

-class CBC_PDF417ErrorCorrection;

-class CBC_PDF417ErrorCorrection : public CFX_Object

+class CBC_PDF417ErrorCorrection

 {

 public:

     CBC_PDF417ErrorCorrection();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index ed962030ac..7c8801cb21 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -9,7 +9,7 @@
 

 #include "BC_PDF417Compaction.h"

 

-class CBC_PDF417HighLevelEncoder : public CFX_Object

+class CBC_PDF417HighLevelEncoder

 {

 public:

     static CFX_WideString encodeHighLevel(CFX_WideString msg, Compaction compaction, FX_INT32 &e);

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index e6c7780304..7639c032ba 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_PDF417READER_H_

 #define _BC_PDF417READER_H_

-class CBC_PDF417ResultMetadata;

-class CBC_PDF417ResultMetadata : public CFX_Object

+class CBC_PDF417ResultMetadata

 {

 public:

     CBC_PDF417ResultMetadata();

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
index 924e5f798a..8cb5d2856c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
@@ -16,8 +16,8 @@ class CBC_BarcodeMetadata;
 class CBC_BarcodeValue;

 class CBC_DetectionResult;

 class CBC_DetectionResultRowIndicatorColumn;

-class CBC_PDF417ScanningDecoder;

-class CBC_PDF417ScanningDecoder  : public CFX_Object

+

+class CBC_PDF417ScanningDecoder

 {

 public:

     CBC_PDF417ScanningDecoder();

diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
index bac9291947..8e4cb13ed2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
@@ -7,8 +7,7 @@
 #ifndef _BC_FINDERPATTERNINFO_H_

 #define _BC_FINDERPATTERNINFO_H_

 class CBC_QRFinderPattern;

-class CBC_QRFinderPatternInfo;

-class CBC_QRFinderPatternInfo : public CFX_Object

+class CBC_QRFinderPatternInfo

 {

 private:

     CBC_QRFinderPattern *m_bottomLeft;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
index 5471c4e62a..c1d224a8eb 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
@@ -8,8 +8,7 @@
 #define _BC_QRALIGNMENTPATTERNFINDER_H_

 class CBC_CommonBitMatrix;

 class CBC_QRAlignmentPattern;

-class CBC_QRAlignmentPatternFinder;

-class CBC_QRAlignmentPatternFinder  : public CFX_Object

+class CBC_QRAlignmentPatternFinder

 {

 private:

     CBC_CommonBitMatrix *m_image;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 2e176f63d3..0189ba7c81 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -10,8 +10,7 @@ class CBC_CommonBitMatrix ;
 class CBC_QRCoderVersion;

 class CBC_QRCoderFormatInformation;

 class CBC_QRDataMask;

-class CBC_QRBitMatrixParser;

-class CBC_QRBitMatrixParser  : public CFX_Object

+class CBC_QRBitMatrixParser

 {

 private:

     CBC_CommonBitMatrix *m_bitMatrix;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
index 89ce140fbd..3c24dc2bc9 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
@@ -9,8 +9,8 @@
 class CBC_QRCoderErrorCorrectionLevel ;

 class CBC_QRCoderMode;

 class CBC_CommonByteMatrix;

-class CBC_QRCoder;

-class CBC_QRCoder : public CFX_Object

+

+class CBC_QRCoder

 {

 private:

     CBC_QRCoderMode* m_mode;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
index 6e9abba6c9..ae73fe8c88 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_QRECODERBITVECTOR_H_

 #define _BC_QRECODERBITVECTOR_H_

-class CBC_QRCoderBitVector;

-class CBC_QRCoderBitVector  : public CFX_Object

+class CBC_QRCoderBitVector

 {

 private:

     FX_INT32 m_sizeInBits;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
index 234ac1a776..6fb79bb596 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERBLOCKPAIR_H_

 #define _BC_QRCODERBLOCKPAIR_H_

 class CBC_CommonByteArray;

-class CBC_QRCoderBlockPair;

-class CBC_QRCoderBlockPair : public CFX_Object

+class CBC_QRCoderBlockPair

 {

 private:

     CBC_CommonByteArray* m_dataBytes;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
index 355af78180..00238544c3 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
@@ -12,8 +12,7 @@ class CBC_CommonDecoderResult;
 class CBC_QRBitMatrixParser;

 class CBC_QRCoderVersion;

 class CBC_QRDataBlock;

-class CBC_QRCoderDecoder;

-class CBC_QRCoderDecoder  : public CFX_Object

+class CBC_QRCoderDecoder

 {

 private:

     CBC_ReedSolomonDecoder *m_rsDecoder;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
index c6494b75cd..e8c2d36999 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_QRCODERECB_H_

 #define _BC_QRCODERECB_H_

-class CBC_QRCoderECB;

-class CBC_QRCoderECB  : public CFX_Object

+class CBC_QRCoderECB

 {

 private:

     FX_INT32 m_count;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index 385837510a..7f229742ab 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERECBLOCKS_H_

 #define _BC_QRCODERECBLOCKS_H_

 class CBC_QRCoderECB;

-class CBC_QRCoderECBlocks;

-class CBC_QRCoderECBlocks  : public CFX_Object

+class CBC_QRCoderECBlocks

 {

 private:

     FX_INT32 m_ecCodeWordsPerBlock;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index e072dc337e..3f6a644f0f 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -50,7 +50,7 @@ CBC_QRCoderEncoder::CBC_QRCoderEncoder()
 CBC_QRCoderEncoder::~CBC_QRCoderEncoder()

 {

 }

-class Make_Pair : public CFX_Object

+class Make_Pair

 {

 public:

     CBC_QRCoderMode* m_mode;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 8dea2a6477..f08d608fb8 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -14,7 +14,7 @@ class CBC_QRCoderBitVector;
 class CBC_CommonByteArray;

 class CBC_CommonByteMatrix;

 class CBC_QRCoderEncoder;

-class CBC_QRCoderEncoder : public CFX_Object

+class CBC_QRCoderEncoder

 {

 private:

     const static FX_INT32 m_alphaNumbericTable[96];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index 2c0ad7b0b7..907c20d1cc 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
@@ -6,8 +6,7 @@
 

 #ifndef _BC_QRCODERERRORCORRECTIONLEVEL_H_

 #define _BC_QRCODERERRORCORRECTIONLEVEL_H_

-class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRCoderErrorCorrectionLevel  : public CFX_Object

+class CBC_QRCoderErrorCorrectionLevel

 {

 private:

     FX_INT32 m_ordinal;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
index 9d828c8380..49265e5033 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERFORMATINFORMATION_H_

 #define _BC_QRCODERFORMATINFORMATION_H_

 class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRCoderFormatInformation;

-class CBC_QRCoderFormatInformation  : public CFX_Object

+class CBC_QRCoderFormatInformation

 {

 private:

     const static FX_INT32 FORMAT_INFO_MASK_QR;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
index 134d344e72..13bb11691a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERMASKUTIL_H_

 #define _BC_QRCODERMASKUTIL_H_

 class CBC_CommonByteMatrix;

-class CBC_QRCoderMaskUtil;

-class CBC_QRCoderMaskUtil  : public CFX_Object

+class CBC_QRCoderMaskUtil

 {

 public:

     CBC_QRCoderMaskUtil();

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
index 23a9d88128..ce1e65d4c2 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
@@ -9,8 +9,7 @@
 class CBC_CommonByteMatrix;

 class CBC_QRCoderErrorCorrectionLevel;

 class CBC_QRCoderBitVector;

-class CBC_QRCoderMatrixUtil;

-class CBC_QRCoderMatrixUtil  : public CFX_Object

+class CBC_QRCoderMatrixUtil

 {

 private:

     const static FX_INT32 POSITION_DETECTION_PATTERN[7][7];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
index 71cea9fc78..fbd90871cf 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRCODERMODE_H_

 #define _BC_QRCODERMODE_H_

 class CBC_QRCoderVersion;

-class CBC_QRCoderMode;

-class CBC_QRCoderMode  : public CFX_Object

+class CBC_QRCoderMode

 {

 private:

     FX_INT32* m_characterCountBitsForVersions;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
index b693dd6dd7..17d392121d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -9,8 +9,7 @@
 class CBC_QRCoderECBlocks;

 class CBC_CommonBitMatrix;

 class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRCoderVersion;

-class CBC_QRCoderVersion : public CFX_Object

+class CBC_QRCoderVersion

 {

 private:

     const static FX_INT32 VERSION_DECODE_INFO[34];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
index 4f68c7a9f3..d5697ff724 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
@@ -10,8 +10,7 @@ class CBC_QRCoderVersion;
 class CBC_QRCoderECBlocks;

 class CBC_QRCoderECB;

 class CBC_QRCoderErrorCorrectionLevel;

-class CBC_QRDataBlock;

-class CBC_QRDataBlock : public CFX_Object

+class CBC_QRDataBlock

 {

 private:

     FX_INT32 m_numDataCodewords;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
index 6fcc09d556..221218f34a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
@@ -7,8 +7,7 @@
 #ifndef _BC_QRDATAMASK_H_

 #define _BC_QRDATAMASK_H_

 class CBC_CommonBitMatrix;

-class CBC_QRDataMask;

-class CBC_QRDataMask  : public CFX_Object

+class CBC_QRDataMask

 {

 public:

     static CFX_PtrArray *DATA_MASKS;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
index b64485f788..f4ac06b984 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
@@ -11,8 +11,7 @@ class CBC_QRCoderErrorCorrectionLevel;
 class CBC_CommonBitSource;

 class CBC_QRCoderVersion;

 class CBC_CommonCharacterSetECI;

-class CBC_QRDecodedBitStreamParser;

-class CBC_QRDecodedBitStreamParser  : public CFX_Object

+class CBC_QRDecodedBitStreamParser

 {

 private:

     const static FX_CHAR ALPHANUMERIC_CHARS[45];

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
index 13f6d3dc46..f6b38e5a30 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
@@ -8,8 +8,7 @@
 #define _BC_QRDETECTORRESULT_H_

 class CBC_CommonBitMatrix;

 class CBC_ResultPoint;

-class CBC_QRDetectorResult;

-class CBC_QRDetectorResult  : public CFX_Object

+class CBC_QRDetectorResult

 {

 private:

     CBC_CommonBitMatrix *m_bits;

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
index 7470b553ee..d0fde46542 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
@@ -10,8 +10,8 @@ class CBC_CommonBitMatrix;
 class CBC_QRFinderPattern;

 class CBC_ResultPoint;

 class CBC_QRFinderPatternInfo;

-class CBC_QRFinderPatternFinder;

-class CBC_QRFinderPatternFinder  : public CFX_Object

+

+class CBC_QRFinderPatternFinder

 {

 private:

     const static FX_INT32 CENTER_QUORUM;