further warnings from clang-11: sort out override vs final

Base/Axis/ConstKBinAxis.h

@@ -20,7 +20,7 @@
 //! Axis with fixed bin size in sin(angle) space.
 //! @ingroup tools
 
-class ConstKBinAxis final : public VariableBinAxis
+class ConstKBinAxis : public VariableBinAxis
 {
 public:
     //! ConstKBinAxis constructor.

Core/Simulation/OffSpecSimulation.h

@@ -23,7 +23,7 @@ class Histogram2D;
 //! Main class to run an off-specular simulation.
 //! @ingroup simulation
 
-class OffSpecSimulation final : public ISimulation2D
+class OffSpecSimulation: public ISimulation2D
 {
 public:
     OffSpecSimulation();

Device/Detector/SimpleUnitConverters.h

@@ -73,7 +73,7 @@ private:
 //! Its default units are radians for both axes
 //! @ingroup simulation_internal
 
-class SphericalConverter final : public UnitConverterSimple
+class SphericalConverter: public UnitConverterSimple
 {
 public:
     SphericalConverter(const SphericalDetector& detector, const Beam& beam);
@@ -97,7 +97,7 @@ private:
 //! Its default units are mm for both axes
 //! @ingroup simulation_internal
 
-class RectangularConverter final : public UnitConverterSimple
+class RectangularConverter: public UnitConverterSimple
 {
 public:
     RectangularConverter(const RectangularDetector& detector, const Beam& beam);
@@ -124,7 +124,7 @@ private:
 //! Its default units are radians for both axes
 //! @ingroup simulation_internal
 
-class OffSpecularConverter final : public UnitConverterSimple
+class OffSpecularConverter: public UnitConverterSimple
 {
 public:
     OffSpecularConverter(const IDetector2D& detector, const Beam& beam, const IAxis& alpha_axis);
@@ -145,7 +145,7 @@ private:
 //! Its default units are radians for x-axis and nm for y-axis
 //! @ingroup simulation_internal
 
-class DepthProbeConverter final : public UnitConverterSimple
+class DepthProbeConverter: public UnitConverterSimple
 {
 public:
     DepthProbeConverter(const Beam& beam, const IAxis& alpha_axis, const IAxis& z_axis);

GUI/coregui/Models/ParameterTranslators.h

@@ -29,7 +29,7 @@ public:
     virtual QStringList translate(const QStringList& list) const = 0;
 };
 
-class ModelTypeTranslator final : public IPathTranslator
+class ModelTypeTranslator: public IPathTranslator
 {
 public:
     ModelTypeTranslator(QString gui_model_type, QString domain_name);
@@ -44,7 +44,7 @@ private:
     QString m_domain_name;
 };
 
-class AddElementTranslator final : public IPathTranslator
+class AddElementTranslator: public IPathTranslator
 {
 public:
     AddElementTranslator(QString gui_name, QString additional_name);
@@ -59,7 +59,7 @@ private:
     QString m_additional_name;
 };
 
-class RotationTranslator final : public IPathTranslator
+class RotationTranslator: public IPathTranslator
 {
 public:
     ~RotationTranslator() override {}
@@ -69,7 +69,7 @@ public:
     QStringList translate(const QStringList& list) const override;
 };
 
-class DistributionNoneTranslator final : public IPathTranslator
+class DistributionNoneTranslator: public IPathTranslator
 {
 public:
     ~DistributionNoneTranslator() override {}
@@ -79,7 +79,7 @@ public:
     QStringList translate(const QStringList& list) const override;
 };
 
-class RoughnessTranslator final : public IPathTranslator
+class RoughnessTranslator: public IPathTranslator
 {
 public:
     RoughnessTranslator(const SessionItem* p_parent);
@@ -95,7 +95,7 @@ private:
     const SessionItem* m_parent;
 };
 
-class VectorParameterTranslator final : public IPathTranslator
+class VectorParameterTranslator: public IPathTranslator
 {
 public:
     VectorParameterTranslator(QString gui_name, std::string base_name,

Sample/Aggregate/InterferenceFunction1DLattice.h

@@ -22,7 +22,7 @@ class IFTDecayFunction1D;
 //! Interference function of a 1D lattice.
 //! @ingroup interference
 
-class InterferenceFunction1DLattice final : public IInterferenceFunction
+class InterferenceFunction1DLattice: public IInterferenceFunction
 {
 public:
     InterferenceFunction1DLattice(double length, double xi);

Sample/Aggregate/InterferenceFunction2DLattice.h

@@ -23,7 +23,7 @@
 //! Interference function of a 2D lattice.
 //! @ingroup interference
 
-class InterferenceFunction2DLattice final : public IInterferenceFunction
+class InterferenceFunction2DLattice: public IInterferenceFunction
 {
 public:
     InterferenceFunction2DLattice(const Lattice2D& lattice);

Sample/Aggregate/InterferenceFunction2DParaCrystal.h

@@ -26,7 +26,7 @@ class IFTDistribution2D;
 //! Interference function of a 2D paracrystal.
 //! @ingroup interference
 
-class InterferenceFunction2DParaCrystal final : public IInterferenceFunction
+class InterferenceFunction2DParaCrystal: public IInterferenceFunction
 {
 public:
     InterferenceFunction2DParaCrystal(const Lattice2D& lattice, double damping_length,

Sample/Aggregate/InterferenceFunction2DSuperLattice.h

@@ -22,7 +22,7 @@
 //! each lattice site.
 //! @ingroup interference
 
-class InterferenceFunction2DSuperLattice final : public IInterferenceFunction
+class InterferenceFunction2DSuperLattice: public IInterferenceFunction
 {
 public:
     InterferenceFunction2DSuperLattice(const Lattice2D& lattice, unsigned size_1, unsigned size_2);

Sample/Aggregate/InterferenceFunction3DLattice.h

@@ -23,7 +23,7 @@ class IPeakShape;
 //! Interference function of a 3D lattice.
 //! @ingroup interference
 
-class InterferenceFunction3DLattice final : public IInterferenceFunction
+class InterferenceFunction3DLattice: public IInterferenceFunction
 {
 public:
     InterferenceFunction3DLattice(const Lattice3D& lattice);

Sample/Aggregate/InterferenceFunctionFinite2DLattice.h

@@ -21,15 +21,15 @@
 //! Interference function of a finite 2D lattice.
 //! @ingroup interference
 
-class InterferenceFunctionFinite2DLattice : public IInterferenceFunction
+class InterferenceFunctionFinite2DLattice: public IInterferenceFunction
 {
 public:
     InterferenceFunctionFinite2DLattice(const Lattice2D& lattice, unsigned N_1, unsigned N_2);
-    ~InterferenceFunctionFinite2DLattice() final;
+    ~InterferenceFunctionFinite2DLattice() override;
 
-    InterferenceFunctionFinite2DLattice* clone() const final;
+    InterferenceFunctionFinite2DLattice* clone() const override;
 
-    void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
+    void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
 
     unsigned numberUnitCells1() const { return m_N_1; }
     unsigned numberUnitCells2() const { return m_N_2; }
@@ -40,12 +40,12 @@ public:
     const Lattice2D& lattice() const;
 
     //! Returns the particle density associated with this 2d lattice
-    double getParticleDensity() const final;
+    double getParticleDensity() const override;
 
-    std::vector<const INode*> getChildren() const final;
+    std::vector<const INode*> getChildren() const override;
 
 private:
-    double iff_without_dw(const kvector_t q) const final;
+    double iff_without_dw(const kvector_t q) const override;
 
     double interferenceForXi(double xi) const;
 

Sample/Aggregate/InterferenceFunctionFinite3DLattice.h

@@ -21,16 +21,16 @@
 //! Interference function of a finite 3D lattice.
 //! @ingroup interference
 
-class InterferenceFunctionFinite3DLattice : public IInterferenceFunction
+class InterferenceFunctionFinite3DLattice: public IInterferenceFunction
 {
 public:
     InterferenceFunctionFinite3DLattice(const Lattice3D& lattice, unsigned N_1, unsigned N_2,
                                         unsigned N_3);
-    ~InterferenceFunctionFinite3DLattice() final;
+    ~InterferenceFunctionFinite3DLattice() override;
 
-    InterferenceFunctionFinite3DLattice* clone() const final;
+    InterferenceFunctionFinite3DLattice* clone() const override;
 
-    void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
+    void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
 
     unsigned numberUnitCells1() const { return m_N_1; }
     unsigned numberUnitCells2() const { return m_N_2; }
@@ -38,12 +38,12 @@ public:
 
     const Lattice3D& lattice() const;
 
-    bool supportsMultilayer() const final { return false; }
+    bool supportsMultilayer() const override { return false; }
 
-    std::vector<const INode*> getChildren() const final;
+    std::vector<const INode*> getChildren() const override;
 
 private:
-    double iff_without_dw(const kvector_t q) const final;
+    double iff_without_dw(const kvector_t q) const override;
     void setLattice(const Lattice3D& lattice);
 
     std::unique_ptr<Lattice3D> m_lattice;

Sample/Aggregate/InterferenceFunctionHardDisk.h

@@ -24,7 +24,7 @@
 //! DOI: 10.1080/00268979500101211
 //! @ingroup interference
 
-class InterferenceFunctionHardDisk final : public IInterferenceFunction
+class InterferenceFunctionHardDisk: public IInterferenceFunction
 {
 public:
     InterferenceFunctionHardDisk(double radius, double density, double position_var = 0);

Sample/FFCompute/ComputeBA.h

@@ -22,7 +22,7 @@
 
 //! @ingroup formfactors_internal
 
-class ComputeBA final : public IComputeFF
+class ComputeBA: public IComputeFF
 {
 public:
     ComputeBA(const IFormFactor& ff);

Sample/FFCompute/ComputeBAPol.h

@@ -23,7 +23,7 @@
 
 //! @ingroup formfactors_internal
 
-class ComputeBAPol final : public IComputeFF
+class ComputeBAPol: public IComputeFF
 {
 public:
     ComputeBAPol(const IFormFactor& ff);

Sample/FFCompute/ComputeDWBA.h

@@ -24,7 +24,7 @@ class ILayerRTCoefficients;
 
 //! @ingroup formfactors_internal
 
-class ComputeDWBA final : public IComputeFF
+class ComputeDWBA: public IComputeFF
 {
 public:
     ComputeDWBA(const IFormFactor& ff);

Sample/FFCompute/ComputeDWBAPol.h

@@ -24,7 +24,7 @@ class ILayerRTCoefficients;
 
 //! @ingroup formfactors_internal
 
-class ComputeDWBAPol final : public IComputeFF
+class ComputeDWBAPol: public IComputeFF
 {
 public:
     ComputeDWBAPol(const IFormFactor& ff);

Sample/Fresnel/ScalarFresnelMap.h

@@ -33,7 +33,7 @@ class ScalarFresnelMap : public IFresnelMap
 {
 public:
     ScalarFresnelMap(std::unique_ptr<ISpecularStrategy> strategy);
-    ~ScalarFresnelMap() final;
+    ~ScalarFresnelMap() override;
 
     ScalarFresnelMap(const ScalarFresnelMap& other) = delete;
     ScalarFresnelMap& operator=(const ScalarFresnelMap& other) = delete;

Sample/Interference/DecouplingApproximationStrategy.h

@@ -23,7 +23,7 @@ class SimulationElement;
 //! in the decoupling approximation.
 //! @ingroup algorithms_internal
 
-class DecouplingApproximationStrategy final : public IInterferenceFunctionStrategy
+class DecouplingApproximationStrategy: public IInterferenceFunctionStrategy
 {
 public:
     DecouplingApproximationStrategy(const std::vector<FormFactorCoherentSum>& weighted_formfactors,

Sample/Interference/SSCApproximationStrategy.h

@@ -25,7 +25,7 @@ class SimulationElement;
 //! in the size-spacing correlation approximation.
 //! @ingroup algorithms_internal
 
-class SSCApproximationStrategy final : public IInterferenceFunctionStrategy
+class SSCApproximationStrategy: public IInterferenceFunctionStrategy
 {
 public:
     SSCApproximationStrategy(const std::vector<FormFactorCoherentSum>& weighted_formfactors,

Sample/Particle/FormFactorCoreShell.h

@@ -25,29 +25,29 @@
 
 //! @ingroup formfactors_internal
 
-class FormFactorCoreShell : public IFormFactor
+class FormFactorCoreShell: public IFormFactor
 {
 public:
     FormFactorCoreShell(IFormFactor* core, IFormFactor* shell);
-    ~FormFactorCoreShell() final;
+    ~FormFactorCoreShell() override;
 
-    FormFactorCoreShell* clone() const final;
+    FormFactorCoreShell* clone() const override;
 
-    void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
+    void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
 
-    double radialExtension() const final;
+    double radialExtension() const override;
 
-    double bottomZ(const IRotation& rotation) const final;
+    double bottomZ(const IRotation& rotation) const override;
 
-    double topZ(const IRotation& rotation) const final;
+    double topZ(const IRotation& rotation) const override;
 
-    void setAmbientMaterial(const Material& material) final;
+    void setAmbientMaterial(const Material& material) override;
 
-    complex_t evaluate(const WavevectorInfo& wavevectors) const final;
+    complex_t evaluate(const WavevectorInfo& wavevectors) const override;
 
 #ifndef SWIG
     //! Calculates and returns a polarized form factor calculation in DWBA
-    Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const final;
+    Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const override;
 #endif
 
 protected: