Make overriding explicit and remove redundant virtual specifiers on overriding destructors - Core & UnitTests

6 files changed, 15 insertions, 15 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
index 377e63251d..09beffe728 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
@@ -17,7 +17,7 @@ public:
   AnalogStick(const char* name, std::unique_ptr<StickGate>&& stick_gate);
   AnalogStick(const char* name, const char* ui_name, std::unique_ptr<StickGate>&& stick_gate);
 
-  ReshapeData GetReshapableState(bool adjusted) const final override;
+  ReshapeData GetReshapableState(bool adjusted) const final;
   ControlState GetGateRadiusAtAngle(double ang) const override;
 
   StateData GetState() const;
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
index 7b2e5f581c..a59826124a 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
@@ -24,7 +24,7 @@ public:
 
   Cursor(std::string name, std::string ui_name);
 
-  ReshapeData GetReshapableState(bool adjusted) const final override;
+  ReshapeData GetReshapableState(bool adjusted) const final;
   ControlState GetGateRadiusAtAngle(double ang) const override;
 
   // Modifies the state
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h
index 8815cffa73..abe02a44d4 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.h
@@ -18,10 +18,10 @@ public:
 
   explicit Force(const std::string& name);
 
-  ReshapeData GetReshapableState(bool adjusted) const final override;
-  ControlState GetGateRadiusAtAngle(double ang) const final override;
+  ReshapeData GetReshapableState(bool adjusted) const final;
+  ControlState GetGateRadiusAtAngle(double ang) const final;
 
-  ControlState GetDefaultInputRadiusAtAngle(double angle) const final override;
+  ControlState GetDefaultInputRadiusAtAngle(double angle) const final;
 
   StateData GetState(bool adjusted = true) const;
 
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
index b9de77d712..69cfd7d202 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
@@ -18,12 +18,12 @@ public:
 
   explicit Tilt(const std::string& name);
 
-  ReshapeData GetReshapableState(bool adjusted) const final override;
-  ControlState GetGateRadiusAtAngle(double angle) const final override;
+  ReshapeData GetReshapableState(bool adjusted) const final;
+  ControlState GetGateRadiusAtAngle(double angle) const final;
 
   // Tilt is using the gate radius to adjust the tilt angle so we must provide an unadjusted value
   // for the default input radius.
-  ControlState GetDefaultInputRadiusAtAngle(double angle) const final override;
+  ControlState GetDefaultInputRadiusAtAngle(double angle) const final;
 
   StateData GetState() const;
 
diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
index 0c6ff27cd8..466906da04 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
@@ -235,7 +235,7 @@ protected:
 class EmulatedController : public ControlGroupContainer
 {
 public:
-  virtual ~EmulatedController();
+  ~EmulatedController() override;
 
   virtual InputConfig* GetConfig() const = 0;
 
diff --git a/Source/Core/InputCommon/ControllerEmu/StickGate.h b/Source/Core/InputCommon/ControllerEmu/StickGate.h
index 496621492e..919cc08815 100644
--- a/Source/Core/InputCommon/ControllerEmu/StickGate.h
+++ b/Source/Core/InputCommon/ControllerEmu/StickGate.h
@@ -36,8 +36,8 @@ class OctagonStickGate : public StickGate
 public:
   // Radius of circumscribed circle
   explicit OctagonStickGate(ControlState radius);
-  ControlState GetRadiusAtAngle(double ang) const override final;
-  std::optional<u32> GetIdealCalibrationSampleCount() const override final;
+  ControlState GetRadiusAtAngle(double ang) const final;
+  std::optional<u32> GetIdealCalibrationSampleCount() const final;
 
 private:
   const ControlState m_radius;
@@ -48,8 +48,8 @@ class RoundStickGate : public StickGate
 {
 public:
   explicit RoundStickGate(ControlState radius);
-  ControlState GetRadiusAtAngle(double ang) const override final;
-  std::optional<u32> GetIdealCalibrationSampleCount() const override final;
+  ControlState GetRadiusAtAngle(double ang) const final;
+  std::optional<u32> GetIdealCalibrationSampleCount() const final;
 
 private:
   const ControlState m_radius;
@@ -60,8 +60,8 @@ class SquareStickGate : public StickGate
 {
 public:
   explicit SquareStickGate(ControlState half_width);
-  ControlState GetRadiusAtAngle(double ang) const override final;
-  std::optional<u32> GetIdealCalibrationSampleCount() const override final;
+  ControlState GetRadiusAtAngle(double ang) const final;
+  std::optional<u32> GetIdealCalibrationSampleCount() const final;
 
 private:
   const ControlState m_half_width;