From f4613c943315f76db04a57c2dd6ee8671c41131e Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Tue, 5 Sep 2017 19:22:14 -0400 Subject: [PATCH] Mark overridden methods as such --- .../APM/ArduSubFirmwarePlugin.h | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h index d5b70e26d..ecbbd9d9f 100644 --- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h +++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h @@ -101,33 +101,33 @@ public: ArduSubFirmwarePlugin(void); // Overrides from FirmwarePlugin - int manualControlReservedButtonCount(void); + int manualControlReservedButtonCount(void) final; int defaultJoystickTXMode(void) final { return 3; } - bool supportsThrottleModeCenterZero(void); + bool supportsThrottleModeCenterZero(void) final; - bool supportsManualControl(void); + bool supportsManualControl(void) final; - bool supportsRadio(void); + bool supportsRadio(void) final; - bool supportsJSButton(void); + bool supportsJSButton(void) final; - bool supportsMotorInterference(void); + bool supportsMotorInterference(void) final; /// Return the resource file which contains the vehicle icon used in the flight view when the view is dark (Satellite for instance) - virtual QString vehicleImageOpaque(const Vehicle* vehicle) const override; + virtual QString vehicleImageOpaque(const Vehicle* vehicle) const final; /// Return the resource file which contains the vehicle icon used in the flight view when the view is light (Map for instance) - virtual QString vehicleImageOutline(const Vehicle* vehicle) const override; + virtual QString vehicleImageOutline(const Vehicle* vehicle) const final; - QString brandImageIndoor(const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); } - QString brandImageOutdoor(const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); } + QString brandImageIndoor(const Vehicle* vehicle) const final{ Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); } + QString brandImageOutdoor(const Vehicle* vehicle) const final { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); } const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; } int remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const final; const QVariantList& toolBarIndicators(const Vehicle* vehicle) final; - bool adjustIncomingMavlinkMessage(Vehicle* vehicle, mavlink_message_t* message); - virtual QMap* factGroups(void); + bool adjustIncomingMavlinkMessage(Vehicle* vehicle, mavlink_message_t* message) final; + virtual QMap* factGroups(void) final; private: -- 2.22.0