diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-01-09 10:46:50 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-01-09 10:46:50 -0800 |
| commit | b9e0190938f62bf21df078e47190a62ba33ddab2 (patch) | |
| tree | 474749da63ac6890c008f9535b335bebee1d7cc8 /fpdfsdk/include/fsdk_annothandler.h | |
| parent | b07772a31f5dff723af620bc57c71daa246995c0 (diff) | |
| download | pdfium-b9e0190938f62bf21df078e47190a62ba33ddab2.tar.xz | |
Fix -Wnon-virtual-dtor compiler warnings.
This is done by explicitly adding a virtual dtor to interface classes,
since the cost is small given that there are already virtual functions.
The exceptions are for classes that have a Release() or Delete() method,
in which case it is non-virtual and protected to indicate that the virtual
class is never the deletion point.
BUG=
R=brucedawson@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/810883005
Diffstat (limited to 'fpdfsdk/include/fsdk_annothandler.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_annothandler.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h index 9f97c52596..5b8b42f60e 100644 --- a/fpdfsdk/include/fsdk_annothandler.h +++ b/fpdfsdk/include/fsdk_annothandler.h @@ -217,26 +217,28 @@ typedef int (*AI_COMPARE) (CPDFSDK_Annot* p1, CPDFSDK_Annot* p2); class CPDFSDK_AnnotIterator { -protected: - CPDFSDK_Annot* NextAnnot (const CPDFSDK_Annot* pCurrent) ; - CPDFSDK_Annot* PrevAnnot (const CPDFSDK_Annot* pCurrent) ; - CPDFSDK_Annot* NextAnnot(int& index ) ; - CPDFSDK_Annot* PrevAnnot(int& index ) ; public: CPDFSDK_AnnotIterator(CPDFSDK_PageView * pPageView, FX_BOOL bReverse, - FX_BOOL bIgnoreTopmost=FALSE,FX_BOOL bCircle=FALSE,CFX_PtrArray* pList=NULL); + FX_BOOL bIgnoreTopmost=FALSE,FX_BOOL bCircle=FALSE,CFX_PtrArray* pList=NULL); + virtual ~CPDFSDK_AnnotIterator() { } + virtual CPDFSDK_Annot* Next (const CPDFSDK_Annot* pCurrent) ; virtual CPDFSDK_Annot* Prev (const CPDFSDK_Annot* pCurrent) ; virtual CPDFSDK_Annot* Next(int& index ) ; virtual CPDFSDK_Annot* Prev(int& index ) ; virtual int Count(){return m_pIteratorAnnotList.GetSize();} - + virtual FX_BOOL InitIteratorAnnotList(CPDFSDK_PageView * pPageView,CFX_PtrArray* pList=NULL); - + void InsertSort(CFX_PtrArray &arrayList, AI_COMPARE pCompare); + protected: - // CFX_PtrList m_pIteratorAnnotList; - CFX_PtrArray m_pIteratorAnnotList; + CPDFSDK_Annot* NextAnnot (const CPDFSDK_Annot* pCurrent) ; + CPDFSDK_Annot* PrevAnnot (const CPDFSDK_Annot* pCurrent) ; + CPDFSDK_Annot* NextAnnot(int& index ) ; + CPDFSDK_Annot* PrevAnnot(int& index ) ; + + CFX_PtrArray m_pIteratorAnnotList; FX_BOOL m_bReverse; FX_BOOL m_bIgnoreTopmost; FX_BOOL m_bCircle; |