Fix -Wdelete-non-abstract-non-virtual-dtor

Drewol · Aug 25, 2020 · a15b066 · a15b066
1 parent 5eb74d5
commit a15b066
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Main/include/GameFailCondition.hpp b/Main/include/GameFailCondition.hpp
@@ -5,6 +5,7 @@ class Scoring;
 class GameFailCondition
 {
 public:
+	virtual ~GameFailCondition() = default;
 	enum class Type
 	{
 		None, Score, Grade, Miss, MissAndNear, Gauge

diff --git a/Main/include/PracticeModeSettingsDialog.hpp b/Main/include/PracticeModeSettingsDialog.hpp
@@ -7,6 +7,7 @@ struct ChartIndex;
 class PracticeModeSettingsDialog : public BaseGameSettingsDialog
 {
 public:
+	virtual ~PracticeModeSettingsDialog() = default;
 	PracticeModeSettingsDialog(Game& game, MapTime& lastMapTime,
 		int32& tempOffset, Game::PlayOptions& playOptions, MapTimeRange& range);
 	void InitTabs() override;

diff --git a/Main/src/SongSelect.cpp b/Main/src/SongSelect.cpp
@@ -290,7 +290,7 @@ class SelectionWheel
 			g_application->RemoveTickable(m_owner);
 		}
 	}
-	~SelectionWheel()
+	virtual ~SelectionWheel()
 	{
 		g_gameConfig.Set(GameConfigKeys::LastSelected, m_currentlySelectedMapId);
 		if (m_lua)
@@ -1793,7 +1793,7 @@ class SongSelect_Impl : public SongSelect
 			m_selectionWheel->AdvanceSelection(steps);
 		}
 	}
-	virtual void OnKeyPressed(SDL_Scancode code)
+	void OnKeyPressed(SDL_Scancode code) override
 	{
 		if (m_multiplayer &&
 				m_multiplayer->GetChatOverlay()->OnKeyPressedConsume(code))
@@ -1924,10 +1924,10 @@ class SongSelect_Impl : public SongSelect
 			}
 		}
 	}
-	virtual void OnKeyReleased(SDL_Scancode code)
+	void OnKeyReleased(SDL_Scancode code) override
 	{
 	}
-	virtual void Tick(float deltaTime) override
+	void Tick(float deltaTime) override
 	{
 		if (m_dbUpdateTimer.Milliseconds() > 500)
 		{
@@ -1952,7 +1952,7 @@ class SongSelect_Impl : public SongSelect
 			m_multiplayer->GetChatOverlay()->Tick(deltaTime);
 	}
 
-	virtual void Render(float deltaTime)
+	void Render(float deltaTime) override
 	{
 		if (m_suspended && m_hasRestored) return;
 		lua_getglobal(m_lua, "render");
@@ -2042,7 +2042,7 @@ class SongSelect_Impl : public SongSelect
 		m_advanceSong -= advanceSongActual;
 	}
 
-	virtual void OnSuspend()
+	void OnSuspend() override
 	{
 		m_lastMapIndex = m_selectionWheel->GetCurrentSongIndex();
 
@@ -2052,7 +2052,7 @@ class SongSelect_Impl : public SongSelect
 		if (m_lockMouse)
 			m_lockMouse.reset();
 	}
-	virtual void OnRestore()
+	void OnRestore() override
 	{
 		g_application->DiscordPresenceMenu("Song Select");
 		m_suspended = false;