From 5e557847075f243179b42f2e0aa2593cd4e1e08b Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 9 Feb 2018 09:50:59 +1100 Subject: [PATCH] Copter: remove unneeded and unwanted virtual keywords --- ArduCopter/mode.h | 66 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/ArduCopter/mode.h b/ArduCopter/mode.h index 73238572cf..593725d8ba 100644 --- a/ArduCopter/mode.h +++ b/ArduCopter/mode.h @@ -105,14 +105,14 @@ class ModeAcro : public Mode { public: // inherit constructor using Copter::Mode::Mode; - + virtual bool init(bool ignore_checks) override; virtual void run() override; - virtual bool is_autopilot() const override { return false; } - virtual bool requires_GPS() const override { return false; } - virtual bool has_manual_throttle() const override { return true; } - virtual bool allows_arming(bool from_gcs) const override { return true; }; + bool is_autopilot() const override { return false; } + bool requires_GPS() const override { return false; } + bool has_manual_throttle() const override { return true; } + bool allows_arming(bool from_gcs) const override { return true; }; protected: @@ -171,13 +171,13 @@ public: // inherit constructor using Copter::Mode::Mode; - virtual bool init(bool ignore_checks) override; - virtual void run() override; + bool init(bool ignore_checks) override; + void run() override; - virtual bool is_autopilot() const override { return true; } - virtual bool requires_GPS() const override { return true; } - virtual bool has_manual_throttle() const override { return false; } - virtual bool allows_arming(bool from_gcs) const override { return false; }; + bool is_autopilot() const override { return true; } + bool requires_GPS() const override { return true; } + bool has_manual_throttle() const override { return false; } + bool allows_arming(bool from_gcs) const override { return false; }; // Auto AutoMode mode() const { return _mode; } @@ -534,13 +534,13 @@ public: // inherit constructor using Copter::Mode::Mode; - virtual bool init(bool ignore_checks) override; - virtual void run() override; + bool init(bool ignore_checks) override; + void run() override; - virtual bool requires_GPS() const override { return true; } - virtual bool has_manual_throttle() const override { return false; } - virtual bool allows_arming(bool from_gcs) const override { return true; }; - virtual bool is_autopilot() const override { return false; } + bool requires_GPS() const override { return true; } + bool has_manual_throttle() const override { return false; } + bool allows_arming(bool from_gcs) const override { return true; }; + bool is_autopilot() const override { return false; } protected: @@ -560,13 +560,13 @@ public: // inherit constructor using Copter::Mode::Mode; - virtual bool init(bool ignore_checks) override; - virtual void run() override; + bool init(bool ignore_checks) override; + void run() override; - virtual bool requires_GPS() const override { return false; } - virtual bool has_manual_throttle() const override { return false; } - virtual bool allows_arming(bool from_gcs) const override { return false; }; - virtual bool is_autopilot() const override { return false; } + bool requires_GPS() const override { return false; } + bool has_manual_throttle() const override { return false; } + bool allows_arming(bool from_gcs) const override { return false; }; + bool is_autopilot() const override { return false; } protected: @@ -964,13 +964,13 @@ public: // inherit constructor using Copter::Mode::Mode; - virtual bool init(bool ignore_checks) override; - virtual void run() override; + bool init(bool ignore_checks) override; + void run() override; - virtual bool requires_GPS() const override { return false; } - virtual bool has_manual_throttle() const override { return false; } - virtual bool allows_arming(bool from_gcs) const override { return true; }; - virtual bool is_autopilot() const override { return false; } + bool requires_GPS() const override { return false; } + bool has_manual_throttle() const override { return false; } + bool allows_arming(bool from_gcs) const override { return true; }; + bool is_autopilot() const override { return false; } protected: @@ -991,10 +991,10 @@ public: virtual bool init(bool ignore_checks) override; virtual void run() override; - virtual bool requires_GPS() const override { return false; } - virtual bool has_manual_throttle() const override { return true; } - virtual bool allows_arming(bool from_gcs) const override { return true; }; - virtual bool is_autopilot() const override { return false; } + bool requires_GPS() const override { return false; } + bool has_manual_throttle() const override { return true; } + bool allows_arming(bool from_gcs) const override { return true; }; + bool is_autopilot() const override { return false; } protected: