Merge to XFA: Fix ALL the include guards.
[pdfium.git] / fpdfsdk / include / fxedit / fxet_edit.h
index 8aa44a4..237aa66 100644 (file)
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXET_EDIT_H_
-#define _FXET_EDIT_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
 #include "fx_edit.h"
@@ -325,12 +325,9 @@ class CFX_Edit_UndoItem : public IFX_Edit_UndoItem
 {
 public:
        CFX_Edit_UndoItem() : m_bFirst(TRUE), m_bLast(TRUE) {}
-       virtual ~CFX_Edit_UndoItem(){}
 
-       virtual CFX_WideString                                  GetUndoTitle() {return L"";}
-       virtual void                                                    Release(){delete this;}
+       CFX_WideString GetUndoTitle() override { return L""; }
 
-public:
        void                                                                    SetFirst(FX_BOOL bFirst){m_bFirst = bFirst;}
        FX_BOOL                                                                 IsFirst(){return m_bFirst;}
        void                                                                    SetLast(FX_BOOL bLast){m_bLast = bLast;}
@@ -345,17 +342,15 @@ class CFX_Edit_GroupUndoItem : public IFX_Edit_UndoItem
 {
 public:
        CFX_Edit_GroupUndoItem(const CFX_WideString& sTitle);
-       virtual ~CFX_Edit_GroupUndoItem();
+       ~CFX_Edit_GroupUndoItem() override;
+
+       void                                                    Undo() override;
+       void                                                    Redo() override;
+       CFX_WideString                                  GetUndoTitle() override;
 
        void                                                                    AddUndoItem(CFX_Edit_UndoItem* pUndoItem);
        void                                                                    UpdateItems();
 
-public:
-       virtual void                                                    Undo();
-       virtual void                                                    Redo();
-       virtual CFX_WideString                                  GetUndoTitle();
-       virtual void                                                    Release();
-
 private:
        CFX_WideString                                                  m_sTitle;
        CFX_ArrayTemplate<CFX_Edit_UndoItem*>   m_Items;
@@ -819,5 +814,4 @@ private:
        IFX_Edit_FontMap*                       m_pFontMap;
 };
 
-#endif //_FXET_EDIT_H_
-
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_