From 0d601900645deb539871f9397da3b026b52ff2a3 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 18 Jan 2016 17:26:09 -0200 Subject: [PATCH] don't virtual a class that shouldn't be inheritable, use final instead virtual marks a method for inclusion on a v-table, but we don't want the methods of classes that won't be inheritable to have a v-table, we want, however, to issue a warning if somebody try to inherit that specific class and reimplement those methods. Signed-off-by: Tomaz Canabrava --- .../APM/APMAirframeComponent.h | 18 +++++++++--------- src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h | 2 +- src/AutoPilotPlugins/APM/APMCameraComponent.h | 18 +++++++++--------- .../APM/APMFlightModesComponent.h | 18 +++++++++--------- src/AutoPilotPlugins/APM/APMPowerComponent.h | 18 +++++++++--------- src/AutoPilotPlugins/APM/APMRadioComponent.h | 18 +++++++++--------- src/AutoPilotPlugins/APM/APMSafetyComponent.h | 18 +++++++++--------- src/AutoPilotPlugins/APM/APMSensorsComponent.h | 18 +++++++++--------- src/AutoPilotPlugins/APM/APMTuningComponent.h | 18 +++++++++--------- 9 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.h b/src/AutoPilotPlugins/APM/APMAirframeComponent.h index 0fe59f750..de6b7e128 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.h +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.h @@ -34,17 +34,17 @@ public: APMAirframeComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from APMComponent - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + QString name(void) const final; + QString description(void) const final; + QString iconResource(void) const final; + bool requiresSetup(void) const final; + bool setupComplete(void) const final; + QUrl setupSource(void) const final; + QUrl summaryQmlSource(void) const final; + QString prerequisiteSetup(void) const final; private: bool _requiresFrameSetup; ///< true: FRAME parameter must be set diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h index 67dd583f2..801a33cbe 100644 --- a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h +++ b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h @@ -47,7 +47,7 @@ public: ~APMAutoPilotPlugin(); // Overrides from AutoPilotPlugin - virtual const QVariantList& vehicleComponents(void); + const QVariantList& vehicleComponents(void) final; APMAirframeComponent* airframeComponent (void) { return _airframeComponent; } APMCameraComponent* cameraComponent (void) { return _cameraComponent; } diff --git a/src/AutoPilotPlugins/APM/APMCameraComponent.h b/src/AutoPilotPlugins/APM/APMCameraComponent.h index 354c802e7..7c59c9cc8 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponent.h +++ b/src/AutoPilotPlugins/APM/APMCameraComponent.h @@ -34,17 +34,17 @@ public: APMCameraComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from PX4Component - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + QString name(void) const final; + QString description(void) const final; + QString iconResource(void) const final; + bool requiresSetup(void) const final; + bool setupComplete(void) const final; + QUrl setupSource(void) const final; + QUrl summaryQmlSource(void) const final; + QString prerequisiteSetup(void) const final; private: const QString _name; diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.h b/src/AutoPilotPlugins/APM/APMFlightModesComponent.h index 349e08d3d..688321fdd 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.h +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.h @@ -34,17 +34,17 @@ public: APMFlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from PX4Component - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + QString name(void) const final; + QString description(void) const final; + QString iconResource(void) const final; + bool requiresSetup(void) const final; + bool setupComplete(void) const final; + QUrl setupSource(void) const final; + QUrl summaryQmlSource(void) const final; + QString prerequisiteSetup(void) const final; private: const QString _name; diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.h b/src/AutoPilotPlugins/APM/APMPowerComponent.h index 6c77b281e..c69553315 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponent.h +++ b/src/AutoPilotPlugins/APM/APMPowerComponent.h @@ -34,17 +34,17 @@ public: APMPowerComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from PX4Component - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name (void) const; - virtual QString description (void) const; - virtual QString iconResource (void) const; - virtual bool requiresSetup (void) const; - virtual bool setupComplete (void) const; - virtual QUrl setupSource (void) const; - virtual QUrl summaryQmlSource (void) const; - virtual QString prerequisiteSetup (void) const; + QString name (void) const final; + QString description (void) const final; + QString iconResource (void) const final; + bool requiresSetup (void) const final; + bool setupComplete (void) const final; + QUrl setupSource (void) const final; + QUrl summaryQmlSource (void) const final; + QString prerequisiteSetup (void) const final; private: const QString _name; diff --git a/src/AutoPilotPlugins/APM/APMRadioComponent.h b/src/AutoPilotPlugins/APM/APMRadioComponent.h index 3724f88d3..429eee9a4 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponent.h +++ b/src/AutoPilotPlugins/APM/APMRadioComponent.h @@ -35,17 +35,17 @@ public: APMRadioComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from PX4Component - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + QString name(void) const final; + QString description(void) const final; + QString iconResource(void) const final; + bool requiresSetup(void) const final; + bool setupComplete(void) const final; + QUrl setupSource(void) const final; + QUrl summaryQmlSource(void) const final; + QString prerequisiteSetup(void) const final; private slots: void _triggerChanged(void); diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponent.h b/src/AutoPilotPlugins/APM/APMSafetyComponent.h index ad6dfa898..01c17502c 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponent.h +++ b/src/AutoPilotPlugins/APM/APMSafetyComponent.h @@ -34,17 +34,17 @@ public: APMSafetyComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from PX4Component - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + QString name(void) const final; + QString description(void) const final; + QString iconResource(void) const final; + bool requiresSetup(void) const final; + bool setupComplete(void) const final; + QUrl setupSource(void) const final; + QUrl summaryQmlSource(void) const final; + QString prerequisiteSetup(void) const final; private: const QString _name; diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.h b/src/AutoPilotPlugins/APM/APMSensorsComponent.h index fec2fa0db..cf5999b76 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.h +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.h @@ -37,17 +37,17 @@ public: bool accelSetupNeeded(void) const; // Virtuals from APMComponent - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + QString name(void) const final; + QString description(void) const final; + QString iconResource(void) const final; + bool requiresSetup(void) const final; + bool setupComplete(void) const final; + QUrl setupSource(void) const final; + QUrl summaryQmlSource(void) const final; + QString prerequisiteSetup(void) const final; private: const QString _name; diff --git a/src/AutoPilotPlugins/APM/APMTuningComponent.h b/src/AutoPilotPlugins/APM/APMTuningComponent.h index 4ad235979..8e7ec4e2d 100644 --- a/src/AutoPilotPlugins/APM/APMTuningComponent.h +++ b/src/AutoPilotPlugins/APM/APMTuningComponent.h @@ -34,17 +34,17 @@ public: APMTuningComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); // Virtuals from PX4Component - virtual QStringList setupCompleteChangedTriggerList(void) const; + QStringList setupCompleteChangedTriggerList(void) const final; // Virtuals from VehicleComponent - virtual QString name(void) const; - virtual QString description(void) const; - virtual QString iconResource(void) const; - virtual bool requiresSetup(void) const; - virtual bool setupComplete(void) const; - virtual QUrl setupSource(void) const; - virtual QUrl summaryQmlSource(void) const; - virtual QString prerequisiteSetup(void) const; + QString name(void) const final; + QString description(void) const final; + QString iconResource(void) const final; + bool requiresSetup(void) const final; + bool setupComplete(void) const final; + QUrl setupSource(void) const final; + QUrl summaryQmlSource(void) const final; + QString prerequisiteSetup(void) const final; private: const QString _name; -- 2.22.0