xrGame/ui/UIMap.h|cpp: use default virtual destructor (#694)

OpenXRay · Dec 2, 2020 · 22928da · 22928da
1 parent 6a26325
commit 22928da
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/xrGame/ui/UIMap.cpp b/src/xrGame/ui/UIMap.cpp
@@ -48,7 +48,6 @@ void CUICustomMap::Initialize(shared_str name, LPCSTR sh_name)
         xr_delete(levelIni);
 }
 
-CUICustomMap::~CUICustomMap() {}
 void CUICustomMap::Update()
 {
     SetPointerDistance(0.0f);
@@ -279,7 +278,6 @@ CUIGlobalMap::CUIGlobalMap(CUIMapWnd* pMapWnd)
     Show(false);
 }
 
-CUIGlobalMap::~CUIGlobalMap() {}
 void CUIGlobalMap::Initialize() { Init_internal("global_map", *pGameIni, "global_map", "hud" DELIMITER "default"); }
 void CUIGlobalMap::Init_internal(const shared_str& name, const CInifile& pLtx, const shared_str& sect_name, LPCSTR sh_name)
 {
@@ -384,7 +382,6 @@ CUILevelMap::CUILevelMap(CUIMapWnd* p)
     Show(false);
 }
 
-CUILevelMap::~CUILevelMap() {}
 void CUILevelMap::Draw()
 {
     if (MapWnd())
@@ -572,8 +569,6 @@ CUIMiniMap::CUIMiniMap()
     SetRounded(true);
 }
 
-CUIMiniMap::~CUIMiniMap() {}
-
 void CUIMiniMap::Init_internal(const shared_str& name, const CInifile& pLtx, const shared_str& sect_name, LPCSTR sh_name)
 {
     inherited::Init_internal(name, pLtx, sect_name, sh_name);

diff --git a/src/xrGame/ui/UIMap.h b/src/xrGame/ui/UIMap.h
@@ -27,7 +27,7 @@ class CUICustomMap : public CUIStatic, public CUIWndCallback
     shared_str m_shader_name;
 
     CUICustomMap();
-    virtual ~CUICustomMap();
+    virtual ~CUICustomMap() = default;
 
     virtual void SetActivePoint(const Fvector& vNewPoint);
 
@@ -82,7 +82,6 @@ class CUIGlobalMap : public CUICustomMap
         const Fvector2& src, bool for_drawing); // pixels->pixels (relatively own left-top pos)
 
     CUIGlobalMap(CUIMapWnd* pMapWnd);
-    virtual ~CUIGlobalMap();
 
     IC void SetMinZoom(float zoom) { m_minZoom = zoom; }
     IC float GetMinZoom() { return m_minZoom; }
@@ -113,7 +112,6 @@ class CUILevelMap : public CUICustomMap
     CUILevelMap& operator=(const CUILevelMap& obj) = delete;
 public:
     CUILevelMap(CUIMapWnd*);
-    virtual ~CUILevelMap();
     const Frect& GlobalRect() const { return m_GlobalRect; }
     virtual void Draw();
     virtual void Show(bool status);
@@ -137,7 +135,6 @@ class CUIMiniMap : public CUICustomMap
 
 public:
     CUIMiniMap();
-    virtual ~CUIMiniMap();
     virtual void Draw();
     virtual bool GetPointerTo(const Fvector2& src, float item_radius, Fvector2& pos,
         float& heading); // position and heading for drawing pointer to src pos