summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-14 13:50:34 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-14 13:50:34 -0700
commit6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch)
treee2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /core/src
parent63de95b699a4374982c2ddffced89e0da028fe4c (diff)
downloadpdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz
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
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fpdfapi/fpdf_edit/editint.h4
-rw-r--r--core/src/fpdfapi/fpdf_font/font_int.h14
-rw-r--r--core/src/fpdfapi/fpdf_font/fpdf_font.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_font/ttgsubtable.h4
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp4
-rw-r--r--core/src/fpdfapi/fpdf_page/pageint.h16
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_render/render_int.h24
-rw-r--r--core/src/fpdfdoc/doc_form.cpp6
-rw-r--r--core/src/fpdfdoc/pdf_vt.h10
-rw-r--r--core/src/fpdftext/fpdf_text_search.cpp2
-rw-r--r--core/src/fpdftext/text_int.h6
-rw-r--r--core/src/fpdftext/txtproc.h8
-rw-r--r--core/src/fxcodec/codec/codec_int.h4
-rw-r--r--core/src/fxcodec/codec/fx_codec_fax.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_flate.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_icc.cpp6
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpx_opj.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_progress.h6
-rw-r--r--core/src/fxcodec/codec/fx_codec_tiff.cpp2
-rw-r--r--core/src/fxcodec/lgif/fx_gif.h4
-rw-r--r--core/src/fxcrt/extension.h6
-rw-r--r--core/src/fxcrt/fx_arabic.h4
-rw-r--r--core/src/fxcrt/fx_basic_util.cpp2
-rw-r--r--core/src/fxcrt/fxcrt_platforms.h2
-rw-r--r--core/src/fxcrt/fxcrt_posix.h2
-rw-r--r--core/src/fxcrt/fxcrt_windows.h2
-rw-r--r--core/src/fxcrt/xml_int.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_array.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_basics.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_curves.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_path_storage.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_pixfmt_gray.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h10
-rw-r--r--core/src/fxge/agg/agg23/agg_renderer_base.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_renderer_scanline.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_rendering_buffer.h6
-rw-r--r--core/src/fxge/agg/agg23/agg_scanline_u.h4
-rw-r--r--core/src/fxge/agg/agg23/agg_vcgen_dash.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_vcgen_stroke.h2
-rw-r--r--core/src/fxge/agg/agg23/agg_vertex_sequence.h2
-rw-r--r--core/src/fxge/agg/agg23/fx_agg_driver.cpp2
-rw-r--r--core/src/fxge/agg/include/fx_agg_driver.h2
-rw-r--r--core/src/fxge/android/fpf_skiafont.h2
-rw-r--r--core/src/fxge/android/fpf_skiafontmgr.h4
-rw-r--r--core/src/fxge/android/fpf_skiamodule.h2
-rw-r--r--core/src/fxge/apple/apple_int.h2
-rw-r--r--core/src/fxge/dib/dib_int.h6
-rw-r--r--core/src/fxge/dib/fx_dib_convert.cpp2
-rw-r--r--core/src/fxge/ge/fx_ge_ps.cpp2
-rw-r--r--core/src/fxge/ge/text_int.h8
-rw-r--r--core/src/fxge/skia/fx_skia_blitter_new.h6
-rw-r--r--core/src/fxge/skia/fx_skia_device.cpp2
-rw-r--r--core/src/fxge/win32/fx_win32_dwrite.cpp8
-rw-r--r--core/src/fxge/win32/fx_win32_gdipext.cpp2
-rw-r--r--core/src/fxge/win32/win32_int.h4
-rw-r--r--core/src/reflow/autoreflow.h6
-rw-r--r--core/src/reflow/layoutprovider_taggedpdf.h4
-rw-r--r--core/src/reflow/reflowedpage.h17
61 files changed, 147 insertions, 148 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h
index 6346f06136..73b28e3735 100644
--- a/core/src/fpdfapi/fpdf_edit/editint.h
+++ b/core/src/fpdfapi/fpdf_edit/editint.h
@@ -6,7 +6,7 @@
#ifndef _FPDF_EDITINT_
#define _FPDF_EDITINT_
-class CPDF_ObjectStream : public CFX_Object
+class CPDF_ObjectStream
{
public:
CPDF_ObjectStream();
@@ -27,7 +27,7 @@ protected:
CFX_DWordArray m_OffsetArray;
};
-class CPDF_XRefStream : public CFX_Object
+class CPDF_XRefStream
{
public:
diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h
index 43f4e302af..a2d544afe9 100644
--- a/core/src/fpdfapi/fpdf_font/font_int.h
+++ b/core/src/fpdfapi/fpdf_font/font_int.h
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
typedef void* FXFT_Library;
-class CPDF_CMapManager : public CFX_Object
+class CPDF_CMapManager
{
public:
CPDF_CMapManager();
@@ -22,7 +22,7 @@ private:
CFX_MapByteStringToPtr m_CMaps;
CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6];
};
-class CPDF_FontGlobals : public CFX_Object
+class CPDF_FontGlobals
{
public:
CPDF_FontGlobals();
@@ -48,7 +48,7 @@ struct _CMap_CodeRange {
FX_BYTE m_Lower[4];
FX_BYTE m_Upper[4];
};
-class CPDF_CMapParser : public CFX_Object
+class CPDF_CMapParser
{
public:
CPDF_CMapParser();
@@ -73,7 +73,7 @@ private:
#define CIDCODING_UCS2 5
#define CIDCODING_CID 6
#define CIDCODING_UTF16 7
-class CPDF_CMap : public CFX_Object
+class CPDF_CMap
{
public:
CPDF_CMap();
@@ -138,7 +138,7 @@ typedef struct _FileHeader {
FX_DWORD dwDataOffset;
FX_DWORD dwRecordSize;
} FXMP_FILEHEADER;
-class CPDF_CID2UnicodeMap : public CFX_Object
+class CPDF_CID2UnicodeMap
{
public:
CPDF_CID2UnicodeMap();
@@ -152,7 +152,7 @@ protected:
const FX_WORD* m_pEmbeddedMap;
FX_DWORD m_EmbeddedCount;
};
-class CPDF_ToUnicodeMap : public CFX_Object
+class CPDF_ToUnicodeMap
{
public:
void Load(CPDF_Stream* pStream);
@@ -163,7 +163,7 @@ protected:
CPDF_CID2UnicodeMap* m_pBaseMap;
CFX_WideTextBuf m_MultiCharBuf;
};
-class CPDF_FontCharMap : public CFX_CharMap, public CFX_Object
+class CPDF_FontCharMap : public CFX_CharMap
{
public:
CPDF_FontCharMap(CPDF_Font* pFont);
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
index 41bb95a89d..91d4010b80 100644
--- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -35,7 +35,7 @@ CPDF_FontGlobals::~CPDF_FontGlobals()
FX_Free(m_pContrastRamps);
}
}
-class CFX_StockFontArray : public CFX_Object
+class CFX_StockFontArray
{
public:
CFX_StockFontArray()
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
index 6b1b4f2443..d231c13ca2 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
@@ -19,7 +19,7 @@ public:
protected:
CFX_BinaryBuf m_Buffer;
};
-class CFX_CTTGSUBTable : public CFX_Object
+class CFX_CTTGSUBTable
{
public:
CFX_CTTGSUBTable(void): m_bFeautureMapLoad(FALSE), loaded(false) {};
@@ -406,7 +406,7 @@ private:
struct TFeatureList FeatureList;
struct TLookupList LookupList;
};
-class CFX_GSUBTable FX_FINAL : public IFX_GSUBTable, public CFX_Object
+class CFX_GSUBTable FX_FINAL : public IFX_GSUBTable
{
public:
virtual void Release() FX_OVERRIDE
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp
index ae912ac50f..c786df5a5b 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp
@@ -21,7 +21,7 @@ typedef enum {PSOP_ADD, PSOP_SUB, PSOP_MUL, PSOP_DIV, PSOP_IDIV, PSOP_MOD,
PSOP_IF, PSOP_IFELSE, PSOP_POP, PSOP_EXCH, PSOP_DUP, PSOP_COPY,
PSOP_INDEX, PSOP_ROLL, PSOP_PROC, PSOP_CONST
} PDF_PSOP;
-class CPDF_PSProc : public CFX_Object
+class CPDF_PSProc
{
public:
~CPDF_PSProc();
@@ -30,7 +30,7 @@ public:
CFX_PtrArray m_Operators;
};
#define PSENGINE_STACKSIZE 100
-class CPDF_PSEngine : public CFX_Object
+class CPDF_PSEngine
{
public:
CPDF_PSEngine();
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h
index 9048fb7874..73c6ec4121 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/src/fpdfapi/fpdf_page/pageint.h
@@ -11,7 +11,7 @@
#define PARSE_STEP_LIMIT 100
#define STREAM_PARSE_BUFSIZE 20480
class CPDF_QuickFontCache;
-class CPDF_StreamParser : public CFX_Object
+class CPDF_StreamParser
{
public:
@@ -118,7 +118,7 @@ typedef struct {
#define _FPDF_MAX_FORM_LEVEL_ 30
#define _FPDF_MAX_TYPE3_FORM_LEVEL_ 4
#define _FPDF_MAX_OBJECT_STACK_SIZE_ 512
-class CPDF_StreamContentParser : public CFX_Object
+class CPDF_StreamContentParser
{
public:
CPDF_StreamContentParser();
@@ -280,7 +280,7 @@ public:
void Handle_NextLineShowText_Space();
void Handle_Invalid();
};
-class CPDF_ContentParser : public CFX_Object
+class CPDF_ContentParser
{
public:
CPDF_ContentParser();
@@ -359,7 +359,7 @@ FX_BOOL PDF_DocPageData_Release(CFX_MapPtrTemplate<KeyType, CPDF_CountedObject<V
}
return FALSE;
}
-class CPDF_DocPageData : public CFX_Object
+class CPDF_DocPageData
{
public:
CPDF_DocPageData(CPDF_Document *pPDFDoc);
@@ -393,7 +393,7 @@ public:
CPDF_FontFileMap m_FontFileMap;
FX_BOOL m_bForceClear;
};
-class CPDF_Function : public CFX_Object
+class CPDF_Function
{
public:
static CPDF_Function* Load(CPDF_Object* pFuncObj);
@@ -416,7 +416,7 @@ protected:
virtual FX_BOOL v_Init(CPDF_Object* pObj) = 0;
virtual FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const = 0;
};
-class CPDF_IccProfile : public CFX_Object
+class CPDF_IccProfile
{
public:
CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize);
@@ -451,10 +451,10 @@ public:
CPDF_CountedColorSpace* m_pCountedBaseCS;
};
#define MAX_PAGE_OBJECTS_UNIFY_NAMING 4096
-class CPDF_ResourceNaming : public CFX_Object
+class CPDF_ResourceNaming
{
public:
- struct _NamingState : public CFX_Object {
+ struct _NamingState {
CFX_ByteString m_Prefix;
int m_nIndex;
};
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
index b6d6dc70c0..4fb9b4db13 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
@@ -54,7 +54,7 @@ CPDF_CryptoHandler* CPDF_StandardSecurityHandler::CreateCryptoHandler()
{
return FX_NEW CPDF_StandardCryptoHandler;
}
-typedef struct _PDF_CRYPTOITEM : public CFX_Object {
+typedef struct _PDF_CRYPTOITEM {
FX_INT32 m_Cipher;
FX_INT32 m_KeyLen;
FX_BOOL m_bChecked;
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index 5a7837dc71..792846ea34 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -2728,7 +2728,7 @@ void CPDF_SyntaxParser::GetBinary(FX_BYTE* buffer, FX_DWORD size)
}
}
-class CPDF_DataAvail FX_FINAL : public CFX_Object, public IPDF_DataAvail
+class CPDF_DataAvail FX_FINAL : public IPDF_DataAvail
{
public:
CPDF_DataAvail(IFX_FileAvail* pFileAvail, IFX_FileRead* pFileRead);
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h
index 5606562bf3..086a1c24b2 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/src/fpdfapi/fpdf_render/render_int.h
@@ -9,7 +9,7 @@
#endif
class CPDF_QuickStretcher;
#define TYPE3_MAX_BLUES 16
-class CPDF_Type3Glyphs : public CFX_Object
+class CPDF_Type3Glyphs
{
public:
CPDF_Type3Glyphs()
@@ -25,7 +25,7 @@ public:
int m_TopBlueCount, m_BottomBlueCount;
};
class CFX_GlyphBitmap;
-class CPDF_Type3Cache : public CFX_Object
+class CPDF_Type3Cache
{
public:
CPDF_Type3Cache(CPDF_Type3Font* pFont)
@@ -39,7 +39,7 @@ protected:
CPDF_Type3Font* m_pFont;
CFX_MapByteStringToPtr m_SizeMap;
};
-class CPDF_TransferFunc : public CFX_Object
+class CPDF_TransferFunc
{
public:
CPDF_Document* m_pPDFDoc;
@@ -51,7 +51,7 @@ public:
};
typedef CFX_MapPtrTemplate<CPDF_Font*, CPDF_CountedObject<CPDF_Type3Cache*>*> CPDF_Type3CacheMap;
typedef CFX_MapPtrTemplate<CPDF_Object*, CPDF_CountedObject<CPDF_TransferFunc*>*> CPDF_TransferFuncMap;
-class CPDF_DocRenderData : public CFX_Object
+class CPDF_DocRenderData
{
public:
CPDF_DocRenderData(CPDF_Document* pPDFDoc = NULL);
@@ -78,7 +78,7 @@ public:
CFX_AffineMatrix m_Matrix;
};
typedef CFX_ArrayTemplate<_PDF_RenderItem> CPDF_RenderLayer;
-class IPDF_ObjectRenderer : public CFX_Object
+class IPDF_ObjectRenderer
{
public:
static IPDF_ObjectRenderer* Create(int type);
@@ -87,7 +87,7 @@ public:
virtual FX_BOOL Continue(IFX_Pause* pPause) = 0;
FX_BOOL m_Result;
};
-class CPDF_RenderStatus : public CFX_Object
+class CPDF_RenderStatus
{
public:
CPDF_RenderStatus();
@@ -179,7 +179,7 @@ protected:
FX_ARGB m_T3FillColor;
int m_curBlend;
};
-class CPDF_ImageLoader : public CFX_Object
+class CPDF_ImageLoader
{
public:
CPDF_ImageLoader()
@@ -205,7 +205,7 @@ protected:
FX_INT32 m_nDownsampleWidth;
FX_INT32 m_nDownsampleHeight;
};
-class CPDF_ProgressiveImageLoaderHandle : public CFX_Object
+class CPDF_ProgressiveImageLoaderHandle
{
public:
CPDF_ProgressiveImageLoaderHandle();
@@ -258,7 +258,7 @@ protected:
FX_BOOL DrawMaskedImage();
FX_BOOL DrawPatternImage(const CFX_Matrix* pObj2Device);
};
-class CPDF_ScaledRenderBuffer : public CFX_Object
+class CPDF_ScaledRenderBuffer
{
public:
CPDF_ScaledRenderBuffer();
@@ -283,7 +283,7 @@ private:
CFX_AffineMatrix m_Matrix;
};
class ICodec_ScanlineDecoder;
-class CPDF_QuickStretcher : public CFX_Object
+class CPDF_QuickStretcher
{
public:
CPDF_QuickStretcher();
@@ -300,7 +300,7 @@ public:
CPDF_StreamAcc m_StreamAcc;
int m_LineIndex;
};
-class CPDF_DeviceBuffer : public CFX_Object
+class CPDF_DeviceBuffer
{
public:
CPDF_DeviceBuffer();
@@ -324,7 +324,7 @@ private:
CFX_DIBitmap* m_pBitmap;
CFX_AffineMatrix m_Matrix;
};
-class CPDF_ImageCache : public CFX_Object
+class CPDF_ImageCache
{
public:
CPDF_ImageCache(CPDF_Document* pDoc, CPDF_Stream* pStream);
diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp
index d695cb98ba..d8ca525f0a 100644
--- a/core/src/fpdfdoc/doc_form.cpp
+++ b/core/src/fpdfdoc/doc_form.cpp
@@ -29,7 +29,7 @@ FX_BOOL NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0)
void EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT);
void UpdateEncodeFieldName(CPDF_Dictionary* pFieldDict, int nLevel = 0);
const int nMaxRecursion = 32;
-class _CFieldNameExtractor : public CFX_Object
+class _CFieldNameExtractor
{
public:
_CFieldNameExtractor(const CFX_WideString& full_name)
@@ -54,10 +54,10 @@ protected:
FX_LPCWSTR m_pEnd;
FX_LPCWSTR m_pCur;
};
-class CFieldTree : public CFX_Object
+class CFieldTree
{
public:
- struct _Node : public CFX_Object {
+ struct _Node {
_Node *parent;
CFX_PtrArray children;
CFX_WideString short_name;
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index 8fc9c7c099..f910dfd372 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -136,7 +136,7 @@ struct CPVT_LineInfo {
FX_FLOAT fLineAscent;
FX_FLOAT fLineDescent;
};
-struct CPVT_WordInfo : public CFX_Object {
+struct CPVT_WordInfo {
CPVT_WordInfo() : Word(0), nCharset(0),
fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), nFontIndex(-1), pWordProps(NULL)
{
@@ -215,7 +215,7 @@ public:
}
}
};
-class CLine : public CFX_Object
+class CLine
{
public:
CLine();
@@ -282,7 +282,7 @@ private:
CPVT_ArrayTemplate<CLine*> m_Lines;
FX_INT32 m_nTotal;
};
-class CSection : public CFX_Object
+class CSection
{
friend class CTypeset;
public:
@@ -400,7 +400,7 @@ private:
CPDF_Rect m_rcPlate;
CPVT_FloatRect m_rcContent;
};
-class CPDF_VariableText : public IPDF_VariableText, public CFX_Object, private CPDF_EditContainer
+class CPDF_VariableText : public IPDF_VariableText, private CPDF_EditContainer
{
friend class CTypeset;
friend class CSection;
@@ -613,7 +613,7 @@ private:
IPDF_VariableText_Provider * m_pVTProvider;
CPDF_VariableText_Iterator * m_pVTIterator;
};
-class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator, public CFX_Object
+class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator
{
public:
CPDF_VariableText_Iterator(CPDF_VariableText * pVT);
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp
index 3bd6450303..bfd742f1ab 100644
--- a/core/src/fpdftext/fpdf_text_search.cpp
+++ b/core/src/fpdftext/fpdf_text_search.cpp
@@ -7,7 +7,7 @@
#include "../../include/fpdfapi/fpdf_pageobj.h"
#include "../../include/fpdftext/fpdf_text.h"
#include "../../include/fpdfapi/fpdf_page.h"
-class CPDF_TextStream : public CFX_Object
+class CPDF_TextStream
{
public:
CPDF_TextStream(CFX_WideTextBuf& buffer, FX_BOOL bUseLF, CFX_PtrArray* pObjArray);
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index 65ffddea0a..d0a434300b 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -6,7 +6,7 @@
#ifndef _PDF_TEXT_INT_H_
#define _PDF_TEXT_INT_H_
-class CPDF_TextParseOptions : public CFX_Object
+class CPDF_TextParseOptions
{
public:
CPDF_TextParseOptions();
@@ -27,7 +27,7 @@ class CPDF_DocProgressiveSearch;
#define FPDFTEXT_MC_PASS 0
#define FPDFTEXT_MC_DONE 1
#define FPDFTEXT_MC_DELAY 2
-typedef struct _PAGECHAR_INFO: public CFX_Object {
+typedef struct _PAGECHAR_INFO {
int m_CharCode;
FX_WCHAR m_Unicode;
FX_FLOAT m_OriginX;
@@ -172,7 +172,7 @@ private:
CFX_RectArray m_resArray;
FX_BOOL m_IsFind;
};
-class CPDF_LinkExt: public CFX_Object
+class CPDF_LinkExt
{
public:
CPDF_LinkExt() {};
diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h
index 5a88ee52f9..abbe105305 100644
--- a/core/src/fpdftext/txtproc.h
+++ b/core/src/fpdftext/txtproc.h
@@ -6,14 +6,14 @@
#ifndef _PDF_TXTPROC_H_
#define _PDF_TXTPROC_H_
-class CTextColumn : public CFX_Object
+class CTextColumn
{
public:
FX_FLOAT m_AvgPos;
int m_Count;
int m_TextPos;
};
-class CTextBox : public CFX_Object
+class CTextBox
{
public:
CFX_WideString m_Text;
@@ -25,7 +25,7 @@ public:
FX_FLOAT m_FontSizeV;
CTextColumn* m_pColumn;
};
-class CTextBaseLine : public CFX_Object
+class CTextBaseLine
{
public:
CTextBaseLine();
@@ -46,7 +46,7 @@ public:
};
class CPDF_PageObject;
class CPDF_TextObject;
-class CTextPage : public CFX_Object
+class CTextPage
{
public:
CTextPage();
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h
index 752eb3f1a5..ae9f22bc4a 100644
--- a/core/src/fxcodec/codec/codec_int.h
+++ b/core/src/fxcodec/codec/codec_int.h
@@ -268,7 +268,7 @@ public:
virtual FX_BOOL Decode(FX_LPVOID ctx, class CFX_DIBitmap* pDIBitmap);
virtual void DestroyDecoder(FX_LPVOID ctx);
};
-class CPDF_Jbig2Interface : public CFX_Object, public CJBig2_Module
+class CPDF_Jbig2Interface : public CJBig2_Module
{
public:
virtual void *JBig2_Malloc(FX_DWORD dwSize)
@@ -302,7 +302,7 @@ public:
FX_Free(pMem);
}
};
-class CCodec_Jbig2Context : public CFX_Object
+class CCodec_Jbig2Context
{
public:
CCodec_Jbig2Context();
diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp
index c6c13f98bb..c6ab791a0e 100644
--- a/core/src/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/src/fxcodec/codec/fx_codec_fax.cpp
@@ -926,7 +926,7 @@ static void _FaxEncode2DLine(FX_LPBYTE dest_buf, int& dest_bitpos, FX_LPCBYTE sr
}
}
}
-class CCodec_FaxEncoder : public CFX_Object
+class CCodec_FaxEncoder
{
public:
CCodec_FaxEncoder(FX_LPCBYTE src_buf, int width, int height, int pitch);
diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp
index e17c32a2c7..afdb8354e6 100644
--- a/core/src/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/src/fxcodec/codec/fx_codec_flate.cpp
@@ -74,7 +74,7 @@ extern "C"
compress(dest_buf, dest_size, src_buf, src_size);
}
}
-class CLZWDecoder : public CFX_Object
+class CLZWDecoder
{
public:
FX_BOOL Decode(FX_LPBYTE output, FX_DWORD& outlen, const FX_BYTE* input, FX_DWORD& size, FX_BOOL bEarlyChange);
diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp
index 6bdc225adf..1a4fce63f2 100644
--- a/core/src/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/src/fxcodec/codec/fx_codec_icc.cpp
@@ -17,7 +17,7 @@ FX_BOOL MD5ComputeID( FX_LPCVOID buf, FX_DWORD dwSize, FX_BYTE ID[16] )
{
return cmsMD5computeIDExt(buf, dwSize, ID);
}
-struct CLcmsCmm : public CFX_Object {
+struct CLcmsCmm {
cmsHTRANSFORM m_hTransform;
int m_nSrcComponents;
int m_nDstComponents;
@@ -342,7 +342,7 @@ FX_DWORD TransferProfileType(FX_LPVOID pProfile, FX_DWORD dwFormat)
return 0;
}
}
-class CFX_IccProfileCache : public CFX_Object
+class CFX_IccProfileCache
{
public:
CFX_IccProfileCache();
@@ -366,7 +366,7 @@ CFX_IccProfileCache::~CFX_IccProfileCache()
void CFX_IccProfileCache::Purge()
{
}
-class CFX_IccTransformCache : public CFX_Object
+class CFX_IccTransformCache
{
public:
CFX_IccTransformCache(CLcmsCmm* pCmm = NULL);
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
index d98cb03f09..0f0d2e5e41 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -584,7 +584,7 @@ void color_apply_conversion(opj_image_t *image)
return;
}
}
-class CJPX_Decoder : public CFX_Object
+class CJPX_Decoder
{
public:
CJPX_Decoder();
diff --git a/core/src/fxcodec/codec/fx_codec_progress.h b/core/src/fxcodec/codec/fx_codec_progress.h
index 6a618e2f51..ea53c8f010 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.h
+++ b/core/src/fxcodec/codec/fx_codec_progress.h
@@ -17,7 +17,7 @@ struct PixelWeight {
int m_SrcEnd;
int m_Weights[1];
};
-class CFXCODEC_WeightTable : public CFX_Object
+class CFXCODEC_WeightTable
{
public:
CFXCODEC_WeightTable()
@@ -40,7 +40,7 @@ public:
int m_DestMin, m_ItemSize;
FX_LPBYTE m_pWeightTables;
};
-class CFXCODEC_HorzTable : public CFX_Object
+class CFXCODEC_HorzTable
{
public:
CFXCODEC_HorzTable()
@@ -63,7 +63,7 @@ public:
int m_ItemSize;
FX_LPBYTE m_pWeightTables;
};
-class CFXCODEC_VertTable : public CFX_Object
+class CFXCODEC_VertTable
{
public:
CFXCODEC_VertTable()
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp
index 51fde42c70..b51444592d 100644
--- a/core/src/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp
@@ -13,7 +13,7 @@ extern "C" {
void* IccLib_CreateTransform_sRGB(const unsigned char* pProfileData, unsigned int dwProfileSize, int nComponents, int intent, FX_DWORD dwSrcFormat = Icc_FORMAT_DEFAULT);
void IccLib_TranslateImage(void* pTransform, unsigned char* pDest, const unsigned char* pSrc, int pixels);
void IccLib_DestroyTransform(void* pTransform);
-class CCodec_TiffContext : public CFX_Object
+class CCodec_TiffContext
{
public:
CCodec_TiffContext();
diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/src/fxcodec/lgif/fx_gif.h
index b499a542b6..3d2b232267 100644
--- a/core/src/fxcodec/lgif/fx_gif.h
+++ b/core/src/fxcodec/lgif/fx_gif.h
@@ -117,7 +117,7 @@ typedef struct tagGifPlainText {
GifPTE* pte_ptr;
CFX_ByteString* string_ptr;
} GifPlainText;
-class CGifLZWDecoder : public CFX_Object
+class CGifLZWDecoder
{
public:
struct tag_Table {
@@ -158,7 +158,7 @@ private:
FX_LPSTR err_msg_ptr;
};
-class CGifLZWEncoder : public CFX_Object
+class CGifLZWEncoder
{
public:
struct tag_Table {
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h
index bf60292a4d..bda7f62297 100644
--- a/core/src/fxcrt/extension.h
+++ b/core/src/fxcrt/extension.h
@@ -28,7 +28,7 @@ public:
virtual FX_BOOL Truncate(FX_FILESIZE szFile) = 0;
};
IFXCRT_FileAccess* FXCRT_FileAccess_Create();
-class CFX_CRTFileAccess : public IFX_FileAccess, public CFX_Object
+class CFX_CRTFileAccess : public IFX_FileAccess
{
public:
CFX_CRTFileAccess() : m_RefCount(0) {}
@@ -66,7 +66,7 @@ protected:
CFX_WideString m_path;
FX_DWORD m_RefCount;
};
-class CFX_CRTFileStream FX_FINAL : public IFX_FileStream, public CFX_Object
+class CFX_CRTFileStream FX_FINAL : public IFX_FileStream
{
public:
CFX_CRTFileStream(IFXCRT_FileAccess* pFA) : m_pFile(pFA), m_dwCount(1), m_bUseRange(FALSE), m_nOffset(0), m_nSize(0) {}
@@ -171,7 +171,7 @@ public:
#define FX_MEMSTREAM_BlockSize (64 * 1024)
#define FX_MEMSTREAM_Consecutive 0x01
#define FX_MEMSTREAM_TakeOver 0x02
-class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream, public CFX_Object
+class CFX_MemoryStream FX_FINAL : public IFX_MemoryStream
{
public:
CFX_MemoryStream(FX_BOOL bConsecutive)
diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h
index f55f7c60cf..eb05801849 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/src/fxcrt/fx_arabic.h
@@ -10,7 +10,7 @@ typedef struct _FX_ARABICCHARRANGE {
FX_WCHAR wStart;
FX_WCHAR wEnd;
} FX_ARABICCHARRANGE;
-class CFX_ArabicChar : public IFX_ArabicChar, public CFX_Object
+class CFX_ArabicChar : public IFX_ArabicChar
{
public:
virtual void Release()
@@ -179,7 +179,7 @@ void FX_BidiResolveImplicit(const CFX_Int32Array &classes, CFX_Int32Array &level
void FX_BidiResolveWhitespace(FX_INT32 iBaseLevel, const CFX_Int32Array &classes, CFX_Int32Array &levels);
FX_INT32 FX_BidiReorderLevel(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels, FX_INT32 iStart, FX_BOOL bReverse = FALSE);
void FX_BidiReorder(FX_INT32 iBaseLevel, CFX_WideString &wsText, const CFX_Int32Array &levels);
-class CFX_BidiChar : public IFX_BidiChar, public CFX_Object
+class CFX_BidiChar FX_FINAL : public IFX_BidiChar
{
public:
CFX_BidiChar();
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index c3df07fef5..272d43eef7 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -294,7 +294,7 @@ CFX_WideString FX_DecodeURI(const CFX_ByteString& bsURI)
return CFX_WideString::FromUTF8(rURI, rURI.GetLength());
}
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-class CFindFileData : public CFX_Object
+class CFindFileData
{
public:
virtual ~CFindFileData() {}
diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/src/fxcrt/fxcrt_platforms.h
index dbdff6aba0..dbfa58be1a 100644
--- a/core/src/fxcrt/fxcrt_platforms.h
+++ b/core/src/fxcrt/fxcrt_platforms.h
@@ -10,7 +10,7 @@
#if _FX_OS_ == _FX_ANDROID_
void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString &bsMode);
void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_WideString &wsMode);
-class CFXCRT_FileAccess_CRT : public IFXCRT_FileAccess, public CFX_Object
+class CFXCRT_FileAccess_CRT : public IFXCRT_FileAccess
{
public:
CFXCRT_FileAccess_CRT();
diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/src/fxcrt/fxcrt_posix.h
index db4377f5f2..89162cd037 100644
--- a/core/src/fxcrt/fxcrt_posix.h
+++ b/core/src/fxcrt/fxcrt_posix.h
@@ -8,7 +8,7 @@
#define _FXCRT_LINUX_
#include "extension.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
-class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess, public CFX_Object
+class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess
{
public:
CFXCRT_FileAccess_Posix();
diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/src/fxcrt/fxcrt_windows.h
index 39d72554da..92646b2757 100644
--- a/core/src/fxcrt/fxcrt_windows.h
+++ b/core/src/fxcrt/fxcrt_windows.h
@@ -8,7 +8,7 @@
#define _FXCRT_WINDOWS_
#include "extension.h"
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess, public CFX_Object
+class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess
{
public:
CFXCRT_FileAccess_Win64();
diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h
index 1f75928e51..964c7944d1 100644
--- a/core/src/fxcrt/xml_int.h
+++ b/core/src/fxcrt/xml_int.h
@@ -6,7 +6,7 @@
#ifndef _FXCRT_XML_INT_
#define _FXCRT_XML_INT_
-class CXML_DataBufAcc : public IFX_BufferRead, public CFX_Object
+class CXML_DataBufAcc : public IFX_BufferRead
{
public:
CXML_DataBufAcc(FX_LPCBYTE pBuffer, size_t size)
@@ -61,7 +61,7 @@ protected:
size_t m_dwCurPos;
};
#define FX_XMLDATASTREAM_BufferSize (32 * 1024)
-class CXML_DataStmAcc : public IFX_BufferRead, public CFX_Object
+class CXML_DataStmAcc : public IFX_BufferRead
{
public:
CXML_DataStmAcc(IFX_FileRead *pFileRead)
diff --git a/core/src/fxge/agg/agg23/agg_array.h b/core/src/fxge/agg/agg23/agg_array.h
index f5680d90fe..b3b5f2b877 100644
--- a/core/src/fxge/agg/agg23/agg_array.h
+++ b/core/src/fxge/agg/agg23/agg_array.h
@@ -18,7 +18,7 @@
#include "agg_basics.h"
namespace agg
{
-template<class T> class pod_array : public CFX_Object
+template<class T> class pod_array
{
public:
typedef T value_type;
@@ -157,7 +157,7 @@ pod_array<T>::operator = (const pod_array<T>&v)
}
return *this;
}
-template<class T, unsigned S = 6> class pod_deque : public CFX_Object
+template<class T, unsigned S = 6> class pod_deque
{
public:
enum block_scale_e {
@@ -409,7 +409,7 @@ unsigned pod_deque<T, S>::byte_size() const
{
return m_size * sizeof(T);
}
-class pod_allocator : public CFX_Object
+class pod_allocator
{
public:
void remove_all()
diff --git a/core/src/fxge/agg/agg23/agg_basics.h b/core/src/fxge/agg/agg23/agg_basics.h
index a78fed8c23..d2fad58feb 100644
--- a/core/src/fxge/agg/agg23/agg_basics.h
+++ b/core/src/fxge/agg/agg23/agg_basics.h
@@ -58,7 +58,7 @@ enum cover_scale_e {
cover_none = 0,
cover_full = cover_mask
};
-template<class T> struct rect_base : public CFX_Object {
+template<class T> struct rect_base {
typedef rect_base<T> self_type;
T x1;
T y1;
@@ -257,7 +257,7 @@ inline unsigned set_orientation(unsigned c, unsigned o)
c &= ~path_flags_jr;
return clear_orientation(c) | o;
}
-struct point_type : public CFX_Object {
+struct point_type {
FX_FLOAT x, y;
unsigned flag;
point_type() {}
@@ -271,7 +271,7 @@ struct point_type_flag : public point_type {
}
point_type_flag(FX_FLOAT x_, FX_FLOAT y_, unsigned flag_ = 0) : point_type(x_, y_), flag(flag_) {}
};
-struct vertex_type : public CFX_Object {
+struct vertex_type {
FX_FLOAT x, y;
unsigned cmd;
vertex_type() {}
diff --git a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
index 1cf817a1c7..0d8d6ff99e 100644
--- a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
+++ b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h
@@ -18,7 +18,7 @@
#include "agg_basics.h"
namespace agg
{
-struct null_markers : public CFX_Object {
+struct null_markers {
void remove_all() {}
void add_vertex(FX_FLOAT, FX_FLOAT, unsigned) {}
void prepare_src() {}
@@ -30,7 +30,7 @@ struct null_markers : public CFX_Object {
};
template<class VertexSource,
class Generator,
- class Markers = null_markers> class conv_adaptor_vcgen : public CFX_Object
+ class Markers = null_markers> class conv_adaptor_vcgen
{
enum status {
initial,
diff --git a/core/src/fxge/agg/agg23/agg_curves.h b/core/src/fxge/agg/agg23/agg_curves.h
index 61270e64a5..495f7a6a8f 100644
--- a/core/src/fxge/agg/agg23/agg_curves.h
+++ b/core/src/fxge/agg/agg23/agg_curves.h
@@ -19,7 +19,7 @@
#include "agg_array.h"
namespace agg
{
-struct curve4_points : public CFX_Object {
+struct curve4_points {
FX_FLOAT cp[8];
curve4_points() {}
curve4_points(FX_FLOAT x1, FX_FLOAT y1,
@@ -59,7 +59,7 @@ struct curve4_points : public CFX_Object {
return cp[i];
}
};
-class curve4_div : public CFX_Object
+class curve4_div
{
public:
curve4_div() :
@@ -135,7 +135,7 @@ private:
unsigned m_count;
pod_deque<point_type> m_points;
};
-class curve4 : public CFX_Object
+class curve4
{
public:
curve4() {}
diff --git a/core/src/fxge/agg/agg23/agg_path_storage.h b/core/src/fxge/agg/agg23/agg_path_storage.h
index 64ea0b4753..dc13851d09 100644
--- a/core/src/fxge/agg/agg23/agg_path_storage.h
+++ b/core/src/fxge/agg/agg23/agg_path_storage.h
@@ -18,7 +18,7 @@
#include "agg_basics.h"
namespace agg
{
-class path_storage : public CFX_Object
+class path_storage
{
enum block_scale_e {
block_shift = 8,
@@ -27,7 +27,7 @@ class path_storage : public CFX_Object
block_pool = 256
};
public:
- class vertex_source : public CFX_Object
+ class vertex_source
{
public:
vertex_source() {}
diff --git a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
index 052a2e35d8..5a80935479 100644
--- a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
+++ b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h
@@ -28,7 +28,7 @@
#include "agg_rendering_buffer.h"
namespace agg
{
-template<class ColorT> struct blender_gray : public CFX_Object {
+template<class ColorT> struct blender_gray {
typedef ColorT color_type;
typedef typename color_type::value_type value_type;
typedef typename color_type::calc_type calc_type;
@@ -40,7 +40,7 @@ template<class ColorT> struct blender_gray : public CFX_Object {
}
};
template<class Blender, unsigned Step = 1, unsigned Offset = 0>
-class pixel_formats_gray : public CFX_Object
+class pixel_formats_gray
{
public:
typedef rendering_buffer::row_data row_data;
diff --git a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
index e9f0defbe8..e06322c24d 100644
--- a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
+++ b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h
@@ -46,7 +46,7 @@ inline int poly_coord(FX_FLOAT c)
{
return int(c * poly_base_size);
}
-struct cell_aa : public CFX_Object {
+struct cell_aa {
int x;
int y;
int cover;
@@ -56,7 +56,7 @@ struct cell_aa : public CFX_Object {
void set_cover(int c, int a);
void add_cover(int c, int a);
};
-class outline_aa : public CFX_Object
+class outline_aa
{
enum cell_block_scale_e {
cell_block_shift = 12,
@@ -65,7 +65,7 @@ class outline_aa : public CFX_Object
cell_block_pool = 256,
cell_block_limit = 1024
};
- struct sorted_y : public CFX_Object {
+ struct sorted_y {
unsigned start;
unsigned num;
};
@@ -134,7 +134,7 @@ private:
int m_max_y;
bool m_sorted;
};
-class scanline_hit_test : public CFX_Object
+class scanline_hit_test
{
public:
scanline_hit_test(int x) : m_x(x), m_hit(false) {}
@@ -168,7 +168,7 @@ enum filling_rule_e {
fill_non_zero,
fill_even_odd
};
-class rasterizer_scanline_aa : public CFX_Object
+class rasterizer_scanline_aa
{
enum status {
status_initial,
diff --git a/core/src/fxge/agg/agg23/agg_renderer_base.h b/core/src/fxge/agg/agg23/agg_renderer_base.h
index 3e20a6d408..bd1b203b9a 100644
--- a/core/src/fxge/agg/agg23/agg_renderer_base.h
+++ b/core/src/fxge/agg/agg23/agg_renderer_base.h
@@ -23,7 +23,7 @@
#include "agg_rendering_buffer.h"
namespace agg
{
-template<class PixelFormat> class renderer_base : public CFX_Object
+template<class PixelFormat> class renderer_base
{
public:
typedef PixelFormat pixfmt_type;
diff --git a/core/src/fxge/agg/agg23/agg_renderer_scanline.h b/core/src/fxge/agg/agg23/agg_renderer_scanline.h
index b02b6b5f66..62d104f7f2 100644
--- a/core/src/fxge/agg/agg23/agg_renderer_scanline.h
+++ b/core/src/fxge/agg/agg23/agg_renderer_scanline.h
@@ -20,7 +20,7 @@
#include "agg_render_scanlines.h"
namespace agg
{
-template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa : public CFX_Object
+template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa
{
public:
typedef BaseRenderer base_ren_type;
diff --git a/core/src/fxge/agg/agg23/agg_rendering_buffer.h b/core/src/fxge/agg/agg23/agg_rendering_buffer.h
index 5a8681b537..9c1c0c6899 100644
--- a/core/src/fxge/agg/agg23/agg_rendering_buffer.h
+++ b/core/src/fxge/agg/agg23/agg_rendering_buffer.h
@@ -22,17 +22,17 @@
#include "agg_basics.h"
namespace agg
{
-class rendering_buffer : public CFX_Object
+class rendering_buffer
{
public:
- struct row_data : public CFX_Object {
+ struct row_data {
int x1, x2;
const int8u* ptr;
row_data() {}
row_data(int x1_, int x2_, const int8u* ptr_) :
x1(x1_), x2(x2_), ptr(ptr_) {}
};
- struct span_data : public CFX_Object {
+ struct span_data {
int x;
unsigned len;
int8u* ptr;
diff --git a/core/src/fxge/agg/agg23/agg_scanline_u.h b/core/src/fxge/agg/agg23/agg_scanline_u.h
index f99feef91c..5b132907fd 100644
--- a/core/src/fxge/agg/agg23/agg_scanline_u.h
+++ b/core/src/fxge/agg/agg23/agg_scanline_u.h
@@ -26,13 +26,13 @@
#include "agg_array.h"
namespace agg
{
-template<class CoverT> class scanline_u : public CFX_Object
+template<class CoverT> class scanline_u
{
public:
typedef scanline_u<CoverT> self_type;
typedef CoverT cover_type;
typedef int16 coord_type;
- struct span : public CFX_Object {
+ struct span {
coord_type x;
coord_type len;
cover_type* covers;
diff --git a/core/src/fxge/agg/agg23/agg_vcgen_dash.h b/core/src/fxge/agg/agg23/agg_vcgen_dash.h
index 961da2d718..9c3aa630c2 100644
--- a/core/src/fxge/agg/agg23/agg_vcgen_dash.h
+++ b/core/src/fxge/agg/agg23/agg_vcgen_dash.h
@@ -23,7 +23,7 @@
#include "agg_vertex_sequence.h"
namespace agg
{
-class vcgen_dash : public CFX_Object
+class vcgen_dash
{
enum max_dashes_e {
max_dashes = 32
diff --git a/core/src/fxge/agg/agg23/agg_vcgen_stroke.h b/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
index 38fe1fc25d..84fadd6ed8 100644
--- a/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
+++ b/core/src/fxge/agg/agg23/agg_vcgen_stroke.h
@@ -18,7 +18,7 @@
#include "agg_math_stroke.h"
namespace agg
{
-class vcgen_stroke : public CFX_Object
+class vcgen_stroke
{
enum status_e {
initial,
diff --git a/core/src/fxge/agg/agg23/agg_vertex_sequence.h b/core/src/fxge/agg/agg23/agg_vertex_sequence.h
index 29486d4787..6600bf2085 100644
--- a/core/src/fxge/agg/agg23/agg_vertex_sequence.h
+++ b/core/src/fxge/agg/agg23/agg_vertex_sequence.h
@@ -70,7 +70,7 @@ void vertex_sequence<T, S>::close(bool closed)
}
}
const FX_FLOAT vertex_dist_epsilon = 1e-14f;
-struct vertex_dist : public CFX_Object {
+struct vertex_dist {
FX_FLOAT x;
FX_FLOAT y;
FX_FLOAT dist;
diff --git a/core/src/fxge/agg/agg23/fx_agg_driver.cpp b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
index 8cea42d661..5944332fd8 100644
--- a/core/src/fxge/agg/agg23/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
@@ -369,7 +369,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathStroke(const CFX_PathData* pPathData,
SetClipMask(rasterizer);
return TRUE;
}
-class CFX_Renderer : public CFX_Object
+class CFX_Renderer
{
private:
int m_Alpha,
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h
index c3411905b9..c87fc246be 100644
--- a/core/src/fxge/agg/include/fx_agg_driver.h
+++ b/core/src/fxge/agg/include/fx_agg_driver.h
@@ -8,7 +8,7 @@
#define _FX_AGG_DEVICE_DRIVER_
#include "fxfx_agg_path_storage.h"
#include "fxfx_agg_rasterizer_scanline_aa.h"
-class CAgg_PathData : public CFX_Object
+class CAgg_PathData
{
public:
CAgg_PathData() {}
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
index 1d1073c1fe..4285e13554 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/src/fxge/android/fpf_skiafont.h
@@ -10,7 +10,7 @@
class CFPF_SkiaFontDescriptor;
class CFPF_SkiaFontMgr;
class SkTypeface;
-class CFPF_SkiaFont : public IFPF_Font, public CFX_Object
+class CFPF_SkiaFont : public IFPF_Font
{
public:
CFPF_SkiaFont();
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h
index 472fbbd416..1ec4a1d678 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.h
+++ b/core/src/fxge/android/fpf_skiafontmgr.h
@@ -11,7 +11,7 @@
#define FPF_SKIAFONTTYPE_Path 1
#define FPF_SKIAFONTTYPE_File 2
#define FPF_SKIAFONTTYPE_Buffer 3
-class CFPF_SkiaFontDescriptor : public CFX_Object
+class CFPF_SkiaFontDescriptor
{
public:
CFPF_SkiaFontDescriptor() : m_pFamily(NULL), m_dwStyle(0), m_iFaceIndex(0), m_dwCharsets(0), m_iGlyphNum(0) {}
@@ -88,7 +88,7 @@ public:
FX_LPVOID m_pBuffer;
size_t m_szBuffer;
};
-class CFPF_SkiaFontMgr : public IFPF_FontMgr, public CFX_Object
+class CFPF_SkiaFontMgr : public IFPF_FontMgr
{
public:
CFPF_SkiaFontMgr();
diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h
index c3a78bf658..7f5375172a 100644
--- a/core/src/fxge/android/fpf_skiamodule.h
+++ b/core/src/fxge/android/fpf_skiamodule.h
@@ -8,7 +8,7 @@
#define _FPF_MODULE_H_
#if _FX_OS_ == _FX_ANDROID_
class CFPF_SkiaFontMgr;
-class CFPF_SkiaDeviceModule : public IFPF_DeviceModule, public CFX_Object
+class CFPF_SkiaDeviceModule : public IFPF_DeviceModule
{
public:
CFPF_SkiaDeviceModule() : m_pFontMgr(NULL) {}
diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h
index e3794159b8..6d8260c60f 100644
--- a/core/src/fxge/apple/apple_int.h
+++ b/core/src/fxge/apple/apple_int.h
@@ -61,7 +61,7 @@ public:
void saveGraphicsState(void* graphics);
void restoreGraphicsState(void* graphics);
};
-class CApplePlatform : public CFX_Object
+class CApplePlatform
{
public:
CApplePlatform()
diff --git a/core/src/fxge/dib/dib_int.h b/core/src/fxge/dib/dib_int.h
index 19dc358133..844c3566ce 100644
--- a/core/src/fxge/dib/dib_int.h
+++ b/core/src/fxge/dib/dib_int.h
@@ -7,7 +7,7 @@
#ifndef _DIB_INT_H_
#define _DIB_INT_H_
-class CPDF_FixedMatrix : public CFX_Object
+class CPDF_FixedMatrix
{
public:
CPDF_FixedMatrix(const CFX_AffineMatrix& src, int bits)
@@ -34,7 +34,7 @@ struct PixelWeight {
int m_SrcEnd;
int m_Weights[1];
};
-class CWeightTable : public CFX_Object
+class CWeightTable
{
public:
CWeightTable()
@@ -56,7 +56,7 @@ public:
int m_DestMin, m_ItemSize;
FX_LPBYTE m_pWeightTables;
};
-class CStretchEngine : public CFX_Object
+class CStretchEngine
{
public:
CStretchEngine(IFX_ScanlineComposer* pDestBitmap, FXDIB_Format dest_format,
diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp
index ddc24cc4ad..cfcbc707cd 100644
--- a/core/src/fxge/dib/fx_dib_convert.cpp
+++ b/core/src/fxge/dib/fx_dib_convert.cpp
@@ -97,7 +97,7 @@ const FX_DWORD g_dwMacPalette[256] = {
0xffEEEEEE, 0xffDDDDDD, 0xffBBBBBB, 0xffAAAAAA, 0xff888888, 0xff777777,
0xff555555, 0xff444444, 0xff222222, 0xff111111, 0xff000000
};
-class CFX_Palette : public CFX_Object
+class CFX_Palette
{
public:
CFX_Palette();
diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp
index d664b706b0..9da224602e 100644
--- a/core/src/fxge/ge/fx_ge_ps.cpp
+++ b/core/src/fxge/ge/fx_ge_ps.cpp
@@ -13,7 +13,7 @@ struct PSGlyph {
FX_BOOL m_bGlyphAdjust;
FX_FLOAT m_AdjustMatrix[4];
};
-class CPSFont : public CFX_Object
+class CPSFont
{
public:
PSGlyph m_Glyphs[256];
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h
index e51976f172..7f30b9c802 100644
--- a/core/src/fxge/ge/text_int.h
+++ b/core/src/fxge/ge/text_int.h
@@ -12,7 +12,7 @@ struct _CFX_UniqueKeyGen {
FX_CHAR m_Key[128];
int m_KeyLen;
};
-class CFX_SizeGlyphCache : public CFX_Object
+class CFX_SizeGlyphCache
{
public:
CFX_SizeGlyphCache()
@@ -22,7 +22,7 @@ public:
~CFX_SizeGlyphCache();
CFX_MapPtrToPtr m_GlyphMap;
};
-class CTTFontDesc : public CFX_Object
+class CTTFontDesc
{
public:
CTTFontDesc()
@@ -74,7 +74,7 @@ private:
#define CHARSET_FLAG_BIG5 8
#define CHARSET_FLAG_GB 16
#define CHARSET_FLAG_KOREAN 32
-class CFontFaceInfo : public CFX_Object
+class CFontFaceInfo
{
public:
CFX_ByteString m_FilePath;
@@ -85,7 +85,7 @@ public:
FX_DWORD m_FileSize;
CFX_ByteString m_FontTables;
};
-class CFontFileFaceInfo : public CFX_Object
+class CFontFileFaceInfo
{
public:
CFontFileFaceInfo();
diff --git a/core/src/fxge/skia/fx_skia_blitter_new.h b/core/src/fxge/skia/fx_skia_blitter_new.h
index 6482832fe9..84fe89dce6 100644
--- a/core/src/fxge/skia/fx_skia_blitter_new.h
+++ b/core/src/fxge/skia/fx_skia_blitter_new.h
@@ -6,7 +6,7 @@
#define _FX_SKIABLITTER_H_
//#define _SKIA_SUPPORT_
#if defined(_SKIA_SUPPORT_)
-class CFX_SkiaRenderer : public SkBlitter, public CFX_Object
+class CFX_SkiaRenderer : public SkBlitter
{
protected:
int m_Alpha,
@@ -208,7 +208,7 @@ public:
FX_BOOL Init(CFX_DIBitmap* pDevice, CFX_DIBitmap* pOriDevice, const CFX_ClipRgn* pClipRgn, FX_DWORD color, FX_BOOL bFullCover, FX_BOOL bRgbByteOrder,
int alpha_flag = 0, void* pIccTransform = NULL); //The alpha flag must be fill_flag if exist.
};
-class CFX_SkiaA8Renderer : public SkBlitter, public CFX_Object
+class CFX_SkiaA8Renderer : public SkBlitter
{
public:
//--------------------------------------------------------------------
@@ -226,4 +226,4 @@ public:
int m_dstHeight;
};
#endif
-#endif \ No newline at end of file
+#endif
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp
index 00fe228476..6c329eee4e 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/src/fxge/skia/fx_skia_device.cpp
@@ -117,7 +117,7 @@ void SuperBlitter_skia::DrawPath(const SkPath& srcPath, SkBlitter* blitter, cons
proc(*devPathPtr, rect, blitter);
}
-class CSkia_PathData : public CFX_Object
+class CSkia_PathData
{
public:
CSkia_PathData() {}
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp
index 2b32d572b5..1ad4f8c457 100644
--- a/core/src/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/src/fxge/win32/fx_win32_dwrite.cpp
@@ -26,7 +26,7 @@ inline InterfaceType* SafeAcquire(InterfaceType* newObject)
}
return newObject;
}
-class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream, public CFX_Object
+class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream
{
public:
explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize);
@@ -46,7 +46,7 @@ private:
void const* resourcePtr_;
DWORD resourceSize_;
};
-class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader, public CFX_Object
+class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader
{
public:
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject);
@@ -71,7 +71,7 @@ private:
ULONG refCount_;
static IDWriteFontFileLoader* instance_;
};
-class CDwFontContext : public CFX_Object
+class CDwFontContext
{
public:
CDwFontContext(IDWriteFactory* dwriteFactory);
@@ -83,7 +83,7 @@ private:
HRESULT hr_;
IDWriteFactory* dwriteFactory_;
};
-class CDwGdiTextRenderer : public CFX_Object
+class CDwGdiTextRenderer
{
public:
CDwGdiTextRenderer(
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index 0f13721c70..e668b49200 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/src/fxge/win32/fx_win32_gdipext.cpp
@@ -1008,7 +1008,7 @@ BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData,
CallFunc(GdipDeleteGraphics)(pGraphics);
return TRUE;
}
-class GpStream FX_FINAL : public IStream, public CFX_Object
+class GpStream FX_FINAL : public IStream
{
LONG m_RefCount;
int m_ReadPos;
diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h
index 83595cbf8d..bc3eb878d9 100644
--- a/core/src/fxge/win32/win32_int.h
+++ b/core/src/fxge/win32/win32_int.h
@@ -58,7 +58,7 @@ protected:
HMODULE m_GdiModule;
};
#include "dwrite_int.h"
-class CWin32Platform : public CFX_Object
+class CWin32Platform
{
public:
FX_BOOL m_bHalfTone;
@@ -164,7 +164,7 @@ protected:
int m_HorzSize, m_VertSize;
FX_BOOL m_bSupportROP;
};
-class CPSOutput : public IFX_PSOutput, public CFX_Object
+class CPSOutput : public IFX_PSOutput
{
public:
CPSOutput(HDC hDC);
diff --git a/core/src/reflow/autoreflow.h b/core/src/reflow/autoreflow.h
index d98f33bf4e..6a137e9ae2 100644
--- a/core/src/reflow/autoreflow.h
+++ b/core/src/reflow/autoreflow.h
@@ -12,7 +12,7 @@ class CPDF_AutoReflowElement;
class CPDF_AutoReflowLayoutProvider;
typedef CFX_ArrayTemplate<CPDF_AutoReflowElement*> CAR_ElmPtrArray;
typedef CFX_ArrayTemplate<CPDF_PageObject*> CAR_ObjPtrArray;
-class CRF_CELL : public CFX_Object
+class CRF_CELL
{
public:
CRF_CELL() { };
@@ -21,7 +21,7 @@ public:
int m_CellWritingMode;
FX_RECT m_BBox;
};
-class CPDF_AutoReflowElement : public IPDF_LayoutElement, public CFX_Object
+class CPDF_AutoReflowElement : public IPDF_LayoutElement
{
public:
CPDF_AutoReflowElement(LayoutType layoutType = LayoutUnknown , CPDF_AutoReflowElement* pParent = NULL) ;
@@ -68,7 +68,7 @@ public:
#define AUTOREFLOW_STEP_GENERATEParagraph 2
#define AUTOREFLOW_STEP_CREATEELEMENT 3
#define AUTOREFLOW_STEP_REMOVEDATA 4
-class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider, public CFX_Object
+class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider
{
public:
CPDF_AutoReflowLayoutProvider(CPDF_PageObjects* pPage, FX_BOOL bReadOrder);
diff --git a/core/src/reflow/layoutprovider_taggedpdf.h b/core/src/reflow/layoutprovider_taggedpdf.h
index b2c8947a82..b573c3e5bf 100644
--- a/core/src/reflow/layoutprovider_taggedpdf.h
+++ b/core/src/reflow/layoutprovider_taggedpdf.h
@@ -7,7 +7,7 @@
#ifndef LayoutProvider_TaggedPDF_H
#define LayoutProvider_TaggedPDF_H
#include "../../include/reflow/reflowengine.h"
-class CPDF_LayoutElement : public IPDF_LayoutElement, public CFX_Object
+class CPDF_LayoutElement : public IPDF_LayoutElement
{
public:
CPDF_LayoutElement();
@@ -47,7 +47,7 @@ protected:
FX_COLORREF GetDefaultColorValue(LayoutAttr attr_type);
CFX_PtrArray m_ObjArray;
};
-class CPDF_LayoutProvider_TaggedPDF : public IPDF_LayoutProvider, public CFX_Object
+class CPDF_LayoutProvider_TaggedPDF : public IPDF_LayoutProvider
{
public:
CPDF_LayoutProvider_TaggedPDF();
diff --git a/core/src/reflow/reflowedpage.h b/core/src/reflow/reflowedpage.h
index b76834132e..5ca7a8d947 100644
--- a/core/src/reflow/reflowedpage.h
+++ b/core/src/reflow/reflowedpage.h
@@ -18,7 +18,6 @@ class CRF_AttrOperation;
class CRF_OperationDate;
class CPDF_ReflowedPage;
class CPDF_Rect;
-class CFX_Object;
typedef CFX_SegmentedArray<CRF_Data*> CRF_DataPtrArray;
class CRF_CharState;
typedef CFX_SegmentedArray<CRF_CharState> CRF_CharStateArray;
@@ -26,7 +25,7 @@ typedef CFX_SegmentedArray<CRF_CharState> CRF_CharStateArray;
#define SST_BLSE 2
#define SST_ILSE 3
#define SST_IE 4
-class CPDF_LayoutProcessor_Reflow : public IPDF_LayoutProcessor, public CFX_Object
+class CPDF_LayoutProcessor_Reflow : public IPDF_LayoutProcessor
{
public:
CPDF_LayoutProcessor_Reflow();
@@ -106,7 +105,7 @@ struct RF_TableCell {
LayoutEnum m_InlineAlign;
};
typedef CFX_ArrayTemplate<RF_TableCell*> CRF_TableCellArray;
-class CRF_Table : public CFX_Object
+class CRF_Table
{
public:
CRF_Table()
@@ -120,7 +119,7 @@ public:
FX_FLOAT m_TableWidth;
FX_FLOAT m_ReflowPageHeight;
};
-class CRF_CharState : public CFX_Object
+class CRF_CharState
{
public:
CPDF_Font* m_pFont;
@@ -132,7 +131,7 @@ public:
CPDF_TextObject* m_pTextObj;
};
-class CRF_PageInfo : public CFX_Object
+class CRF_PageInfo
{
public:
CRF_PageInfo(CPDF_PageObject* pPageObj, CRF_PageInfo* pParent = NULL)
@@ -158,7 +157,7 @@ protected:
CPDF_PageObject* m_pPageObj;
CRF_PageInfo* m_pParent;
};
-class CPDF_ReflowedPage : public IPDF_ReflowedPage, public CFX_PrivateData, public CFX_Object
+class CPDF_ReflowedPage : public IPDF_ReflowedPage, public CFX_PrivateData
{
public:
@@ -192,7 +191,7 @@ public:
CFX_MapPtrToPtr* m_pPageInfos;
};
-class CPDF_ProgressiveReflowPageParser : public IPDF_ProgressiveReflowPageParser, public CFX_Object
+class CPDF_ProgressiveReflowPageParser : public IPDF_ProgressiveReflowPageParser
{
public:
CPDF_ProgressiveReflowPageParser();
@@ -227,7 +226,7 @@ protected:
int m_nObjProcessed;
int m_flags;
};
-class CPDF_ProgressiveReflowPageRender : public IPDF_ProgressiveReflowPageRender, public CFX_Object
+class CPDF_ProgressiveReflowPageRender : public IPDF_ProgressiveReflowPageRender
{
public:
CPDF_ProgressiveReflowPageRender();
@@ -292,7 +291,7 @@ protected:
#define TYPE_PATH 2
#define TYPE_IMAGE 3
#define TYPE_LINE 4
-class CRF_Data : public CFX_Object
+class CRF_Data
{
public:
typedef enum {Unknow, Text, Image, Path, Line, paragraph} RF_DataType;