From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: 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 --- xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h') 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, -- cgit v1.2.3