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/qrcode/BC_QRCoderFormatInformation.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h') 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; -- cgit v1.2.3