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/fee/include/ifde_txtedtengine.h | 4 ++-- xfa/src/fee/src/fee/fde_txtedtblock.h | 8 ++++---- xfa/src/fee/src/fee/fde_txtedtbuf.h | 8 ++++---- xfa/src/fee/src/fee/fde_txtedtengine.h | 16 ++++++++-------- xfa/src/fee/src/fee/fde_txtedtpage.h | 6 +++--- xfa/src/fee/src/fee/fde_txtedtparag.h | 2 +- xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h | 4 ++-- xfa/src/fgas/include/fx_datetime.h | 4 ++-- xfa/src/fgas/include/fx_fnt.h | 2 +- xfa/src/fgas/include/fx_locale.h | 2 +- xfa/src/fgas/include/fx_utl.h | 2 +- xfa/src/fgas/src/crt/fx_stream.h | 18 +++++++++--------- xfa/src/fgas/src/crt/fx_utils.cpp | 2 +- xfa/src/fgas/src/font/fx_gdifont.h | 4 ++-- xfa/src/fgas/src/font/fx_gefont.h | 2 +- xfa/src/fgas/src/font/fx_stdfontmgr.h | 10 +++++----- xfa/src/fgas/src/layout/fx_rtfbreak.h | 4 ++-- xfa/src/fgas/src/layout/fx_textbreak.h | 4 ++-- xfa/src/fgas/src/localization/fx_locale.cpp | 2 +- xfa/src/fgas/src/localization/fx_localeimp.h | 4 ++-- xfa/src/fgas/src/localization/fx_localemgr.h | 2 +- xfa/src/fgas/src/xml/fx_sax_imp.h | 8 ++++---- xfa/src/fwl/src/basewidget/include/fwl_caretimp.h | 2 +- xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h | 2 +- xfa/src/fwl/src/core/fwl_noteimp.cpp | 2 +- xfa/src/fwl/src/core/include/fwl_formimp.h | 2 +- xfa/src/fwl/src/core/include/fwl_gridimp.h | 6 +++--- xfa/src/fwl/src/core/include/fwl_noteimp.h | 8 ++++---- xfa/src/fwl/src/core/include/fwl_targetimp.h | 3 +-- xfa/src/fwl/src/core/include/fwl_threadimp.h | 2 +- xfa/src/fwl/src/core/include/fwl_widgetimp.h | 2 +- xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h | 6 +++--- xfa/src/fxbarcode/BC_Binarizer.h | 2 +- xfa/src/fxbarcode/BC_BinaryBitmap.h | 2 +- xfa/src/fxbarcode/BC_DecoderResult.h | 8 ++++---- xfa/src/fxbarcode/BC_Dimension.h | 2 +- xfa/src/fxbarcode/BC_LuminanceSource.h | 2 +- xfa/src/fxbarcode/BC_Reader.h | 2 +- xfa/src/fxbarcode/BC_ResultPoint.h | 2 +- xfa/src/fxbarcode/BC_UtilCodingConvert.h | 2 +- xfa/src/fxbarcode/BC_UtilRSS.h | 2 +- xfa/src/fxbarcode/BC_Writer.h | 2 +- xfa/src/fxbarcode/common/BC_CommonBitArray.h | 3 +-- xfa/src/fxbarcode/common/BC_CommonBitMatrix.h | 3 +-- xfa/src/fxbarcode/common/BC_CommonBitSource.h | 3 +-- xfa/src/fxbarcode/common/BC_CommonByteArray.h | 3 +-- xfa/src/fxbarcode/common/BC_CommonByteMatrix.h | 3 +-- xfa/src/fxbarcode/common/BC_CommonDecoderResult.h | 3 +-- xfa/src/fxbarcode/common/BC_CommonECI.h | 3 +-- .../fxbarcode/common/BC_CommonPerspectiveTransform.h | 3 +-- xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h | 3 +-- xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h | 3 +-- .../common/reedsolomon/BC_ReedSolomonDecoder.h | 3 +-- .../fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h | 3 +-- .../common/reedsolomon/BC_ReedSolomonGF256Poly.h | 3 +-- .../datamatrix/BC_DataMatrixBitMatrixParser.h | 3 +-- xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h | 3 +-- .../datamatrix/BC_DataMatrixDecodedBitStreamParser.h | 3 +-- xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h | 3 +-- xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h | 2 +- xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h | 7 +++---- xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h | 3 +-- xfa/src/fxbarcode/datamatrix/BC_Encoder.h | 3 +-- xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h | 3 +-- xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h | 4 ++-- xfa/src/fxbarcode/pdf417/BC_PDF417Common.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h | 2 +- .../fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h | 3 +-- .../fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h | 3 +-- xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h | 4 ++-- xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoder.h | 4 ++-- xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h | 2 +- .../fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRDataMask.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h | 3 +-- xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h | 4 ++-- xfa/src/fxfa/src/app/xfa_checksum.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffConfigAcc.h | 2 +- xfa/src/fxfa/src/app/xfa_ffapp.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffdoc.h | 2 +- xfa/src/fxfa/src/app/xfa_ffdochandler.h | 2 +- xfa/src/fxfa/src/app/xfa_ffdocview.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffnotify.h | 2 +- xfa/src/fxfa/src/app/xfa_ffpageview.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffwidget.h | 2 +- xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 2 +- xfa/src/fxfa/src/app/xfa_ffwidgetacc.h | 2 +- xfa/src/fxfa/src/app/xfa_ffwidgethandler.h | 4 ++-- xfa/src/fxfa/src/app/xfa_fontmgr.h | 6 +++--- xfa/src/fxfa/src/app/xfa_fwltheme.h | 2 +- xfa/src/fxfa/src/app/xfa_rendercontext.h | 2 +- xfa/src/fxfa/src/app/xfa_textlayout.h | 10 +++++----- xfa/src/fxfa/src/common/fxfa_localevalue.h | 2 +- xfa/src/fxfa/src/common/xfa_doclayout.h | 2 +- xfa/src/fxfa/src/common/xfa_document.h | 2 +- xfa/src/fxfa/src/common/xfa_localemgr.h | 4 ++-- xfa/src/fxfa/src/common/xfa_object.h | 6 +++--- xfa/src/fxfa/src/common/xfa_script.h | 2 +- xfa/src/fxfa/src/common/xfa_utils.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_error.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_expression.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_fmparse.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_lexer.h | 4 ++-- xfa/src/fxfa/src/fm2js/xfa_program.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h | 2 +- xfa/src/fxfa/src/parser/xfa_basic_imp.h | 2 +- xfa/src/fxfa/src/parser/xfa_document_layout_imp.h | 2 +- xfa/src/fxfa/src/parser/xfa_document_serialize.h | 4 ++-- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h | 4 ++-- xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h | 4 ++-- xfa/src/fxfa/src/parser/xfa_locale.h | 4 ++-- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 2 +- xfa/src/fxfa/src/parser/xfa_parser_imp.h | 6 +++--- xfa/src/fxfa/src/parser/xfa_script_imp.h | 2 +- xfa/src/fxfa/src/parser/xfa_script_nodehelper.h | 2 +- xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h | 4 ++-- xfa/src/fxgraphics/src/fx_graphics.cpp | 2 +- xfa/src/fxgraphics/src/fx_metafile_interpreter.h | 2 +- xfa/src/fxgraphics/src/fx_path_generator.h | 2 +- xfa/src/fxjse/src/class.h | 2 +- xfa/src/fxjse/src/context.h | 2 +- xfa/src/fxjse/src/runtime.h | 4 ++-- xfa/src/fxjse/src/value.h | 2 +- 158 files changed, 238 insertions(+), 297 deletions(-) (limited to 'xfa/src') diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h index a47739c3c5..5c16696845 100644 --- a/xfa/src/fee/include/ifde_txtedtengine.h +++ b/xfa/src/fee/include/ifde_txtedtengine.h @@ -79,7 +79,7 @@ enum FDE_TXTEDIT_LINEEND { FDE_TXTEDIT_LINEEND_CR, FDE_TXTEDIT_LINEEND_LF, }; -struct _FDE_TXTEDTPARAMS : public CFX_Object { +struct _FDE_TXTEDTPARAMS { _FDE_TXTEDTPARAMS() : fPlateWidth(0) , fPlateHeight(0) @@ -129,7 +129,7 @@ enum FDE_TXTEDT_TEXTCHANGE_TYPE { FDE_TXTEDT_TEXTCHANGE_TYPE_Delete , FDE_TXTEDT_TEXTCHANGE_TYPE_Replace , }; -struct _FDE_TXTEDT_TEXTCHANGE_INFO : public CFX_Object { +struct _FDE_TXTEDT_TEXTCHANGE_INFO { FX_INT32 nChangeType; CFX_WideString wsInsert; CFX_WideString wsDelete; diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.h b/xfa/src/fee/src/fee/fde_txtedtblock.h index 12aee74d39..9ae19ed61f 100644 --- a/xfa/src/fee/src/fee/fde_txtedtblock.h +++ b/xfa/src/fee/src/fee/fde_txtedtblock.h @@ -39,7 +39,7 @@ enum FDE_FORMAT_CARET_DIRECTION { FDE_FORMAT_CARET_MIDDLE, FDE_FORMAT_CARET_BACKWARD }; -class CFDE_TxtEdtBlock : public CFX_Object +class CFDE_TxtEdtBlock { public: CFDE_TxtEdtBlock(CFDE_TxtEdtEngine * pEngine, const CFX_WideString &wsBlock, FX_INT32 nPosition); @@ -72,7 +72,7 @@ private: CFX_ArrayTemplate m_FieldArr; CFX_ArrayTemplate m_EditFieldArr; }; -class CFDE_TxtEdtFieldFormatParser : public CFX_Object +class CFDE_TxtEdtFieldFormatParser { public: CFDE_TxtEdtFieldFormatParser(); @@ -81,7 +81,7 @@ public: FX_INT32 CountItems() const; void GetItem(FX_INT32 nIndex, CFX_WideString &wsKey, CFX_WideString &wsValue) const; private: - typedef struct : public CFX_Object { + typedef struct { FX_INT32 nKeyStart; FX_INT32 nKeyCount; FX_INT32 nValStart; @@ -91,7 +91,7 @@ private: CFX_WideString m_wsFormat; CFX_ArrayTemplate m_ItemArr; }; -class CFDE_TxtEdtField : public CFX_Object +class CFDE_TxtEdtField { public: static CFDE_TxtEdtField * Create(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock); diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h index 5baeacd2f6..7a9100c833 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.h +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h @@ -9,7 +9,7 @@ class IFX_CharIter; class CFDE_TxtEdtBufIter; class CFDE_TxtEdtBuf; -class CFDE_TxtEdtBufIter : public IFX_CharIter, public CFX_Object +class CFDE_TxtEdtBufIter : public IFX_CharIter { public: #ifdef FDE_USEFORMATBLOCK @@ -39,16 +39,16 @@ private: #endif FX_WCHAR m_Alias; }; -class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf, public CFX_Object +class CFDE_TxtEdtBuf : public IFDE_TxtEdtBuf { friend class CFDE_TxtEdtBufIter; - struct _FDE_CHUNKHEADER : public CFX_Object { + struct _FDE_CHUNKHEADER { FX_INT32 nUsed; FX_WCHAR wChars[1]; }; typedef _FDE_CHUNKHEADER FDE_CHUNKHEADER; typedef _FDE_CHUNKHEADER* FDE_LPCHUNKHEADER; - struct _FDE_CHUNKPLACE : public CFX_Object { + struct _FDE_CHUNKPLACE { FX_INT32 nChunkIndex; FX_INT32 nCharIndex; }; diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h index f9f7a6dc8e..dec152c630 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.h +++ b/xfa/src/fee/src/fee/fde_txtedtengine.h @@ -35,7 +35,7 @@ public: virtual FX_BOOL Undo() = 0; virtual void Serialize(CFX_ByteString &bsDoRecord) const = 0; }; -class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine, public CFX_Object +class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine { friend class CFDE_TxtEdtDoRecord_Insert; friend class CFDE_TxtEdtDoRecord_DeleteRange; @@ -46,13 +46,13 @@ class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine, public CFX_Object friend class CFDE_TxtEdtDoRecord_FormatReplace; friend class CFDE_TxtEdtBlock; #endif - struct _FDE_TXTEDTSELRANGE : public CFX_Object { + struct _FDE_TXTEDTSELRANGE { FX_INT32 nStart; FX_INT32 nCount; }; typedef _FDE_TXTEDTSELRANGE FDE_TXTEDTSELRANGE; typedef _FDE_TXTEDTSELRANGE * FDE_LPTXTEDTSELRANGE; - struct _FDE_TXTEDTPARAGPOS : public CFX_Object { + struct _FDE_TXTEDTPARAGPOS { FX_INT32 nParagIndex; FX_INT32 nCharIndex; }; @@ -197,7 +197,7 @@ private: FDE_TXTEDT_TEXTCHANGE_INFO m_ChangeInfo; }; -class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord, public CFX_Object +class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord { public: CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord); @@ -217,7 +217,7 @@ private: FX_INT32 m_nCaret; CFX_WideString m_wsInsert; }; -class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord, public CFX_Object +class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord { public: CFDE_TxtEdtDoRecord_DeleteRange(FX_BSTR bsDoRecord); @@ -241,7 +241,7 @@ private: CFX_WideString m_wsRange; }; #ifdef FDE_USEFORMATBLOCK -class CFDE_TxtEdtDoRecord_FieldInsert : public IFDE_TxtEdtDoRecord, public CFX_Object +class CFDE_TxtEdtDoRecord_FieldInsert : public IFDE_TxtEdtDoRecord { public: CFDE_TxtEdtDoRecord_FieldInsert(FX_BSTR bsDoRecord); @@ -273,7 +273,7 @@ private: CFX_WideString m_wsIns; FX_BOOL m_bSel; }; -class CFDE_TxtEdtDoRecord_FieldDelete : public IFDE_TxtEdtDoRecord, public CFX_Object +class CFDE_TxtEdtDoRecord_FieldDelete : public IFDE_TxtEdtDoRecord { public: CFDE_TxtEdtDoRecord_FieldDelete(FX_BSTR bsDoRecord); @@ -304,7 +304,7 @@ private: CFX_WideString m_wsDel; FX_BOOL m_bSel; }; -class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord, public CFX_Object +class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord { public: CFDE_TxtEdtDoRecord_FieldReplace(FX_BSTR bsDoRecord); diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h index 36021b66aa..7c0d0d1ae0 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.h +++ b/xfa/src/fee/src/fee/fde_txtedtpage.h @@ -43,7 +43,7 @@ static FDE_TXTEDT_CHARTYPE FDE_GetEditSelCharType(FX_WCHAR wChar) return FDE_TXTEDT_CHARTYPE_Char; } } -typedef struct _FDE_TXTEDTPIECE : public CFX_Object { +typedef struct _FDE_TXTEDTPIECE { FX_INT32 nStart; FX_INT32 nCount; FX_INT32 nBidiLevel; @@ -51,7 +51,7 @@ typedef struct _FDE_TXTEDTPIECE : public CFX_Object { FX_DWORD dwCharStyles; } FDE_TEXTEDITPIECE, * FDE_LPTEXTEDITPIECE; typedef CFX_MassArrayTemplate CFDE_TXTEDTPieceMassArray; -class CFDE_TxtEdtTextSet : public IFDE_TextSet, public CFX_Object +class CFDE_TxtEdtTextSet : public IFDE_TextSet { public: CFDE_TxtEdtTextSet(CFDE_TxtEdtPage * pPage); @@ -73,7 +73,7 @@ private: CFDE_TxtEdtPage * m_pPage; }; -class CFDE_TxtEdtPage : public CFX_Object, public IFDE_TxtEdtPage +class CFDE_TxtEdtPage : public IFDE_TxtEdtPage { public: CFDE_TxtEdtPage(IFDE_TxtEdtEngine * pEngine, FX_INT32 nLineIndex); diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/src/fee/fde_txtedtparag.h index 72584feca8..276654e2fa 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.h +++ b/xfa/src/fee/src/fee/fde_txtedtparag.h @@ -8,7 +8,7 @@ #define _FDE_TXTEDTPARAG_H class CFDE_TxtEdtEngine; class CFDE_TxtEdtParag; -class CFDE_TxtEdtParag : public IFDE_TxtEdtParag, public CFX_Object +class CFDE_TxtEdtParag : public IFDE_TxtEdtParag { public: CFDE_TxtEdtParag(CFDE_TxtEdtEngine * pEngine); diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h index 91895a54d7..d897fc5867 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h @@ -24,7 +24,7 @@ enum FX_WordBreakProp { FX_WordBreakProp_ExtendNumLet , }; FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint); -class CFX_CharIter : public IFX_CharIter, public CFX_Object +class CFX_CharIter : public IFX_CharIter { public: CFX_CharIter(const CFX_WideString & wsText); @@ -41,7 +41,7 @@ private: const CFX_WideString &m_wsText; FX_INT32 m_nIndex; }; -class CFX_WordBreak : public IFX_WordBreak, public CFX_Object +class CFX_WordBreak : public IFX_WordBreak { public: CFX_WordBreak(); diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h index dd0a5d6147..d18b899fc6 100644 --- a/xfa/src/fgas/include/fx_datetime.h +++ b/xfa/src/fgas/include/fx_datetime.h @@ -21,7 +21,7 @@ enum FX_WEEKDAY { FX_BOOL FX_IsLeapYear(FX_INT32 iYear); FX_INT32 FX_DaysInYear(FX_INT32 iYear); FX_BYTE FX_DaysInMonth(FX_INT32 iYear, FX_BYTE iMonth); -class CFX_Unitime : public CFX_Object +class CFX_Unitime { public: CFX_Unitime() @@ -278,7 +278,7 @@ typedef FX_DATETIMEZONE const * FX_LPCDATETIMEZONE; #if _FX_OS_ != _FX_ANDROID_ #pragma pack(pop) #endif -class CFX_DateTime : public CFX_Object +class CFX_DateTime { public: CFX_DateTime() {} diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h index d664853df7..491feaea37 100644 --- a/xfa/src/fgas/include/fx_fnt.h +++ b/xfa/src/fgas/include/fx_fnt.h @@ -73,7 +73,7 @@ public: #endif }; #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -typedef struct _FX_FONTMATCHPARAMS : public CFX_Object { +typedef struct _FX_FONTMATCHPARAMS { FX_LPCWSTR pwsFamily; FX_DWORD dwFontStyles; FX_DWORD dwUSB; diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h index 6886974fd2..25a6dda4e1 100644 --- a/xfa/src/fgas/include/fx_locale.h +++ b/xfa/src/fgas/include/fx_locale.h @@ -108,7 +108,7 @@ public: virtual FX_BOOL FormatZero(const CFX_WideString& wsPattern, CFX_WideString& wsOutput) = 0; virtual FX_BOOL FormatNull(const CFX_WideString& wsPattern, CFX_WideString& wsOutput) = 0; }; -class CFX_Decimal : CFX_Object +class CFX_Decimal { public: CFX_Decimal(); diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index 354d4bf2bb..850543786c 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -752,7 +752,7 @@ protected: friend class CFX_CPLTree; }; template -class CFX_CPLTree : public CFX_Object +class CFX_CPLTree { public: typedef CFX_CPLTreeNode CPLTreeNode; diff --git a/xfa/src/fgas/src/crt/fx_stream.h b/xfa/src/fgas/src/crt/fx_stream.h index 630a0fb77f..30cb98486e 100644 --- a/xfa/src/fgas/src/crt/fx_stream.h +++ b/xfa/src/fgas/src/crt/fx_stream.h @@ -17,7 +17,7 @@ class CFX_TextStream; class CFX_FileRead; class CFX_FileWrite; class CFX_BufferAccImp; -class CFX_StreamImp : public CFX_ThreadLock, public CFX_Object +class CFX_StreamImp : public CFX_ThreadLock { public: virtual void Release() @@ -197,7 +197,7 @@ enum FX_STREAMTYPE { FX_STREAMTYPE_Stream , FX_STREAMTYPE_BufferRead , }; -class CFX_Stream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object +class CFX_Stream : public IFX_Stream, public CFX_ThreadLock { public: CFX_Stream(); @@ -245,7 +245,7 @@ protected: FX_INT32 m_iLength; FX_INT32 m_iRefCount; }; -class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object +class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock { public: CFX_TextStream(IFX_Stream *pStream, FX_BOOL bDelStream); @@ -292,7 +292,7 @@ protected: void InitStream(); }; #ifdef FX_FILESIZE -class CFGAS_FileRead : public IFX_FileRead, public CFX_Object +class CFGAS_FileRead : public IFX_FileRead { public: CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream); @@ -308,7 +308,7 @@ protected: IFX_Stream *m_pStream; }; #else -class CFGAS_FileRead : public IFX_FileRead, public CFX_Object +class CFGAS_FileRead : public IFX_FileRead { public: CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream); @@ -327,7 +327,7 @@ protected: }; #endif #ifdef FX_FILESIZE -class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object +class CFX_BufferAccImp : public IFX_FileRead { public: CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_FILESIZE iFileSize, FX_BOOL bReleaseStream); @@ -344,7 +344,7 @@ protected: FX_FILESIZE m_iBufSize; }; #else -class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object +class CFX_BufferAccImp : public IFX_FileRead { public: CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_INT32 iFileSize, FX_BOOL bReleaseStream); @@ -364,7 +364,7 @@ protected: }; #endif #ifdef FX_FILESIZE -class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object +class CFGAS_FileWrite : public IFX_FileWrite { public: CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream); @@ -382,7 +382,7 @@ protected: FX_BOOL m_bReleaseStream; }; #else -class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object +class CFGAS_FileWrite : public IFX_FileWrite { public: CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream); diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp index 0ee8152854..6f8452237f 100644 --- a/xfa/src/fgas/src/crt/fx_utils.cpp +++ b/xfa/src/fgas/src/crt/fx_utils.cpp @@ -340,7 +340,7 @@ void CFX_BaseMassArray::RemoveAll(FX_BOOL bLeaveMemory) { m_pData->RemoveAll(bLeaveMemory); } -typedef struct _FX_BASEDISCRETEARRAYDATA : public CFX_Object { +typedef struct _FX_BASEDISCRETEARRAYDATA { FX_INT32 iBlockSize; FX_INT32 iChunkSize; FX_INT32 iChunkCount; diff --git a/xfa/src/fgas/src/font/fx_gdifont.h b/xfa/src/fgas/src/font/fx_gdifont.h index f6d88f38a0..3c159f5057 100644 --- a/xfa/src/fgas/src/font/fx_gdifont.h +++ b/xfa/src/fgas/src/font/fx_gdifont.h @@ -13,7 +13,7 @@ typedef struct _FX_GDIGOCACHE { FX_LPBYTE pOutline; } FX_GDIGOCACHE, * FX_LPGDIGOCACHE; typedef FX_GDIGOCACHE const * FX_LPCGDIGOCACHE; -class CFX_GdiFontCache : public CFX_Object +class CFX_GdiFontCache { public: CFX_GdiFontCache(); @@ -23,7 +23,7 @@ public: protected: CFX_MapPtrToPtr m_GlyphMap; }; -class CFX_GdiFont : public IFX_Font, public CFX_ThreadLock, public CFX_Object +class CFX_GdiFont : public IFX_Font, public CFX_ThreadLock { public: CFX_GdiFont(IFX_FontMgr *pFontMgr); diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h index 430ff09852..585a04c638 100644 --- a/xfa/src/fgas/src/font/fx_gefont.h +++ b/xfa/src/fgas/src/font/fx_gefont.h @@ -11,7 +11,7 @@ class CFX_GEFontMgr; #ifndef FXFONT_SUBST_ITALIC #define FXFONT_SUBST_ITALIC 0x02 #endif -class CFX_GEFont : public IFX_Font, public CFX_ThreadLock, public CFX_Object +class CFX_GEFont : public IFX_Font, public CFX_ThreadLock { public: CFX_GEFont(const CFX_GEFont &src, FX_DWORD dwFontStyles); diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h index adcc737ca5..ba44233ad0 100644 --- a/xfa/src/fgas/src/font/fx_stdfontmgr.h +++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h @@ -9,7 +9,7 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ FX_INT32 FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, FX_DWORD dwFontStyles); FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, FX_LPVOID pUserData); -class CFX_StdFontMgrImp : public IFX_FontMgr, public CFX_Object +class CFX_StdFontMgrImp : public IFX_FontMgr { public: CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher, FX_LPVOID pUserData); @@ -48,7 +48,7 @@ protected: }; FX_DWORD FX_GetGdiFontStyles(const LOGFONTW &lf); #else -class CFX_FontDescriptor : public CFX_Object +class CFX_FontDescriptor { public: CFX_FontDescriptor() @@ -92,7 +92,7 @@ public: }; }; typedef CFX_ArrayTemplate CFX_FontDescriptorInfos; -struct FX_HandleParentPath : public CFX_Object { +struct FX_HandleParentPath { FX_HandleParentPath() { } @@ -104,7 +104,7 @@ struct FX_HandleParentPath : public CFX_Object { void* pFileHandle; CFX_ByteString bsParentPath; }; -class CFX_FontSourceEnum_File : public IFX_FontSourceEnum, public CFX_Object +class CFX_FontSourceEnum_File : public IFX_FontSourceEnum { public: CFX_FontSourceEnum_File(); @@ -127,7 +127,7 @@ typedef CFX_MapPtrTemplate* > CFX_HashFon typedef CFX_MapPtrTemplate CFX_UnicodeFontMap; typedef CFX_MapPtrTemplate* > CFX_FileFontMap; typedef CFX_MapPtrTemplate CFX_FonStreamtMap; -class CFX_FontMgrImp : public IFX_FontMgr, public CFX_Object +class CFX_FontMgrImp : public IFX_FontMgr { public: CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, FX_LPVOID pUserData = NULL); diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h index bf5f1ee4b5..c8f69277da 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.h +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h @@ -8,7 +8,7 @@ #define _FX_RTFBREAK_IMP class CFX_RTFLine; class CFX_RTFBreak; -class CFX_RTFLine : public CFX_Object +class CFX_RTFLine { public: CFX_RTFLine() : m_LinePieces(16) @@ -78,7 +78,7 @@ public: FX_INT32 m_iArabicChars; FX_INT32 m_iMBCSChars; }; -class CFX_RTFBreak : public IFX_RTFBreak, public CFX_Object +class CFX_RTFBreak : public IFX_RTFBreak { public: CFX_RTFBreak(FX_DWORD dwPolicies); diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h index c5bbc40946..a80b16c1b3 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.h +++ b/xfa/src/fgas/src/layout/fx_textbreak.h @@ -8,7 +8,7 @@ #define _FX_TEXTBREAK_IMP class CFX_TxtLine; class CFX_Txtbreak; -class CFX_TxtLine : public CFX_Object +class CFX_TxtLine { public: CFX_TxtLine(FX_INT32 iBlockSize) : m_iStart(0) @@ -66,7 +66,7 @@ public: FX_INT32 m_iWidth; FX_INT32 m_iArabicChars; }; -class CFX_TxtBreak : public IFX_TxtBreak, public CFX_Object +class CFX_TxtBreak : public IFX_TxtBreak { public: CFX_TxtBreak(FX_DWORD dwPolicies); diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp index e519e37257..4998201871 100644 --- a/xfa/src/fgas/src/localization/fx_locale.cpp +++ b/xfa/src/fgas/src/localization/fx_locale.cpp @@ -256,7 +256,7 @@ static const FX_FLOAT gs_fraction_scales[] = {0.1f, 0.01f, 0.001f, 0.0001f, 0.00 0.0000001f, 0.00000001f, 0.000000001f, 0.0000000001f, 0.00000000001f }; static const FX_INT32 gs_fraction_count = sizeof(gs_fraction_scales) / sizeof(FX_FLOAT); -class CFX_LCNumeric : public CFX_Object +class CFX_LCNumeric { public: CFX_LCNumeric(); diff --git a/xfa/src/fgas/src/localization/fx_localeimp.h b/xfa/src/fgas/src/localization/fx_localeimp.h index 7698388020..c7d534d106 100644 --- a/xfa/src/fgas/src/localization/fx_localeimp.h +++ b/xfa/src/fgas/src/localization/fx_localeimp.h @@ -7,7 +7,7 @@ #ifndef _FX_LOCALE_IMP_H_ #define _FX_LOCALE_IMP_H_ class CFX_LCNumeric; -class CFX_Locale : public IFX_Locale, public CFX_Object +class CFX_Locale : public IFX_Locale { public: CFX_Locale(CXML_Element* pLocaleData); @@ -33,7 +33,7 @@ protected: virtual ~CFX_Locale(); CXML_Element* m_pElement; }; -class CFX_FormatString : public IFX_FormatString, public CFX_Object +class CFX_FormatString : public IFX_FormatString { public: CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, FX_BOOL bUseLCID); diff --git a/xfa/src/fgas/src/localization/fx_localemgr.h b/xfa/src/fgas/src/localization/fx_localemgr.h index b23940e8d5..5e995b2e1b 100644 --- a/xfa/src/fgas/src/localization/fx_localemgr.h +++ b/xfa/src/fgas/src/localization/fx_localemgr.h @@ -6,7 +6,7 @@ #ifndef _FX_LOCALEMGR_IMP_H_ #define _FX_LOCALEMGR_IMP_H_ -class CFX_LocaleMgr : public IFX_LocaleMgr, public CFX_Object +class CFX_LocaleMgr : public IFX_LocaleMgr { public: CFX_LocaleMgr(FX_WORD wDefLCID); diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.h b/xfa/src/fgas/src/xml/fx_sax_imp.h index f18173183f..444bcbdf8e 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.h +++ b/xfa/src/fgas/src/xml/fx_sax_imp.h @@ -7,7 +7,7 @@ #ifndef _FX_SAX_IMP_ #define _FX_SAX_IMP_ #define FX_SAXFILE_BUFSIZE 32768 -class CFX_SAXFile : public CFX_Object +class CFX_SAXFile { public: CFX_SAXFile(); @@ -39,7 +39,7 @@ enum FX_SAXMODE { FX_SAXMODE_TargetData, FX_SAXMODE_MAX, }; -class CFX_SAXItem : public CFX_Object +class CFX_SAXItem { public: CFX_SAXItem() : m_pNode(NULL) @@ -56,7 +56,7 @@ public: CFX_SAXItem* m_pPrev; CFX_SAXItem* m_pNext; }; -class CFX_SAXCommentContext : public CFX_Object +class CFX_SAXCommentContext { public: CFX_SAXCommentContext() : m_iHeaderCount(0) @@ -66,7 +66,7 @@ public: FX_INT32 m_iHeaderCount; FX_INT32 m_iTailCount; }; -class CFX_SAXReader : public IFX_SAXReader, public CFX_Object +class CFX_SAXReader : public IFX_SAXReader { public: CFX_SAXReader(); diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h index fcae080130..673c720841 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h @@ -33,7 +33,7 @@ public: virtual FWL_ERR SetColor(CFX_Color crFill); protected: FX_BOOL DrawCaretBK(CFX_Graphics *pGraphics, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix); - class CFWL_CaretTimer : public CFX_Object + class CFWL_CaretTimer { public: CFWL_CaretTimer(CFWL_CaretImp *m_pCaret); diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h index bb859968f2..8fe41b762c 100644 --- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h +++ b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h @@ -6,7 +6,7 @@ #ifndef _FXMATH_BARCODEIMP_H_ #define _FXMATH_BARCODEIMP_H_ -class CFX_Barcode : public IFX_Barcode, public CFX_Object +class CFX_Barcode : public IFX_Barcode { public: CFX_Barcode(); diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 417020ac0f..51041dba5b 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -808,7 +808,7 @@ void CFWL_NoteDriver::ClearInvalidEventTargets(FX_BOOL bRemoveAll) } } } -class CFWL_CoreToopTipDP : public IFWL_ToolTipDP, public CFX_Object +class CFWL_CoreToopTipDP : public IFWL_ToolTipDP { public: FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption); diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/include/fwl_formimp.h index 357f8e86de..b283c121e9 100644 --- a/xfa/src/fwl/src/core/include/fwl_formimp.h +++ b/xfa/src/fwl/src/core/include/fwl_formimp.h @@ -19,7 +19,7 @@ class CFWL_FormDelegate; #define FWL_SYSBUTTONSTATE_Hover 0x0001 #define FWL_SYSBUTTONSTATE_Pressed 0x0002 #define FWL_SYSBUTTONSTATE_Disabled 0x0010 -class CFWL_SysBtn : public CFX_Object +class CFWL_SysBtn { public: CFWL_SysBtn() diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h index 7538f1b048..1bd7ada04b 100644 --- a/xfa/src/fwl/src/core/include/fwl_gridimp.h +++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h @@ -12,7 +12,7 @@ class CFWL_GridLength; class CFWL_GridColRow; class CFWL_GridWidgetInfo; class CFWL_GridImp; -class CFWL_GridLength : public CFX_Object +class CFWL_GridLength { public: CFWL_GridLength() @@ -28,7 +28,7 @@ public: FX_FLOAT fLength; FWL_GRIDUNIT eUnit; }; -class CFWL_GridColRow : public CFX_Object +class CFWL_GridColRow { public: CFWL_GridColRow() @@ -45,7 +45,7 @@ public: FX_FLOAT m_fActualSize; FX_FLOAT m_fActualPos; }; -class CFWL_GridWidgetInfo : public CFX_Object +class CFWL_GridWidgetInfo { public: CFWL_GridWidgetInfo() diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h index aeed0b3955..08ab13d3e7 100644 --- a/xfa/src/fwl/src/core/include/fwl_noteimp.h +++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h @@ -16,7 +16,7 @@ class CFWL_NoteLoop; class CFWL_NoteDriver; class CFWL_EventTarget; class CFWL_ToolTipContainer; -class CFWL_NoteLoop : public CFX_Object +class CFWL_NoteLoop { public: CFWL_NoteLoop(CFWL_WidgetImp *pForm = NULL); @@ -33,7 +33,7 @@ protected: CFWL_WidgetImp *m_pForm; FX_BOOL m_bContinueModal; }; -class CFWL_NoteDriver : public CFX_Object +class CFWL_NoteDriver { public: CFWL_NoteDriver(); @@ -97,7 +97,7 @@ protected: FX_LPVOID m_hookInfo; }; typedef CFX_MapPtrTemplate CFWL_EventSource; -class CFWL_EventTarget : public CFX_Object +class CFWL_EventTarget { public: CFWL_EventTarget(CFWL_NoteDriver *pNoteDriver, IFWL_Widget *pListener) @@ -124,7 +124,7 @@ protected: CFWL_NoteDriver *m_pNoteDriver; FX_BOOL m_bInvalid; }; -class CFWL_ToolTipContainer: public CFX_Object +class CFWL_ToolTipContainer { public: static CFWL_ToolTipContainer* getInstance(); diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h index 14e54cdebc..2fa2bf7322 100644 --- a/xfa/src/fwl/src/core/include/fwl_targetimp.h +++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h @@ -7,8 +7,7 @@ #ifndef _FWL_TARGET_IMP_H #define _FWL_TARGET_IMP_H class IFWL_Target; -class CFWL_Target; -class CFWL_Target : public CFX_Object +class CFWL_Target { public: virtual FX_DWORD Release(); diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/include/fwl_threadimp.h index d7ac365c61..e03e6c6e15 100644 --- a/xfa/src/fwl/src/core/include/fwl_threadimp.h +++ b/xfa/src/fwl/src/core/include/fwl_threadimp.h @@ -13,7 +13,7 @@ class IFWL_NoteDriver; class CFWL_Thread; class CFWL_NoteThread; class CFWL_ControlThread; -class CFWL_Thread : public CFX_Object +class CFWL_Thread { public: CFWL_Thread(); diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h index 439bdac956..862bb53665 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h @@ -117,7 +117,7 @@ protected: friend void FWL_SetWidgetStates(IFWL_Widget *widget, FX_DWORD dwStates); friend void FWL_SetWidgetStyles(IFWL_Widget *widget, FX_DWORD dwStyles); }; -class CFWL_WidgetImpDelegate : public CFX_Object +class CFWL_WidgetImpDelegate { public: CFWL_WidgetImpDelegate(); diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h index 3defb63f08..314021f9b6 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h @@ -13,7 +13,7 @@ class CFWL_WidgetMgrItem; class CFWL_WidgetMgr; class CFWL_WidgetMgrDelegate; class IFWL_AdapterNative; -class CFWL_WidgetMgrItem : public CFX_Object +class CFWL_WidgetMgrItem { public: CFWL_WidgetMgrItem() @@ -49,7 +49,7 @@ public: FX_BOOL bOutsideChanged; #endif }; -class CFWL_WidgetMgr : public CFX_Object +class CFWL_WidgetMgr { public: CFWL_WidgetMgr(IFWL_AdapterNative *pAdapterNative); @@ -123,7 +123,7 @@ protected: CFX_RectF m_rtScreen; #endif }; -class CFWL_WidgetMgrDelegate : public CFX_Object +class CFWL_WidgetMgrDelegate { public: CFWL_WidgetMgrDelegate(CFWL_WidgetMgr *pWidgetMgr); 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; diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h index 5e2eca72f0..dc080096bd 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.h +++ b/xfa/src/fxfa/src/app/xfa_checksum.h @@ -8,7 +8,7 @@ #define _FXFA_FORMFILLER_CHECKSUM_IMP_H class CXFA_SAXReaderHandler; class CXFA_ChecksumContext; -class CXFA_SAXContext : public CFX_Object +class CXFA_SAXContext { public: CXFA_SAXContext() : m_eNode(FX_SAXNODE_Unknown) @@ -18,7 +18,7 @@ public: CFX_ByteString m_bsTagName; FX_SAXNODE m_eNode; }; -class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler, public CFX_Object +class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler { public: CXFA_SAXReaderHandler(CXFA_ChecksumContext *pContext); @@ -36,7 +36,7 @@ protected: CXFA_ChecksumContext *m_pContext; CXFA_SAXContext m_SAXContext; }; -class CXFA_ChecksumContext : public IXFA_ChecksumContext, public CFX_Object +class CXFA_ChecksumContext : public IXFA_ChecksumContext { public: CXFA_ChecksumContext(); diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h index 9cd7fc345a..73237b9f01 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h @@ -6,7 +6,7 @@ #ifndef _FXFA_FORMFILLERCONFIGACC_IMP_H #define _FXFA_FORMFILLERCONFIGACC_IMP_H -class CXFA_FFConfigAcc : public CFX_Object +class CXFA_FFConfigAcc { public: CXFA_FFConfigAcc(CXFA_Node *pNode); diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.h b/xfa/src/fxfa/src/app/xfa_ffapp.h index 8df5fcde65..82d0b95e02 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.h +++ b/xfa/src/fxfa/src/app/xfa_ffapp.h @@ -6,7 +6,7 @@ #ifndef _FXFA_FORMFILLER_APP_IMP_H #define _FXFA_FORMFILLER_APP_IMP_H -class CXFA_FileRead : public IFX_FileRead, public CFX_Object +class CXFA_FileRead : public IFX_FileRead { public: CXFA_FileRead(const CFX_ArrayTemplate &streams); @@ -22,7 +22,7 @@ protected: CFX_DWordArray m_StreamSize; FX_DWORD m_dwSize; }; -class CXFA_FileRead2 : public IFX_FileRead, public CFX_Object +class CXFA_FileRead2 : public IFX_FileRead { public: CXFA_FileRead2(const CFX_ArrayTemplate &streams); @@ -43,7 +43,7 @@ class CXFA_FWLTheme; class CXFA_FFDocHandler; class CXFA_FFMenuHandler; class CXFA_FontMgr; -class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative, public CFX_Object +class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative { public: CXFA_FFApp(IXFA_AppProvider* pProvider); diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h index c11c675ea6..0f95d0b2ff 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.h +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h @@ -15,7 +15,7 @@ typedef struct _FX_IMAGEDIB_AND_DPI { FX_INT32 iImageXDpi; FX_INT32 iImageYDpi; } FX_IMAGEDIB_AND_DPI; -class CXFA_FFDoc : public CFX_Object +class CXFA_FFDoc { public: CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider); diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/src/app/xfa_ffdochandler.h index c4c0853f12..27b5b920be 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.h @@ -6,7 +6,7 @@ #ifndef _FXFA_FORMFILLER_DOCHANDLER_IMP_H #define _FXFA_FORMFILLER_DOCHANDLER_IMP_H -class CXFA_FFDocHandler : public IXFA_DocHandler, public CFX_Object +class CXFA_FFDocHandler : public IXFA_DocHandler { public: CXFA_FFDocHandler(); diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h index 1e73499032..2f7919bded 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.h +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h @@ -28,7 +28,7 @@ enum XFA_DOCVIEW_LAYOUTSTATUS { XFA_DOCVIEW_LAYOUTSTATUS_End, XFA_DOCVIEW_LAYOUTSTATUS_Next, }; -class CXFA_FFDocView : public IXFA_DocView, public CFX_Object +class CXFA_FFDocView : public IXFA_DocView { public: CXFA_FFDocView(CXFA_FFDoc* pDoc); @@ -116,7 +116,7 @@ protected: FX_INT32 m_iLock; friend class CXFA_FFNotify; }; -class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator, public CFX_Object +class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator { public: CXFA_FFDocWidgetIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot); @@ -139,7 +139,7 @@ protected: CXFA_FFDocView* m_pDocView; CXFA_FFWidget* m_pCurWidget; }; -class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator, public CFX_Object +class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator { public: CXFA_WidgetAccIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot); diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h index dd2b80ed29..a0f0820cbb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.h +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h @@ -6,7 +6,7 @@ #ifndef _FXFA_FFNOTIFY_H_ #define _FXFA_FFNOTIFY_H_ -class CXFA_FFNotify : public IXFA_Notify, public CFX_Object +class CXFA_FFNotify : public IXFA_Notify { public: CXFA_FFNotify(CXFA_FFDoc* pDoc); diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.h b/xfa/src/fxfa/src/app/xfa_ffpageview.h index 3ebe1b9d31..019c324174 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.h +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.h @@ -33,7 +33,7 @@ protected: FX_BOOL m_bLoaded; }; typedef CXFA_NodeIteratorTemplate CXFA_LayoutItemIterator; -class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator, public CFX_Object +class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator { public: CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter); @@ -59,7 +59,7 @@ protected: CXFA_LayoutItemIterator m_sIterator; }; typedef CFX_ArrayTemplate CXFA_WidgetArray; -class CXFA_TabParam : public CFX_Object +class CXFA_TabParam { public: CXFA_TabParam() : m_pWidget(NULL) {} @@ -68,7 +68,7 @@ public: CXFA_FFWidget* m_pWidget; CXFA_WidgetArray m_Children; }; -class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator, public CFX_Object +class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator { public: CXFA_FFTabOrderPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h index bfac36e398..2e757238e6 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h @@ -23,7 +23,7 @@ enum XFA_WIDGETITEM { XFA_WIDGETITEM_NextSibling, XFA_WIDGETITEM_PrevSibling, }; -class CXFA_CalcData : public CFX_Object +class CXFA_CalcData { public: CXFA_CalcData() : m_iRefCount(0) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index df9ad9f466..d51b1faabf 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -25,7 +25,7 @@ static void XFA_FFDeleteCalcData(FX_LPVOID pData) } } static XFA_MAPDATABLOCKCALLBACKINFO gs_XFADeleteCalcData = {XFA_FFDeleteCalcData, NULL}; -class CXFA_WidgetLayoutData : public CFX_Object +class CXFA_WidgetLayoutData { public: CXFA_WidgetLayoutData() diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h index 38f9678140..6c6ccea8cb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h @@ -14,7 +14,7 @@ enum XFA_TEXTPROVIDERTYPE { XFA_TEXTPROVIDERTYPE_Rollover, XFA_TEXTPROVIDERTYPE_Down, }; -class CXFA_TextProvider : public IXFA_TextProvider, public CFX_Object +class CXFA_TextProvider : public IXFA_TextProvider { public: CXFA_TextProvider(CXFA_WidgetAcc *pWidgetAcc, XFA_TEXTPROVIDERTYPE eType, CXFA_Node* pTextNode = NULL) diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h index 1d58790a02..286770a0ad 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h @@ -7,7 +7,7 @@ #ifndef _FXFA_FORMFILLER_ANNOTHANDLER_IMP_H #define _FXFA_FORMFILLER_ANNOTHANDLER_IMP_H class CXFA_FFDocView; -class CXFA_FFWidgetHandler : public IXFA_WidgetHandler, public CFX_Object +class CXFA_FFWidgetHandler : public IXFA_WidgetHandler { public: CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView); @@ -77,7 +77,7 @@ protected: CXFA_FFDocView* m_pDocView; }; -class CXFA_FFMenuHandler : public IXFA_MenuHandler, public CFX_Object +class CXFA_FFMenuHandler : public IXFA_MenuHandler { public: CXFA_FFMenuHandler(); diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h index b5781c4954..09e0d19096 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.h +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h @@ -13,7 +13,7 @@ struct XFA_FONTINFO { FX_WORD dwStyles; FX_WORD wCodePage; }; -class CXFA_DefFontMgr : public IXFA_FontMgr, public CFX_Object +class CXFA_DefFontMgr : public IXFA_FontMgr { public: CXFA_DefFontMgr() {} @@ -27,7 +27,7 @@ public: protected: CFX_PtrArray m_CacheFonts; }; -class CXFA_PDFFontMgr : public IFX_FontProvider, public CFX_Object +class CXFA_PDFFontMgr : public IFX_FontProvider { public: CXFA_PDFFontMgr(CXFA_FFDoc* pDoc); @@ -42,7 +42,7 @@ protected: CXFA_FFDoc* m_pDoc; CFX_CMapByteStringToPtr m_FontArray; }; -class CXFA_FontMgr : public CFX_Object +class CXFA_FontMgr { public: CXFA_FontMgr(); diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h index beb5e6abf6..34003b4eb1 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.h +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h @@ -6,7 +6,7 @@ #ifndef _XFA_FWL_THEME_IMP_H #define _XFA_FWL_THEME_IMP_H -class CXFA_FWLTheme : public IFWL_ThemeProvider, public CFX_Object +class CXFA_FWLTheme : public IFWL_ThemeProvider { public: CXFA_FWLTheme(CXFA_FFApp *pApp); diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/src/app/xfa_rendercontext.h index f50adddec1..974f0a3492 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.h +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.h @@ -6,7 +6,7 @@ #ifndef _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H #define _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H -class CXFA_RenderContext : public IXFA_RenderContext, public CFX_Object +class CXFA_RenderContext : public IXFA_RenderContext { public: CXFA_RenderContext(); diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h index 47b37720ed..a47189cb3f 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.h +++ b/xfa/src/fxfa/src/app/xfa_textlayout.h @@ -18,7 +18,7 @@ public: virtual CXFA_FFDoc* GetDocNode() = 0; virtual FX_BOOL GetEmbbedObj(FX_BOOL bURI, FX_BOOL bRaw, const CFX_WideString &wsAttr, CFX_WideString &wsValue) = 0; }; -class CXFA_CSSTagProvider : public IFDE_CSSTagProvider, public CFX_Object +class CXFA_CSSTagProvider : public IFDE_CSSTagProvider { public: CXFA_CSSTagProvider () @@ -79,7 +79,7 @@ protected: FX_DWORD m_dwMatchedDecls : 28; FDE_CSSDISPLAY m_eDisplay : 4; }; -class CXFA_TextParser : public CFX_Object +class CXFA_TextParser { public: CXFA_TextParser() : m_pAllocator(NULL), m_pSelector(NULL), m_pUASheet(NULL) {} @@ -120,7 +120,7 @@ private: IFDE_CSSStyleSheet *m_pUASheet; CFX_MapPtrTemplate m_mapXMLNodeToParseContext; }; -class CXFA_LoaderContext : public CFX_Object +class CXFA_LoaderContext { public: CXFA_LoaderContext() : m_bSaveLineHeight(FALSE) @@ -278,7 +278,7 @@ struct XFA_TABSTOPS { FX_DWORD dwAlign; FX_FLOAT fTabstops; }; -class CXFA_TextTabstopsContext : public CFX_Object +class CXFA_TextTabstopsContext { public: CXFA_TextTabstopsContext() : m_iTabCount(0), m_iTabIndex(-1), m_bTabstops(FALSE), m_fTabWidth(0), m_fLeft(0) {} @@ -317,7 +317,7 @@ public: FX_FLOAT m_fTabWidth; FX_FLOAT m_fLeft; }; -class CXFA_TextLayout : public CFX_Object +class CXFA_TextLayout { public: CXFA_TextLayout(IXFA_TextProvider *pTextProvider); diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/src/common/fxfa_localevalue.h index 7e4ceed134..b6a3db5096 100644 --- a/xfa/src/fxfa/src/common/fxfa_localevalue.h +++ b/xfa/src/fxfa/src/common/fxfa_localevalue.h @@ -18,7 +18,7 @@ class CXFA_LocaleMgr; #define XFA_VT_DATE 32 #define XFA_VT_TIME 64 #define XFA_VT_DATETIME 128 -class CXFA_LocaleValue : public CFX_Object +class CXFA_LocaleValue { public: CXFA_LocaleValue(); diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h index 3d6df9f199..d5aaaa9cf8 100644 --- a/xfa/src/fxfa/src/common/xfa_doclayout.h +++ b/xfa/src/fxfa/src/common/xfa_doclayout.h @@ -23,7 +23,7 @@ public: CXFA_LayoutItem* GetNext() const; CXFA_LayoutItem* GetLast() const; }; -class CXFA_LayoutItemImpl : public CFX_Object +class CXFA_LayoutItemImpl { public: CXFA_LayoutItemImpl(CXFA_Node *pNode, FX_BOOL bIsContentLayoutItem); diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h index 502aa2591a..e935940c37 100644 --- a/xfa/src/fxfa/src/common/xfa_document.h +++ b/xfa/src/fxfa/src/common/xfa_document.h @@ -106,7 +106,7 @@ class CScript_HostPseudoModel; class CScript_LogPseudoModel; class CScript_LayoutPseudoModel; class CScript_SignaturePseudoModel; -class CXFA_Document : public IXFA_ObjFactory, public CFX_Object +class CXFA_Document : public IXFA_ObjFactory { public: CXFA_Document(IXFA_DocParser *pParser); diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h index f425a903fc..ff3ab3927f 100644 --- a/xfa/src/fxfa/src/common/xfa_localemgr.h +++ b/xfa/src/fxfa/src/common/xfa_localemgr.h @@ -25,7 +25,7 @@ class CXFA_LocaleMgr; #define XFA_LANGID_pt_BR 0x0416 #define XFA_LANGID_nl_NL 0x0413 #define XFA_LANGID_ru_RU 0x0419 -class CXFA_LocaleMgr : public IFX_LocaleMgr, public CFX_Object +class CXFA_LocaleMgr : public IFX_LocaleMgr { public: CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid); @@ -56,7 +56,7 @@ public: virtual void GetTimeZone(FX_TIMEZONE& tz) = 0; }; -class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider, public CFX_Object +class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider { public: CXFA_TimeZoneProvider(); diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h index c285b9d902..d2b0f1df96 100644 --- a/xfa/src/fxfa/src/common/xfa_object.h +++ b/xfa/src/fxfa/src/common/xfa_object.h @@ -38,7 +38,7 @@ enum XFA_OBJECTTYPE { XFA_NODEFLAG_UnusedNode = 0x08000, XFA_NODEFLAG_LayoutGeneratedNode = 0x10000, }; -class CXFA_Object : public CFX_Object +class CXFA_Object { public: CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags); @@ -109,7 +109,7 @@ typedef struct _XFA_MAPDATABLOCKCALLBACKINFO { PD_CALLBACK_FREEDATA pFree; PD_CALLBACK_DUPLICATEDATA pCopy; } XFA_MAPDATABLOCKCALLBACKINFO; -typedef struct _XFA_MAPDATABLOCK : public CFX_Object { +typedef struct _XFA_MAPDATABLOCK { FX_LPBYTE GetData() const { return (FX_LPBYTE)this + sizeof(_XFA_MAPDATABLOCK); @@ -117,7 +117,7 @@ typedef struct _XFA_MAPDATABLOCK : public CFX_Object { XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo; FX_INT32 iBytes; } XFA_MAPDATABLOCK, * XFA_LPMAPDATABLOCK; -typedef struct _XFA_MAPMODULEDATA : public CFX_Object { +typedef struct _XFA_MAPMODULEDATA { CFX_MapPtrToPtr m_ValueMap; CFX_MapPtrTemplate m_BufferMap; } XFA_MAPMODULEDATA, * XFA_LPMAPMODULEDATA; diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h index eb3b8472d4..a61dc959b3 100644 --- a/xfa/src/fxfa/src/common/xfa_script.h +++ b/xfa/src/fxfa/src/common/xfa_script.h @@ -48,7 +48,7 @@ public: } FXJSE_HRUNTIME m_hRunTime; }; -typedef struct _XFA_RESOLVENODE_RS : public CFX_Object { +typedef struct _XFA_RESOLVENODE_RS { _XFA_RESOLVENODE_RS() : dwFlags(XFA_RESOVENODE_RSTYPE_Nodes), pScriptAttribute(NULL) { } ~_XFA_RESOLVENODE_RS() { diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h index df51ff6baa..c6f0c4773b 100644 --- a/xfa/src/fxfa/src/common/xfa_utils.h +++ b/xfa/src/fxfa/src/common/xfa_utils.h @@ -8,7 +8,7 @@ #define _XFA_UTILS_H_ FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier(IFDE_XMLElement* pNode, FX_WSTR wsQualifier, CFX_WideString& wsNamespaceURI); template -class CXFA_NodeIteratorTemplate : public CFX_Object +class CXFA_NodeIteratorTemplate { public: CXFA_NodeIteratorTemplate(NodeType* pRootNode = NULL) diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h index 8ec0250b22..84f3917c94 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.h +++ b/xfa/src/fxfa/src/fm2js/xfa_error.h @@ -17,7 +17,7 @@ enum XFA_FM_ERRMSG { FMERR_EXPTECTED_OPERATOR, FMERR_MAXIMUM }; -class CXFA_FMErrorInfo : public CFX_Object +class CXFA_FMErrorInfo { public: CXFA_FMErrorInfo() : linenum(0) {}; diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h index ffd7cf2442..6a51925527 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h @@ -16,7 +16,7 @@ enum XFA_FM_EXPTYPE { XFA_FM_EXPTYPE_BREAK, XFA_FM_EXPTYPE_CONTINUE, }; -class CXFA_FMExpression : public CFX_Object +class CXFA_FMExpression { public: CXFA_FMExpression(FX_DWORD line); diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h index 95451bbd7b..466050d662 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h @@ -6,7 +6,7 @@ #ifndef _XFA_FM2JS_CONTEXT_H #define _XFA_FM2JS_CONTEXT_H -class CXFA_FM2JSContext : public CFX_Object +class CXFA_FM2JSContext { public: static void Abs (FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Arguments &args); diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h index 06df65135f..d3adca7075 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h @@ -6,7 +6,7 @@ #ifndef _XFA_FM_PARSE_H #define _XFA_FM_PARSE_H -class CXFA_FMParse : public CFX_Object +class CXFA_FMParse { public: CXFA_FMParse(); diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/src/fm2js/xfa_lexer.h index b073ceb047..3047a5028d 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.h @@ -27,7 +27,7 @@ struct XFA_FMKeyword { FX_LPCWSTR m_keword; }; FX_LPCWSTR XFA_FM_KeywordToString(XFA_FM_TOKEN op); -class CXFA_FMToken : public CFX_Object +class CXFA_FMToken { public: CXFA_FMToken(); @@ -38,7 +38,7 @@ public: FX_DWORD m_uLinenum; CXFA_FMToken* m_pNext; }; -class CXFA_FMLexer : public CFX_Object +class CXFA_FMLexer { public: CXFA_FMLexer(FX_WSTR wsFormcalc, CXFA_FMErrorInfo *pErrorInfo); diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.h b/xfa/src/fxfa/src/fm2js/xfa_program.h index a90af5e32f..157d1e1faa 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_program.h +++ b/xfa/src/fxfa/src/fm2js/xfa_program.h @@ -6,7 +6,7 @@ #ifndef _XFA_FM_PROGRAM_H #define _XFA_FM_PROGRAM_H -class CXFA_FMProgram : public CFX_Object +class CXFA_FMProgram { public: CXFA_FMProgram(); diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h index 2a6245d348..b492b80e04 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h @@ -49,7 +49,7 @@ enum XFA_FM_AccessorIndex { ACCESSOR_POSITIVE_INDEX, ACCESSOR_NEGATIVE_INDEX }; -class CXFA_FMSimpleExpression : public CFX_Object +class CXFA_FMSimpleExpression { public: CXFA_FMSimpleExpression(FX_DWORD line, XFA_FM_TOKEN op); diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.h b/xfa/src/fxfa/src/parser/xfa_basic_imp.h index 7fced07a05..71bcbb6167 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.h @@ -14,7 +14,7 @@ typedef struct _XFA_NOTSUREATTRIBUTE { } XFA_NOTSUREATTRIBUTE, * XFA_LPNOTSUREATTRIBUTE; typedef XFA_NOTSUREATTRIBUTE const * XFA_LPCNOTSUREATTRIBUTE; XFA_LPCNOTSUREATTRIBUTE XFA_GetNotsureAttribute(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType = XFA_ATTRIBUTETYPE_NOTSURE); -class CXFA_WideTextRead : public IFX_Stream, public CFX_Object +class CXFA_WideTextRead : public IFX_Stream { public: CXFA_WideTextRead(const CFX_WideString &wsBuffer); diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h index 178268caf9..b1c9e0bc14 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h @@ -10,7 +10,7 @@ class CXFA_ItemLayoutProcessor; class CXFA_LayoutPageMgr; class CXFA_LayoutAppAdapter; class CXFA_ContainerLayoutItemImpl; -class CXFA_LayoutProcessor : public IXFA_DocLayout, public CFX_Object +class CXFA_LayoutProcessor : public IXFA_DocLayout { public: CXFA_LayoutProcessor(CXFA_Document* pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/src/parser/xfa_document_serialize.h index 1caf96a76c..b4548de07c 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.h @@ -6,7 +6,7 @@ #ifndef _XFA_DOCUMENT_SERIALIZE_H_ #define _XFA_DOCUMENT_SERIALIZE_H_ -class CXFA_DataImporter : public IXFA_PacketImport, public CFX_Object +class CXFA_DataImporter : public IXFA_PacketImport { public: CXFA_DataImporter(CXFA_Document *pDocument); @@ -18,7 +18,7 @@ public: protected: CXFA_Document *m_pDocument; }; -class CXFA_DataExporter : public IXFA_PacketExport, public CFX_Object +class CXFA_DataExporter : public IXFA_PacketExport { public: CXFA_DataExporter(CXFA_Document *pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h index 7844fb556f..eaa1a9b15c 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h @@ -30,7 +30,7 @@ enum XFA_ItemLayoutProcessorStages { XFA_ItemLayoutProcessorStages_BookendTrailer, XFA_ItemLayoutProcessorStages_Done, }; -class CXFA_LayoutContext : public CFX_Object +class CXFA_LayoutContext { public: CXFA_LayoutContext(): m_prgSpecifiedColumnWidths(NULL) @@ -50,7 +50,7 @@ public: CXFA_ItemLayoutProcessor* m_pOverflowProcessor; CXFA_Node* m_pOverflowNode; }; -class CXFA_ItemLayoutProcessor : public CFX_Object +class CXFA_ItemLayoutProcessor { public: CXFA_ItemLayoutProcessor(CXFA_Node *pNode, CXFA_LayoutPageMgr* pPageMgr); diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h index dcaf01c739..4faf9e30db 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h @@ -6,7 +6,7 @@ #ifndef _XFA_LAYOUT_PAGEMGR_H_ #define _XFA_LAYOUT_PAGEMGR_H_ -class CXFA_ContainerRecord : public CFX_Object +class CXFA_ContainerRecord { public: CXFA_ContainerRecord(CXFA_ContainerLayoutItemImpl* pPageSet = NULL, CXFA_ContainerLayoutItemImpl* pPageArea = NULL, CXFA_ContainerLayoutItemImpl* pContentArea = NULL) @@ -17,7 +17,7 @@ public: CXFA_ContainerLayoutItemImpl* pCurPageArea; CXFA_ContainerLayoutItemImpl* pCurContentArea; }; -class CXFA_LayoutPageMgr : public CFX_Object +class CXFA_LayoutPageMgr { public: CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor); diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/src/parser/xfa_locale.h index 3f0b13a20d..ccea088741 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.h +++ b/xfa/src/fxfa/src/parser/xfa_locale.h @@ -6,7 +6,7 @@ #ifndef _FXFA_LOCALE_H #define _FXFA_LOCALE_H -class CXFA_XMLLocale : public IFX_Locale, public CFX_Object +class CXFA_XMLLocale : public IFX_Locale { public: CXFA_XMLLocale(CXML_Element* pLocaleData); @@ -32,7 +32,7 @@ protected: private: CXML_Element* m_pLocaleData; }; -class CXFA_NodeLocale : public IFX_Locale, public CFX_Object +class CXFA_NodeLocale : public IFX_Locale { public: CXFA_NodeLocale(CXFA_Node* pLocale); diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 789cd10a87..cdbe2ad85b 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -2714,7 +2714,7 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes_SortNodeArrayByDocumentId } } } -struct CXFA_DualNodeArray : CFX_Object { +struct CXFA_DualNodeArray { CXFA_NodeSet firstNodeList; CXFA_NodeSet secondNodeList; }; diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.h b/xfa/src/fxfa/src/parser/xfa_parser_imp.h index 41b1462b94..626141a02c 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.h @@ -8,7 +8,7 @@ #define _XFA_PARSER_IMP #define _XFA_VERIFY_Checksum_ class CXFA_XMLParser; -class CXFA_SimpleParser : public IXFA_Parser, public CFX_Object +class CXFA_SimpleParser : public IXFA_Parser { public: CXFA_SimpleParser(IXFA_ObjFactory *pFactory, FX_BOOL bDocumentParser = FALSE); @@ -63,7 +63,7 @@ protected: FX_BOOL m_bDocumentParser; friend class CXFA_DocumentParser; }; -class CXFA_DocumentParser : public IXFA_DocParser, public CFX_Object +class CXFA_DocumentParser : public IXFA_DocParser { public: CXFA_DocumentParser(IXFA_Notify *pNotify); @@ -103,7 +103,7 @@ protected: CXFA_Document* m_pDocument; }; typedef CFX_StackTemplate CXFA_XMLNodeStack; -class CXFA_XMLParser : public IFDE_XMLParser, public CFX_Object +class CXFA_XMLParser : public IFDE_XMLParser { public: CXFA_XMLParser(IFDE_XMLNode *pRoot, IFX_Stream *pStream); diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/src/parser/xfa_script_imp.h index d8aec1a2f6..9ffb8bcda0 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.h @@ -10,7 +10,7 @@ #define XFA_JSBUILTIN_Initialized 0x0001 #define XFA_JSBUILTIN_HasCount 0x0002 class CXFA_ResolveProcessor; -class CXFA_ScriptContext : public IXFA_ScriptContext, public CFX_Object +class CXFA_ScriptContext : public IXFA_ScriptContext { public: CXFA_ScriptContext(CXFA_Document* pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h index 5b3be76803..2c3faea324 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h @@ -11,7 +11,7 @@ enum XFA_LOGIC_TYPE { XFA_LOGIC_NoTransparent, XFA_LOGIC_Transparent, }; -class CXFA_NodeHelper : public CFX_Object +class CXFA_NodeHelper { public: CXFA_NodeHelper(void); diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h index 08fe52ddca..3555b0a470 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h @@ -8,7 +8,7 @@ #define _XFA_RESOLVEPROCESSOR_H_ class CXFA_NodeHelper; class CXFA_ScriptContext; -class CXFA_ResolveNodesData : public CFX_Object +class CXFA_ResolveNodesData { public: CXFA_ResolveNodesData(CXFA_ScriptContext *pSC = NULL) @@ -39,7 +39,7 @@ public: XFA_LPCSCRIPTATTRIBUTEINFO m_pScriptAttribute; XFA_RESOVENODE_RSTYPE m_dwFlag; }; -class CXFA_ResolveProcessor : public CFX_Object +class CXFA_ResolveProcessor { public: CXFA_ResolveProcessor(void); diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp index 340d46dfa9..56f6cee026 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/src/fx_graphics.cpp @@ -6,7 +6,7 @@ #include "pre.h" #include "fx_path_generator.h" -class CAGG_Graphics : public CFX_Object +class CAGG_Graphics { public: CAGG_Graphics(); diff --git a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h b/xfa/src/fxgraphics/src/fx_metafile_interpreter.h index 6d827b6f30..64b63852ac 100644 --- a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h +++ b/xfa/src/fxgraphics/src/fx_metafile_interpreter.h @@ -6,7 +6,7 @@ #ifndef __H_FX_METAFILE_INTERPRETER__ #define __H_FX_METAFILE_INTERPRETER__ -class CFX_MetafileInterpreter : public CFX_Object +class CFX_MetafileInterpreter { public: CFX_MetafileInterpreter(); diff --git a/xfa/src/fxgraphics/src/fx_path_generator.h b/xfa/src/fxgraphics/src/fx_path_generator.h index c1447f6c3a..4ecc90ae35 100644 --- a/xfa/src/fxgraphics/src/fx_path_generator.h +++ b/xfa/src/fxgraphics/src/fx_path_generator.h @@ -6,7 +6,7 @@ #ifndef __H_FX_PATH_GENERATOR__ #define __H_FX_PATH_GENERATOR__ -class CFX_PathGenerator : public CFX_Object +class CFX_PathGenerator { public: CFX_PathGenerator(); diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/src/class.h index 6a0f89fc72..26ebb91bfa 100644 --- a/xfa/src/fxjse/src/class.h +++ b/xfa/src/fxjse/src/class.h @@ -8,7 +8,7 @@ #define FXJSE_CLASS_H_ class CFXJSE_Context; class CFXJSE_Value; -class CFXJSE_Class : public CFX_Object +class CFXJSE_Class { protected: CFXJSE_Class(CFXJSE_Context* lpContext) : m_pContext(lpContext) {} diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/src/context.h index 6579cd973a..8d3300150f 100644 --- a/xfa/src/fxjse/src/context.h +++ b/xfa/src/fxjse/src/context.h @@ -8,7 +8,7 @@ #define FXJSE_CONTEXT_H_ class CFXJSE_Class; class CFXJSE_Value; -class CFXJSE_Context : public CFX_Object +class CFXJSE_Context { protected: CFXJSE_Context(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {} diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h index 78e891bfe4..87d540ec9b 100644 --- a/xfa/src/fxjse/src/runtime.h +++ b/xfa/src/fxjse/src/runtime.h @@ -7,7 +7,7 @@ #ifndef FXJSE_RUNTIME_H_ #define FXJSE_RUNTIME_H_ class CFXJSE_RuntimeList; -class CFXJSE_RuntimeData : public CFX_Object +class CFXJSE_RuntimeData { protected: CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}; @@ -25,7 +25,7 @@ protected: CFXJSE_RuntimeData(const CFXJSE_RuntimeData&); CFXJSE_RuntimeData& operator = (const CFXJSE_RuntimeData&); }; -class CFXJSE_RuntimeList : public CFX_Object +class CFXJSE_RuntimeList { public: typedef void (*RuntimeDisposeCallback)(v8::Isolate*); diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/src/value.h index aca23bf310..eb118fd5c6 100644 --- a/xfa/src/fxjse/src/value.h +++ b/xfa/src/fxjse/src/value.h @@ -7,7 +7,7 @@ #ifndef FXJSE_VALUE_H_ #define FXJSE_VALUE_H_ #include "scope_inline.h" -class CFXJSE_Value : public CFX_Object +class CFXJSE_Value { public: CFXJSE_Value(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {} -- cgit v1.2.3