Switch most min/max macros to std::min/max.

fpdfsdk/include/fxedit/fxet_edit.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #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"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
 
-class CFX_Edit_Page;
-struct CFX_Edit_LineRect;
-class CFX_Edit_LineRectArray;
-class CFX_Edit_RectArray;
-class CFX_Edit_Refresh;
-class CFX_Edit_Select;
 class CFX_Edit;
 class CFX_Edit_Iterator;
-class CFX_Edit_Refresh;
-class CFX_Edit_UndoItem;
-class CFX_Edit_Undo;
 class CFX_Edit_Provider;
 
 #define FX_EDIT_IsFloatZero(f) (f < 0.0001 && f > -0.0001)
 #define FX_EDIT_IsFloatEqual(fa, fb) FX_EDIT_IsFloatZero(fa - fb)
 #define FX_EDIT_IsFloatBigger(fa, fb) (fa > fb && !FX_EDIT_IsFloatEqual(fa, fb))
 #define FX_EDIT_IsFloatSmaller(fa, fb) \
   (fa < fb && !FX_EDIT_IsFloatEqual(fa, fb))
 
-template <class T>
-T FX_EDIT_MIN(const T& i, const T& j) {
-  return ((i < j) ? i : j);
-}
-template <class T>
-T FX_EDIT_MAX(const T& i, const T& j) {
-  return ((i > j) ? i : j);
-}
-
-#define FX_EDIT_PI 3.14159265358979f
-#define FX_EDIT_ITALIC_ANGEL 10 * FX_EDIT_PI / 180.0f
-
 /* ------------------------- CFX_Edit_Refresh ---------------------------- */
 
 enum REFRESH_PLAN_E { RP_ANALYSE, RP_NOANALYSE, RP_OPTIONAL };
 
 enum EDIT_PROPS_E {
   EP_LINELEADING,
   EP_LINEINDENT,
   EP_ALIGNMENT,
   EP_FONTINDEX,
   EP_FONTSIZE,
@@ skipping 134 matching lines @@
 /* ------------------------- CFX_Edit_Select ---------------------------- */
 
 class CFX_Edit_Select {
  public:
   CFX_Edit_Select() {}
 
   CFX_Edit_Select(const CPVT_WordPlace& begin, const CPVT_WordPlace& end) {
     Set(begin, end);
   }
 
-  CFX_Edit_Select(const CPVT_WordRange& range) {
+  explicit CFX_Edit_Select(const CPVT_WordRange& range) {
     Set(range.BeginPos, range.EndPos);
   }
 
   CPVT_WordRange ConvertToWordRange() const {
     return CPVT_WordRange(BeginPos, EndPos);
   }
 
   void Default() {
     BeginPos.Default();
     EndPos.Default();
@@ skipping 14 matching lines @@
     return wr.BeginPos != BeginPos || wr.EndPos != EndPos;
   }
 
   CPVT_WordPlace BeginPos, EndPos;
 };
 
 /* ------------------------- CFX_Edit_Undo ---------------------------- */
 
 class CFX_Edit_Undo {
  public:
-  CFX_Edit_Undo(int32_t nBufsize = 10000);
+  explicit CFX_Edit_Undo(int32_t nBufsize);
   virtual ~CFX_Edit_Undo();
 
   void Undo();
   void Redo();
 
   void AddItem(IFX_Edit_UndoItem* pItem);
 
   FX_BOOL CanUndo() const;
   FX_BOOL CanRedo() const;
   FX_BOOL IsModified() const;
@@ skipping 34 matching lines @@
   void SetLast(FX_BOOL bLast) { m_bLast = bLast; }
   FX_BOOL IsLast() { return m_bLast; }
 
  private:
   FX_BOOL m_bFirst;
   FX_BOOL m_bLast;
 };
 
 class CFX_Edit_GroupUndoItem : public IFX_Edit_UndoItem {
  public:
-  CFX_Edit_GroupUndoItem(const CFX_WideString& sTitle);
+  explicit CFX_Edit_GroupUndoItem(const CFX_WideString& sTitle);
   ~CFX_Edit_GroupUndoItem() override;
 
   void Undo() override;
   void Redo() override;
   CFX_WideString GetUndoTitle() override;
 
   void AddUndoItem(CFX_Edit_UndoItem* pUndoItem);
   void UpdateItems();
 
  private:
@@ skipping 236 matching lines @@
   friend class CFXEU_InsertReturn;
   friend class CFXEU_Backspace;
   friend class CFXEU_Delete;
   friend class CFXEU_Clear;
   friend class CFXEU_ClearRich;
   friend class CFXEU_SetSecProps;
   friend class CFXEU_SetWordProps;
   friend class CFXEU_InsertText;
 
  public:
-  CFX_Edit(IPDF_VariableText* pVT);
+  explicit CFX_Edit(IPDF_VariableText* pVT);
   ~CFX_Edit() override;
 
   // IFX_Edit
   void SetFontMap(IFX_Edit_FontMap* pFontMap) override;
   void SetVTProvider(IPDF_VariableText_Provider* pProvider) override;
   void SetNotify(IFX_Edit_Notify* pNotify) override;
   void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) override;
   IFX_Edit_Iterator* GetIterator() override;
   IPDF_VariableText* GetVariableText() override;
   IFX_Edit_FontMap* GetFontMap() override;
@@ skipping 250 matching lines @@
   const CPVT_WordPlace& GetAt() const override;
   IFX_Edit* GetEdit() const override;
 
  private:
   CFX_Edit* m_pEdit;
   IPDF_VariableText_Iterator* m_pVTIterator;
 };
 
 class CFX_Edit_Provider : public IPDF_VariableText_Provider {
  public:
-  CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap);
+  explicit CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap);
   ~CFX_Edit_Provider() override;
 
   IFX_Edit_FontMap* GetFontMap();
 
   // IPDF_VariableText_Provider:
   int32_t GetCharWidth(int32_t nFontIndex,
                        FX_WORD word,
                        int32_t nWordStyle) override;
   int32_t GetTypeAscent(int32_t nFontIndex) override;
   int32_t GetTypeDescent(int32_t nFontIndex) override;
   int32_t GetWordFontIndex(FX_WORD word,
                            int32_t charset,
                            int32_t nFontIndex) override;
   int32_t GetDefaultFontIndex() override;
   FX_BOOL IsLatinWord(FX_WORD word) override;
 
  private:
   IFX_Edit_FontMap* m_pFontMap;
 };
 
 #endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_