clang-tidy : Remove redundant 'virtual' and add 'override'

2025-02-25 18:55:39 -06:00 · 2018-10-18 19:45:57 +02:00
parent c8285602b1
commit 6346ed012c
599 changed files with 2056 additions and 2056 deletions
--- a/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h
@@ -63,7 +63,7 @@ public:
    bool useCell(size_t cellIndex) const override;
    void cellCornerVertices(size_t cellIndex, cvf::Vec3d cellCorners[8]) const override;
    void cellCornerIndices(size_t cellIndex, size_t cornerIndices[8]) const override;
-    virtual const RigFault* findFaultFromCellIndexAndCellFace(size_t reservoirCellIndex, 
+    const RigFault* findFaultFromCellIndexAndCellFace(size_t reservoirCellIndex, 
                                                              cvf::StructGridInterface::FaceType face) const override;

 private:
@@ -86,7 +86,7 @@ public:
    bool useCell(size_t cellIndex) const override;
    void cellCornerVertices(size_t cellIndex, cvf::Vec3d cellCorners[8]) const override;
    void cellCornerIndices(size_t cellIndex, size_t cornerIndices[8]) const override;
-    virtual const RigFault* findFaultFromCellIndexAndCellFace(size_t reservoirCellIndex, 
+    const RigFault* findFaultFromCellIndexAndCellFace(size_t reservoirCellIndex, 
                                                              cvf::StructGridInterface::FaceType face) const override;

 private:
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h
@@ -44,7 +44,7 @@ public:
    RivIntersectionBoxGeometryGenerator(RimIntersectionBox* intersectionBox,
                                        const RivIntersectionHexGridInterface* grid);

-    ~RivIntersectionBoxGeometryGenerator();
+    ~RivIntersectionBoxGeometryGenerator() override;

    bool                                             isAnyGeometryPresent() const;
                                                     
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h
@@ -55,7 +55,7 @@ public:
                                     bool isFlattened,
                                     const cvf::Vec3d& flattenedPolylineStartPoint);

-    ~RivIntersectionGeometryGenerator();
+    ~RivIntersectionGeometryGenerator() override;

    bool                        isAnyGeometryPresent() const;
 
--- a/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.h
@@ -113,11 +113,11 @@ public:
    void                            disableLighting(bool disable)           { m_disableLighting = disable; }

 protected:
-    virtual bool                    isEqual( const EffectGenerator* other ) const;
-    virtual EffectGenerator*        copy() const;
+    bool                    isEqual( const EffectGenerator* other ) const override;
+    EffectGenerator*        copy() const override;

-    virtual void                    updateForShaderBasedRendering(cvf::Effect* effect) const;
-    virtual void                    updateForFixedFunctionRendering(cvf::Effect* effect) const;
+    void                    updateForShaderBasedRendering(cvf::Effect* effect) const override;
+    void                    updateForFixedFunctionRendering(cvf::Effect* effect) const override;

 private:
    cvf::cref<cvf::ScalarMapper>        m_edgeScalarMapper;
--- a/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h
@@ -44,7 +44,7 @@ class RivFaultGeometryGenerator : public cvf::Object
 {
 public:
    RivFaultGeometryGenerator(const cvf::StructGridInterface* grid, const RigFault* fault, bool computeNativeFaultFaces);
-    ~RivFaultGeometryGenerator();
+    ~RivFaultGeometryGenerator() override;

    void setCellVisibility(const cvf::UByteArray* cellVisibilities );
    
--- a/ApplicationCode/ModelVisualization/RivFishbonesSubsPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivFishbonesSubsPartMgr.h
@@ -51,7 +51,7 @@ class RivFishbonesSubsPartMgr : public cvf::Object
 {
 public:
    RivFishbonesSubsPartMgr(RimFishbonesMultipleSubs* subs);
-    ~RivFishbonesSubsPartMgr();
+    ~RivFishbonesSubsPartMgr() override;

    void        appendGeometryPartsToModel(cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform, double characteristicCellSize);
    void        clearGeometryCache();
--- a/ApplicationCode/ModelVisualization/RivGridPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.h
@@ -59,7 +59,7 @@ class RivGridPartMgr: public cvf::Object
 {
 public:
    RivGridPartMgr(RivCellSetEnum cellSetType, RimEclipseCase* eclipseCase, const RigGridBase* grid, size_t gridIdx);
-    ~RivGridPartMgr();
+    ~RivGridPartMgr() override;
    
    void setTransform(cvf::Transform* scaleTransform);
    void setCellVisibility(cvf::UByteArray* cellVisibilities );
--- a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h
@@ -43,7 +43,7 @@ class RivNNCGeometryGenerator : public cvf::Object
 {
 public:
    RivNNCGeometryGenerator(const RigNNCData* nncData, const cvf::Vec3d& offset, const cvf::Array<size_t>* nncIndexes );
-    ~RivNNCGeometryGenerator();
+    ~RivNNCGeometryGenerator() override;

    void setCellVisibility( const cvf::UByteArray* cellVisibilities, const RigGridBase * grid);
    
--- a/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
@@ -39,7 +39,7 @@ class RivPipeGeometryGenerator : public cvf::Object
 {
 public:
    RivPipeGeometryGenerator();
-    ~RivPipeGeometryGenerator();
+    ~RivPipeGeometryGenerator() override;

    // Coordinates and orientations
    void setPipeCenterCoords(const cvf::Vec3dArray* coords);
--- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
@@ -45,7 +45,7 @@ class RivReservoirFaultsPartMgr : public cvf::Object
 {
 public:
    RivReservoirFaultsPartMgr(const RigMainGrid* grid, RimEclipseView* reservoirView);
-    ~RivReservoirFaultsPartMgr();
+    ~RivReservoirFaultsPartMgr() override;

    void setTransform(cvf::Transform* scaleTransform);
    void setCellVisibility(cvf::UByteArray* cellVisibilities);
--- a/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h
@@ -43,7 +43,7 @@ class RivReservoirSimWellsPartMgr : public cvf::Object
 {
 public:
    explicit RivReservoirSimWellsPartMgr(RimEclipseView* reservoirView);
-    ~RivReservoirSimWellsPartMgr();
+    ~RivReservoirSimWellsPartMgr() override;

    void clearGeometryCache();
    void scheduleGeometryRegen();
--- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
@@ -50,7 +50,7 @@ class RivSimWellPipesPartMgr : public cvf::Object
 public:
    RivSimWellPipesPartMgr(RimSimWellInView* well);

-    ~RivSimWellPipesPartMgr();
+    ~RivSimWellPipesPartMgr() override;

    void       appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, 
                                                 size_t frameIndex, 
--- a/ApplicationCode/ModelVisualization/RivTensorResultPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivTensorResultPartMgr.h
@@ -49,7 +49,7 @@ class RivTensorResultPartMgr : public cvf::Object
 {
 public:
    RivTensorResultPartMgr(RimGeoMechView* reservoirView);
-    ~RivTensorResultPartMgr();
+    ~RivTensorResultPartMgr() override;

    void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex) const;

--- a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h
+++ b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h
@@ -40,7 +40,7 @@ class RivTernarySaturationOverlayItem : public caf::TitledOverlayFrame
 {
 public:
    explicit RivTernarySaturationOverlayItem(cvf::Font* font);
-    ~RivTernarySaturationOverlayItem();
+    ~RivTernarySaturationOverlayItem() override;

    void setRangeText(const cvf::String& soilRange, const cvf::String& sgasRange, const cvf::String& swatRange);

--- a/ApplicationCode/ModelVisualization/RivTernaryScalarMapperEffectGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivTernaryScalarMapperEffectGenerator.h
@@ -49,11 +49,11 @@ public:
    static bool                     isImagesEqual(const cvf::TextureImage* texImg1, const cvf::TextureImage* texImg2);

 protected:
-    virtual bool                    isEqual(const caf::EffectGenerator* other) const;
-    virtual caf::EffectGenerator*    copy() const;
+    bool                    isEqual(const caf::EffectGenerator* other) const override;
+    caf::EffectGenerator*    copy() const override;

-    virtual void                    updateForShaderBasedRendering(cvf::Effect* effect) const;
-    virtual void                    updateForFixedFunctionRendering(cvf::Effect* effect) const;
+    void                    updateForShaderBasedRendering(cvf::Effect* effect) const override;
+    void                    updateForFixedFunctionRendering(cvf::Effect* effect) const override;

 private:
    void                            updateCommonEffect(cvf::Effect* effect) const;
--- a/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.h
@@ -58,7 +58,7 @@ class RivWellConnectionFactorGeometryGenerator : public cvf::Object
 {
 public:
    RivWellConnectionFactorGeometryGenerator(std::vector<CompletionVizData>& completionVizData, float radius);
-    ~RivWellConnectionFactorGeometryGenerator();
+    ~RivWellConnectionFactorGeometryGenerator() override;

    cvf::ref<cvf::Part> createSurfacePart(const cvf::ScalarMapper* scalarMapper, bool disableLighting);

--- a/ApplicationCode/ModelVisualization/RivWellConnectionFactorPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellConnectionFactorPartMgr.h
@@ -41,7 +41,7 @@ class RivWellConnectionFactorPartMgr : public cvf::Object
 {
 public:
    RivWellConnectionFactorPartMgr(RimWellPath* well, RimVirtualPerforationResults* virtualPerforationResult);
-    ~RivWellConnectionFactorPartMgr();
+    ~RivWellConnectionFactorPartMgr() override;

    void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);

--- a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h
@@ -47,7 +47,7 @@ class RivWellConnectionsPartMgr : public cvf::Object
 {
 public:
    RivWellConnectionsPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well);
-    ~RivWellConnectionsPartMgr();
+    ~RivWellConnectionsPartMgr() override;

    void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);

--- a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h
@@ -56,7 +56,7 @@ class RivWellFracturePartMgr : public cvf::Object
 {
 public:
    RivWellFracturePartMgr(RimFracture* well);
-    ~RivWellFracturePartMgr();
+    ~RivWellFracturePartMgr() override;

    void                                appendGeometryPartsToModel(cvf::ModelBasicList* model, const RimEclipseView& eclView);

--- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h
@@ -43,7 +43,7 @@ class RivWellHeadPartMgr : public cvf::Object
 {
 public:
    RivWellHeadPartMgr( RimSimWellInView* well);
-    ~RivWellHeadPartMgr();
+    ~RivWellHeadPartMgr() override;

    void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, 
                                           size_t frameIndex, 
--- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
@@ -58,7 +58,7 @@ class RivWellPathPartMgr : public cvf::Object
 {
 public:
    explicit RivWellPathPartMgr(RimWellPath* wellPath, Rim3dView* view);
-    ~RivWellPathPartMgr();
+    ~RivWellPathPartMgr() override;

    void appendStaticGeometryPartsToModel(cvf::ModelBasicList*              model,
                                          const caf::DisplayCoordTransform* displayCoordTransform,
--- a/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h
+++ b/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h
@@ -35,7 +35,7 @@ class RivWellPathSourceInfo : public cvf::Object
 {
 public:
    explicit RivWellPathSourceInfo(RimWellPath* wellPath, RivPipeGeometryGenerator* pipeGeomGenerator);
-    ~RivWellPathSourceInfo();
+    ~RivWellPathSourceInfo() override;

    RimWellPath* wellPath() const;

--- a/ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h
@@ -51,7 +51,7 @@ class RivWellPathsPartMgr : public cvf::Object
 {
 public:
    explicit RivWellPathsPartMgr(Rim3dView* view);
-    ~RivWellPathsPartMgr();
+    ~RivWellPathsPartMgr() override;

    void appendStaticGeometryPartsToModel(cvf::ModelBasicList*              model,
                                          const caf::DisplayCoordTransform* displayCoordTransform,
--- a/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h
@@ -50,7 +50,7 @@ class RivWellSpheresPartMgr : public cvf::Object
 {
 public:
    RivWellSpheresPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well);
-    ~RivWellSpheresPartMgr();
+    ~RivWellSpheresPartMgr() override;

    void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
    
--- a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h
+++ b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h
@@ -83,7 +83,7 @@ class RivWindowEdgeAxesOverlayItem : public cvf::OverlayItem
    using Camera = cvf::Camera;
 public:
    RivWindowEdgeAxesOverlayItem(Font* font);
-    virtual ~RivWindowEdgeAxesOverlayItem();
+    ~RivWindowEdgeAxesOverlayItem() override;

    void            setDisplayCoordTransform(const caf::DisplayCoordTransform* displayCoordTransform);
    void            updateFromCamera(const Camera* camera);