diff --git a/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.h b/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.h
index 1e6f578f4a..4f43b0664d 100644
--- a/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.h
+++ b/ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.h
@@ -47,7 +47,7 @@ private slots:
 
 private:
     RiaPlotWindowRedrawScheduler()  = default;
-    ~RiaPlotWindowRedrawScheduler() = default;
+    ~RiaPlotWindowRedrawScheduler() override = default;
 
     void startTimer( int msecs );
 
diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswBranch.h b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswBranch.h
index 4fd464835f..2b6dba52d5 100644
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswBranch.h
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswBranch.h
@@ -34,7 +34,7 @@ class RicMswBranch : public RicMswItem
 {
 public:
     RicMswBranch( const QString& label, const RimWellPath* wellPath, double initialMD = 0.0, double initialTVD = 0.0 );
-    virtual ~RicMswBranch() = default;
+    ~RicMswBranch() override = default;
 
     void               addSegment( std::unique_ptr<RicMswSegment> segment );
     void               insertAfterSegment( const RicMswSegment* insertAfter, std::unique_ptr<RicMswSegment> segment );
diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswCompletions.h b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswCompletions.h
index 42d44ac51e..d29b759404 100644
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswCompletions.h
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswCompletions.h
@@ -109,7 +109,7 @@ public:
                  double                  startTVD,
                  const RimWellPathValve* wellPathValve );
 
-    virtual ~RicMswValve() {}
+    ~RicMswValve() override {}
 
     const RimWellPathValve* wellPathValve() const;
 
diff --git a/ApplicationLibCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h b/ApplicationLibCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h
index f3b1fbb43d..87516f3f08 100644
--- a/ApplicationLibCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h
+++ b/ApplicationLibCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <map>
 
diff --git a/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.cc b/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.cc
index f5c86647bc..0f71b6b570 100644
--- a/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.cc
+++ b/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.cc
@@ -768,7 +768,7 @@ namespace farmhashte {
 
 uint64_t Hash64(const char *s, size_t len) {
   FARMHASH_DIE_IF_MISCONFIGURED;
-  return s == NULL ? 0 : len;
+  return s == nullptr ? 0 : len;
 }
 
 uint64_t Hash64WithSeed(const char *s, size_t len, uint64_t seed) {
@@ -1000,7 +1000,7 @@ namespace farmhashnt {
 
 uint32_t Hash32(const char *s, size_t len) {
   FARMHASH_DIE_IF_MISCONFIGURED;
-  return s == NULL ? 0 : len;
+  return s == nullptr ? 0 : len;
 }
 
 uint32_t Hash32WithSeed(const char *s, size_t len, uint32_t seed) {
@@ -1139,7 +1139,7 @@ namespace farmhashsu {
 
 uint32_t Hash32(const char *s, size_t len) {
   FARMHASH_DIE_IF_MISCONFIGURED;
-  return s == NULL ? 0 : len;
+  return s == nullptr ? 0 : len;
 }
 
 uint32_t Hash32WithSeed(const char *s, size_t len, uint32_t seed) {
@@ -1359,7 +1359,7 @@ namespace farmhashsa {
 
 uint32_t Hash32(const char *s, size_t len) {
   FARMHASH_DIE_IF_MISCONFIGURED;
-  return s == NULL ? 0 : len;
+  return s == nullptr ? 0 : len;
 }
 
 uint32_t Hash32WithSeed(const char *s, size_t len, uint32_t seed) {
diff --git a/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.h b/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.h
index 2edbce6aec..12d16a958a 100644
--- a/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.h
+++ b/ApplicationLibCode/Commands/HoloLensCommands/farmhash/farmhash.h
@@ -43,10 +43,10 @@
 #ifndef FARM_HASH_H_
 #define FARM_HASH_H_
 
-#include <assert.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h> // for memcpy and memset
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring> // for memcpy and memset
 #include <utility>
 
 #ifndef NAMESPACE_FOR_HASH_FUNCTIONS
diff --git a/ApplicationLibCode/Commands/RicNewMultiPlotFeature.h b/ApplicationLibCode/Commands/RicNewMultiPlotFeature.h
index 7a8109d2a3..e70ad56518 100644
--- a/ApplicationLibCode/Commands/RicNewMultiPlotFeature.h
+++ b/ApplicationLibCode/Commands/RicNewMultiPlotFeature.h
@@ -37,7 +37,7 @@ class RicNewMultiPlotFeature : public caf::CmdFeature, public RicfCommandObject
 public:
     RicNewMultiPlotFeature();
 
-    virtual caf::PdmScriptResponse execute() override;
+    caf::PdmScriptResponse execute() override;
 
 protected:
     // Overrides
diff --git a/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h b/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
index 02b31b6fe2..4563f47a32 100644
--- a/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
+++ b/ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
@@ -61,7 +61,7 @@ class RifOpmCommonEclipseSummary : public RifSummaryReaderInterface
 {
 public:
     RifOpmCommonEclipseSummary();
-    ~RifOpmCommonEclipseSummary();
+    ~RifOpmCommonEclipseSummary() override;
 
     void useLodsmaryFiles( bool enable );
     void createLodsmaryFiles( bool enable );
diff --git a/ApplicationLibCode/FileInterface/RifReaderFmuRft.h b/ApplicationLibCode/FileInterface/RifReaderFmuRft.h
index fe45d3d54a..902725f488 100644
--- a/ApplicationLibCode/FileInterface/RifReaderFmuRft.h
+++ b/ApplicationLibCode/FileInterface/RifReaderFmuRft.h
@@ -63,7 +63,7 @@ public:
 
 public:
     RifReaderFmuRft( const QString& filePath );
-    ~RifReaderFmuRft() = default;
+    ~RifReaderFmuRft() override = default;
 
     static QStringList findSubDirectoriesWithFmuRftData( const QString& filePath );
     static bool        directoryContainsFmuRftData( const QString& filePath );
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.h
index fe8b336354..3d3c2e54b5 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPart.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "RigFemResultPosEnum.h"
 #include "RigFemTypes.h"
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorBarConverted.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorBarConverted.h
index 624d8cc75b..4d6bee98bc 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorBarConverted.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorBarConverted.h
@@ -35,7 +35,7 @@ public:
     RigFemPartResultCalculatorBarConverted( RigFemPartResultsCollection& collection,
                                             const std::string&           fieldName,
                                             const std::string&           fieldNameToConvert );
-    virtual ~RigFemPartResultCalculatorBarConverted();
+    ~RigFemPartResultCalculatorBarConverted() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorCompaction.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorCompaction.h
index 574893f2a8..0de124ecd5 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorCompaction.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorCompaction.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorCompaction : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorCompaction( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorCompaction();
+    ~RigFemPartResultCalculatorCompaction() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorDSM.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorDSM.h
index 3f0553e7cb..ea4e37ffa6 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorDSM.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorDSM.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorDSM : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorDSM( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorDSM();
+    ~RigFemPartResultCalculatorDSM() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorED.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorED.h
index 136f32fd6e..3659ecb72d 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorED.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorED.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorED : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorED( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorED();
+    ~RigFemPartResultCalculatorED() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.h
index 3371409972..3587ec5fd0 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEV.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorEV : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorEV( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorEV();
+    ~RigFemPartResultCalculatorEV() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEnIpPorBar.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEnIpPorBar.h
index 06458a4edc..6e436106f8 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEnIpPorBar.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEnIpPorBar.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorEnIpPorBar : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorEnIpPorBar( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorEnIpPorBar();
+    ~RigFemPartResultCalculatorEnIpPorBar() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFOS.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFOS.h
index a661a8e2a5..8513cca701 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFOS.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFOS.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorFOS : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorFOS( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorFOS();
+    ~RigFemPartResultCalculatorFOS() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFormationIndices.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFormationIndices.h
index d3dc043e67..6267027448 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFormationIndices.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFormationIndices.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorFormationIndices : public RigFemPartResultCalcul
 {
 public:
     explicit RigFemPartResultCalculatorFormationIndices( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorFormationIndices();
+    ~RigFemPartResultCalculatorFormationIndices() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorGamma.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorGamma.h
index 44897507f1..a866966f2b 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorGamma.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorGamma.h
@@ -37,7 +37,7 @@ class RigFemPartResultCalculatorGamma : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorGamma( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorGamma();
+    ~RigFemPartResultCalculatorGamma() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.h
index ac875a0348..e94290d782 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorInitialPorosity : public RigFemPartResultCalcula
 {
 public:
     explicit RigFemPartResultCalculatorInitialPorosity( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorInitialPorosity();
+    ~RigFemPartResultCalculatorInitialPorosity() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorMudWeightWindow.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorMudWeightWindow.h
index 9db8fed7a5..489d244cfd 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorMudWeightWindow.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorMudWeightWindow.h
@@ -37,7 +37,7 @@ class RigFemPartResultCalculatorMudWeightWindow : public RigFemPartResultCalcula
 {
 public:
     explicit RigFemPartResultCalculatorMudWeightWindow( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorMudWeightWindow();
+    ~RigFemPartResultCalculatorMudWeightWindow() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNE.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNE.h
index 9a8266bf5a..cefd1318c8 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNE.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNE.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNE : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorNE( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorNE();
+    ~RigFemPartResultCalculatorNE() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNodalGradients.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNodalGradients.h
index 15755a74c4..8f968e7572 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNodalGradients.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNodalGradients.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNodalGradients : public RigFemPartResultCalculat
 {
 public:
     explicit RigFemPartResultCalculatorNodalGradients( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorNodalGradients();
+    ~RigFemPartResultCalculatorNodalGradients() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalSE.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalSE.h
index 3a380892be..6fdf0b4d17 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalSE.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalSE.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNormalSE : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorNormalSE( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorNormalSE();
+    ~RigFemPartResultCalculatorNormalSE() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalST.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalST.h
index c2d1baca29..1338984dd2 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalST.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalST.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNormalST : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorNormalST( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorNormalST();
+    ~RigFemPartResultCalculatorNormalST() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalized.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalized.h
index 2ceaa2bc50..69ca6652f9 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalized.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalized.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorNormalized : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorNormalized( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorNormalized();
+    ~RigFemPartResultCalculatorNormalized() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.h
index e4d433367e..98bf224825 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPoreCompressibility : public RigFemPartResultCal
 {
 public:
     explicit RigFemPartResultCalculatorPoreCompressibility( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorPoreCompressibility();
+    ~RigFemPartResultCalculatorPoreCompressibility() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPorosityPermeability.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPorosityPermeability.h
index d94741c11b..30b089fb8d 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPorosityPermeability.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPorosityPermeability.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPorosityPermeability : public RigFemPartResultCa
 {
 public:
     explicit RigFemPartResultCalculatorPorosityPermeability( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorPorosityPermeability();
+    ~RigFemPartResultCalculatorPorosityPermeability() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStrain.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStrain.h
index 4d8ad9ef3f..a0febb8e1a 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStrain.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStrain.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPrincipalStrain : public RigFemPartResultCalcula
 {
 public:
     explicit RigFemPartResultCalculatorPrincipalStrain( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorPrincipalStrain();
+    ~RigFemPartResultCalculatorPrincipalStrain() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStress.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStress.h
index abb55a0fa4..be847b841f 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStress.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPrincipalStress.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorPrincipalStress : public RigFemPartResultCalcula
 {
 public:
     explicit RigFemPartResultCalculatorPrincipalStress( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorPrincipalStress();
+    ~RigFemPartResultCalculatorPrincipalStress() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorQ.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorQ.h
index 0b059d88a0..557c0ed19d 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorQ.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorQ.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorQ : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorQ( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorQ();
+    ~RigFemPartResultCalculatorQ() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSFI.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSFI.h
index 936871fc41..fa3ce88fa1 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSFI.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSFI.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSFI : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorSFI( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorSFI();
+    ~RigFemPartResultCalculatorSFI() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSM.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSM.h
index 87e17073ab..bfd7277eb9 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSM.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSM.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSM : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorSM( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorSM();
+    ~RigFemPartResultCalculatorSM() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSE.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSE.h
index 3c718792e2..2fc2f11c98 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSE.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSE.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorShearSE : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorShearSE( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorShearSE();
+    ~RigFemPartResultCalculatorShearSE() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearST.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearST.h
index 25f098e020..83d7b824d2 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearST.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearST.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorShearST : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorShearST( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorShearST();
+    ~RigFemPartResultCalculatorShearST() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSlipIndicator.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSlipIndicator.h
index 8da3fb16f2..4b8d8d8346 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSlipIndicator.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSlipIndicator.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorShearSlipIndicator : public RigFemPartResultCalc
 {
 public:
     explicit RigFemPartResultCalculatorShearSlipIndicator( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorShearSlipIndicator();
+    ~RigFemPartResultCalculatorShearSlipIndicator() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressAnisotropy.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressAnisotropy.h
index ec26b1d838..d6e071099e 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressAnisotropy.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressAnisotropy.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorStressAnisotropy : public RigFemPartResultCalcul
 {
 public:
     explicit RigFemPartResultCalculatorStressAnisotropy( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorStressAnisotropy();
+    ~RigFemPartResultCalculatorStressAnisotropy() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
     RigFemScalarResultFrames* calculateTimeLapse( int partIndex, const RigFemResultAddress& resVarAddr );
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressGradients.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressGradients.h
index 6d0fd9c423..4fe5738962 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressGradients.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressGradients.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorStressGradients : public RigFemPartResultCalcula
 {
 public:
     explicit RigFemPartResultCalculatorStressGradients( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorStressGradients();
+    ~RigFemPartResultCalculatorStressGradients() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAlignedStress.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAlignedStress.h
index 78dd2b79c6..a8e4efc3fe 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAlignedStress.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAlignedStress.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSurfaceAlignedStress : public RigFemPartResultCa
 {
 public:
     explicit RigFemPartResultCalculatorSurfaceAlignedStress( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorSurfaceAlignedStress();
+    ~RigFemPartResultCalculatorSurfaceAlignedStress() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAngles.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAngles.h
index 485e0d7f07..376bccd169 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAngles.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAngles.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorSurfaceAngles : public RigFemPartResultCalculato
 {
 public:
     explicit RigFemPartResultCalculatorSurfaceAngles( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorSurfaceAngles();
+    ~RigFemPartResultCalculatorSurfaceAngles() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 };
diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorTimeLapse.h b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorTimeLapse.h
index 124e24fcdd..5a9da66496 100644
--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorTimeLapse.h
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorTimeLapse.h
@@ -31,7 +31,7 @@ class RigFemPartResultCalculatorTimeLapse : public RigFemPartResultCalculator
 {
 public:
     explicit RigFemPartResultCalculatorTimeLapse( RigFemPartResultsCollection& collection );
-    virtual ~RigFemPartResultCalculatorTimeLapse();
+    ~RigFemPartResultCalculatorTimeLapse() override;
     bool                      isMatching( const RigFemResultAddress& resVarAddr ) const override;
     RigFemScalarResultFrames* calculate( int partIndex, const RigFemResultAddress& resVarAddr ) override;
 
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
index 8c541ac4e0..6b10739e11 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
@@ -71,7 +71,7 @@ protected:
     void                 fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     caf::PdmFieldHandle* userDescriptionField() override;
     caf::PdmFieldHandle* objectToggleField() override;
-    virtual void         defineEditorAttribute( const caf::PdmFieldHandle* field,
+    void         defineEditorAttribute( const caf::PdmFieldHandle* field,
                                                 QString                    uiConfigName,
                                                 caf::PdmUiEditorAttribute* attribute ) override;
 
diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h
index 0581a4a410..77778cf545 100644
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFracture.h
@@ -143,7 +143,7 @@ protected:
     void                          defineEditorAttribute( const caf::PdmFieldHandle* field,
                                                          QString                    uiConfigName,
                                                          caf::PdmUiEditorAttribute* attribute ) override;
-    void                          initAfterRead();
+    void                          initAfterRead() override;
 
 private:
     cvf::Vec3d fracturePositionForUi() const;
diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
index e1e9c45bff..11509e415c 100644
--- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
@@ -59,7 +59,7 @@ class RimGridCrossPlot : public RimPlot, public RimNameConfigHolderInterface
 
 public:
     RimGridCrossPlot();
-    ~RimGridCrossPlot();
+    ~RimGridCrossPlot() override;
 
     QString description() const override;
 
diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.h b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.h
index 989cd1a6fa..8c2a877ca1 100644
--- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.h
+++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.h
@@ -95,7 +95,7 @@ public:
 
 public:
     RimGridCrossPlotDataSet();
-    ~RimGridCrossPlotDataSet();
+    ~RimGridCrossPlotDataSet() override;
 
     void    setCellFilterView( RimGridView* cellFilterView );
     void    loadDataAndUpdate( bool updateParentPlot );
diff --git a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.h b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.h
index 7cbe573bc2..839111a482 100644
--- a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.h
+++ b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionView.h
@@ -99,7 +99,7 @@ protected:
 
     bool hasResults();
 
-    virtual size_t onTimeStepCountRequested() override;
+    size_t onTimeStepCountRequested() override;
 
 private:
     QString createAutoName() const override;
diff --git a/ApplicationLibCode/ProjectDataModel/RimBoxIntersection.h b/ApplicationLibCode/ProjectDataModel/RimBoxIntersection.h
index 5bc038de28..810494f4ca 100644
--- a/ApplicationLibCode/ProjectDataModel/RimBoxIntersection.h
+++ b/ApplicationLibCode/ProjectDataModel/RimBoxIntersection.h
@@ -79,7 +79,7 @@ public:
     void setToDefaultSizeSlice( SinglePlaneState plane, const cvf::Vec3d& position );
 
 protected:
-    caf::PdmFieldHandle* userDescriptionField() override final;
+    caf::PdmFieldHandle* userDescriptionField() final;
 
     void defineEditorAttribute( const caf::PdmFieldHandle* field,
                                 QString                    uiConfigName,
diff --git a/ApplicationLibCode/ProjectDataModel/RimExtrudedCurveIntersection.h b/ApplicationLibCode/ProjectDataModel/RimExtrudedCurveIntersection.h
index 85b448f412..273f62c841 100644
--- a/ApplicationLibCode/ProjectDataModel/RimExtrudedCurveIntersection.h
+++ b/ApplicationLibCode/ProjectDataModel/RimExtrudedCurveIntersection.h
@@ -109,7 +109,7 @@ public:
     void rebuildGeometryAndScheduleCreateDisplayModel();
 
 protected:
-    caf::PdmFieldHandle*          userDescriptionField() override final;
+    caf::PdmFieldHandle*          userDescriptionField() final;
     void                          fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     void                          defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
     void                          defineEditorAttribute( const caf::PdmFieldHandle* field,
diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNames.h b/ApplicationLibCode/ProjectDataModel/RimFormationNames.h
index aacff86f31..4b436680a0 100644
--- a/ApplicationLibCode/ProjectDataModel/RimFormationNames.h
+++ b/ApplicationLibCode/ProjectDataModel/RimFormationNames.h
@@ -51,7 +51,7 @@ public:
 protected:
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
 
-    virtual void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
+    void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
 
 private:
     void updateUiTreeName();
diff --git a/ApplicationLibCode/ProjectDataModel/RimIntersection.h b/ApplicationLibCode/ProjectDataModel/RimIntersection.h
index 0eb9fefe8a..f2c454face 100644
--- a/ApplicationLibCode/ProjectDataModel/RimIntersection.h
+++ b/ApplicationLibCode/ProjectDataModel/RimIntersection.h
@@ -48,7 +48,7 @@ public:
 protected:
     virtual RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection();
 
-    caf::PdmFieldHandle*          objectToggleField() override final;
+    caf::PdmFieldHandle*          objectToggleField() final;
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                          bool*                      useOptionsOnly ) override;
 
diff --git a/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.h b/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.h
index a7163f0ea4..706c3a9ce6 100644
--- a/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.h
+++ b/ApplicationLibCode/ProjectDataModel/RimIntersectionResultDefinition.h
@@ -61,18 +61,18 @@ public:
     void update2dIntersectionViews();
 
 protected:
-    virtual caf::PdmFieldHandle* userDescriptionField() override;
-    virtual caf::PdmFieldHandle* objectToggleField() override;
+    caf::PdmFieldHandle* userDescriptionField() override;
+    caf::PdmFieldHandle* objectToggleField() override;
 
-    virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
+    void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
                                    const QVariant&            oldValue,
                                    const QVariant&            newValue ) override;
 
-    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
+    QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                                  bool*                      useOptionsOnly ) override;
-    virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
-    virtual void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
-    virtual void initAfterRead() override;
+    void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
+    void initAfterRead() override;
 
 private:
     void assignCaseIfMissing() const;
diff --git a/ApplicationLibCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.h b/ApplicationLibCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.h
index b2e08bc80e..6b2b0fab72 100644
--- a/ApplicationLibCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.h
@@ -43,7 +43,7 @@ public:
 protected:
     caf::PdmFieldHandle* objectToggleField() override;
     void                 fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
-    virtual void         initAfterRead() override;
+    void         initAfterRead() override;
 
 private:
     caf::PdmField<bool>                                       m_isActive;
diff --git a/ApplicationLibCode/ProjectDataModel/RimLegendConfig.h b/ApplicationLibCode/ProjectDataModel/RimLegendConfig.h
index 0e395a293d..bef4c7a0a0 100644
--- a/ApplicationLibCode/ProjectDataModel/RimLegendConfig.h
+++ b/ApplicationLibCode/ProjectDataModel/RimLegendConfig.h
@@ -51,7 +51,7 @@ public:
     virtual const caf::TitledOverlayFrame* titledOverlayFrame() const = 0;
     virtual caf::TitledOverlayFrame*       titledOverlayFrame()       = 0;
 
-    virtual int fontSize() const override;
+    int fontSize() const override;
 
     void recreateLegend();
 
diff --git a/ApplicationLibCode/ProjectDataModel/RimPlot.h b/ApplicationLibCode/ProjectDataModel/RimPlot.h
index 5ea967fd9a..d792ffe481 100644
--- a/ApplicationLibCode/ProjectDataModel/RimPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/RimPlot.h
@@ -62,7 +62,7 @@ public:
 
 public:
     RimPlot();
-    virtual ~RimPlot();
+    ~RimPlot() override;
 
     QWidget*     createPlotWidget( QWidget* parent = nullptr );
     RowOrColSpan rowSpan() const;
@@ -110,7 +110,7 @@ protected:
     void updateFonts() override;
 
 private:
-    virtual void              doRenderWindowContent( QPaintDevice* paintDevice ) override;
+    void              doRenderWindowContent( QPaintDevice* paintDevice ) override;
     virtual void              handleKeyPressEvent( QKeyEvent* event ) {}
     virtual void              handleWheelEvent( QWheelEvent* event ) {}
     virtual RiuQwtPlotWidget* doCreatePlotViewWidget( QWidget* parent ) = 0;
diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.h b/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.h
index 057df47d73..042ea06842 100644
--- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.h
+++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisAnnotation.h
@@ -56,7 +56,7 @@ public:
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
 
 protected:
-    virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
 
 protected:
     caf::PdmField<bool>    m_isActive;
diff --git a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h
index fdfe2c6f6e..61334f224f 100644
--- a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h
@@ -36,7 +36,7 @@ public:
     ~RimVfpPlotCollection() override;
 
     void                     addPlot( RimVfpPlot* newPlot );
-    std::vector<RimVfpPlot*> plots() const;
+    std::vector<RimVfpPlot*> plots() const override;
     void                     deleteAllChildObjects();
 
     size_t plotCount() const final;
diff --git a/ApplicationLibCode/ProjectDataModel/RimViewLinker.h b/ApplicationLibCode/ProjectDataModel/RimViewLinker.h
index 11d5aaa5a3..bd03e069c5 100644
--- a/ApplicationLibCode/ProjectDataModel/RimViewLinker.h
+++ b/ApplicationLibCode/ProjectDataModel/RimViewLinker.h
@@ -103,7 +103,7 @@ protected:
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                          bool*                      useOptionsOnly ) override;
 
-    virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
 
 private:
     static QString displayNameForView( RimGridView* view );
diff --git a/ApplicationLibCode/ProjectDataModel/RimWbsParameters.h b/ApplicationLibCode/ProjectDataModel/RimWbsParameters.h
index 126e881feb..08e2e612a0 100644
--- a/ApplicationLibCode/ProjectDataModel/RimWbsParameters.h
+++ b/ApplicationLibCode/ProjectDataModel/RimWbsParameters.h
@@ -58,7 +58,7 @@ public:
 
     caf::PdmField<ParameterSourceEnum>* sourceField( const RigWbsParameter& parameter ) const;
 
-    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
+    QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                                  bool*                      useOptionsOnly ) override;
 
     void loadDataAndUpdate();
diff --git a/ApplicationLibCode/ProjectDataModel/RimWellPathGeometryDef.h b/ApplicationLibCode/ProjectDataModel/RimWellPathGeometryDef.h
index b8fa798d94..6cdb415696 100644
--- a/ApplicationLibCode/ProjectDataModel/RimWellPathGeometryDef.h
+++ b/ApplicationLibCode/ProjectDataModel/RimWellPathGeometryDef.h
@@ -95,7 +95,7 @@ protected:
                                 QString                    uiConfigName,
                                 caf::PdmUiEditorAttribute* attribute ) override;
 
-    virtual void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
+    void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
 
     void onTargetMoved( const caf::SignalEmitter* emitter, bool fullUpdate );
 
diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.h
index 7b8614c9cb..75a29ff728 100644
--- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.h
+++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimFaciesProperties.h
@@ -62,7 +62,7 @@ protected:
     void                          defineEditorAttribute( const caf::PdmFieldHandle* field,
                                                          QString                    uiConfigName,
                                                          caf::PdmUiEditorAttribute* attribute ) override;
-    void                          defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
+    void                          defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                          bool*                      useOptionsOnly ) override;
     void                          fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlot.h
index 1697bd824e..480aaf0f39 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlot.h
@@ -31,5 +31,5 @@ class RimSummaryCrossPlot : public RimSummaryPlot
 public:
     RimSummaryCrossPlot();
 
-    virtual RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const override;
+    RimSummaryPlotSourceStepping* sourceSteppingObjectForKeyEventHandling() const override;
 };
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h
index f7c828f06c..805ecfab4a 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h
@@ -59,14 +59,14 @@ public:
     void updateLegendRangesTextAndVisibility( RiuViewer* nativeOrOverrideViewer, bool isUsingOverrideViewer );
 
 protected:
-    virtual void initAfterRead() override;
+    void initAfterRead() override;
 
 private:
-    virtual RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection() override;
+    RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection() override;
 
     caf::PdmFieldHandle* userDescriptionField() override;
     void                 fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
-    virtual void         defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    void         defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
 
     caf::PdmProxyValueField<QString> m_name;
     caf::PdmPtrField<RimSurface*>    m_surface;
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h
index 72d61edfd1..950810d4b3 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h
@@ -65,7 +65,7 @@ public:
     std::vector<RimRegularLegendConfig*> legendConfigs();
 
 protected:
-    virtual void         initAfterRead() override;
+    void         initAfterRead() override;
     caf::PdmFieldHandle* userDescriptionField() override;
 
 private:
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.h
index 0e350aa87c..0dbaff678e 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.h
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.h
@@ -51,8 +51,8 @@ public:
 
 private:
     void         fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
-    virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
-    virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
+    void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                                  bool*                      useOptionsOnly ) override;
 
     RigSurface* surfaceData();
diff --git a/ApplicationLibCode/ReservoirDataModel/RigWellPath.h b/ApplicationLibCode/ReservoirDataModel/RigWellPath.h
index 3954207b9d..86d7df76d1 100644
--- a/ApplicationLibCode/ReservoirDataModel/RigWellPath.h
+++ b/ApplicationLibCode/ReservoirDataModel/RigWellPath.h
@@ -43,7 +43,7 @@ public:
     RigWellPath( const std::vector<cvf::Vec3d>& wellPathPoints, const std::vector<double>& measuredDepths );
     RigWellPath( const RigWellPath& rhs );
     RigWellPath& operator=( const RigWellPath& rhs );
-    ~RigWellPath();
+    ~RigWellPath() override;
 
     const std::vector<cvf::Vec3d>& wellPathPoints() const;
     const std::vector<double>&     measuredDepths() const;
diff --git a/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.h b/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.h
index abad43b7e1..6456440b92 100644
--- a/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.h
+++ b/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.h
@@ -28,7 +28,7 @@ class RiuAbstractOverlayContentFrame : public QFrame
     Q_OBJECT
 public:
     RiuAbstractOverlayContentFrame( QWidget* parent = nullptr );
-    ~RiuAbstractOverlayContentFrame();
+    ~RiuAbstractOverlayContentFrame() override;
 
     virtual void renderTo( QPainter* painter, const QRect& targetRect ) = 0;
 };
diff --git a/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.h b/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.h
index 0e0dee4b1f..ab697b0f02 100644
--- a/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.h
+++ b/ApplicationLibCode/UserInterface/RiuCategoryLegendFrame.h
@@ -37,7 +37,7 @@ class RiuCategoryLegendFrame : public RiuAbstractLegendFrame
 
 public:
     RiuCategoryLegendFrame( QWidget* parent, const QString& title, caf::CategoryMapper* categoryMapper );
-    ~RiuCategoryLegendFrame();
+    ~RiuCategoryLegendFrame() override;
 
 private:
     void    layoutInfo( LayoutInfo* layout ) const override;
diff --git a/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.h b/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.h
index 3b0ca8825d..5acd93ffb8 100644
--- a/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.h
+++ b/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.h
@@ -52,7 +52,7 @@ class RiuGridCrossQwtPlot : public RiuQwtPlotWidget
 
 public:
     RiuGridCrossQwtPlot( RimGridCrossPlot* crossPlot, QWidget* parent = nullptr );
-    ~RiuGridCrossQwtPlot();
+    ~RiuGridCrossQwtPlot() override;
 
     RiuGridCrossQwtPlot( const RiuGridCrossQwtPlot& ) = delete;
 
diff --git a/ApplicationLibCode/UserInterface/RiuMainWindow.h b/ApplicationLibCode/UserInterface/RiuMainWindow.h
index 734e21fd09..ca3ec7a1e7 100644
--- a/ApplicationLibCode/UserInterface/RiuMainWindow.h
+++ b/ApplicationLibCode/UserInterface/RiuMainWindow.h
@@ -79,7 +79,7 @@ class RiuMainWindow : public RiuMainWindowBase
 
 public:
     RiuMainWindow();
-    ~RiuMainWindow();
+    ~RiuMainWindow() override;
 
     static RiuMainWindow* instance();
 
diff --git a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h
index 8c8992f13f..fc643efa22 100644
--- a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h
+++ b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h
@@ -108,7 +108,7 @@ protected:
 
     std::pair<int, int> rowAndColumnCount( int plotWidgetCount ) const;
 
-    virtual void onSelectionManagerSelectionChanged( const std::set<int>& changedSelectionLevels ) override;
+    void onSelectionManagerSelectionChanged( const std::set<int>& changedSelectionLevels ) override;
 
     virtual bool showYAxis( int row, int column ) const;
 
diff --git a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
index 3175df6579..8d33de1fcf 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
+++ b/ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
@@ -57,7 +57,7 @@ class RiuPlotMainWindow : public RiuMainWindowBase
 
 public:
     RiuPlotMainWindow();
-    ~RiuPlotMainWindow();
+    ~RiuPlotMainWindow() override;
 
     QString mainWindowName() override;
 
diff --git a/ApplicationLibCode/UserInterface/RiuQssSyntaxHighlighter.h b/ApplicationLibCode/UserInterface/RiuQssSyntaxHighlighter.h
index 0dda2fa017..13aa6e9e18 100644
--- a/ApplicationLibCode/UserInterface/RiuQssSyntaxHighlighter.h
+++ b/ApplicationLibCode/UserInterface/RiuQssSyntaxHighlighter.h
@@ -27,5 +27,5 @@ public:
     QssSyntaxHighligter( QTextDocument* parent );
 
 protected:
-    virtual void highlightBlock( const QString& text );
+    void highlightBlock( const QString& text ) override;
 };
diff --git a/ApplicationLibCode/UserInterface/RiuQtChartView.h b/ApplicationLibCode/UserInterface/RiuQtChartView.h
index f1be91de00..34a1dc5f54 100644
--- a/ApplicationLibCode/UserInterface/RiuQtChartView.h
+++ b/ApplicationLibCode/UserInterface/RiuQtChartView.h
@@ -33,7 +33,7 @@ class RiuQtChartView : public QtCharts::QChartView, public RiuInterfaceToViewWin
 {
 public:
     RiuQtChartView( RimPlotWindow* plotWindow, QWidget* parent = nullptr );
-    virtual ~RiuQtChartView();
+    ~RiuQtChartView() override;
 
     RimViewWindow* ownerViewWindow() const override;
 
diff --git a/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h b/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h
index a4b8c05963..b52b0a1bde 100644
--- a/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h
+++ b/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h
@@ -41,7 +41,7 @@ public:
 
 public:
     RiuScalarMapperLegendFrame( QWidget* parent, const QString& title, cvf::ScalarMapper* scalarMapper );
-    ~RiuScalarMapperLegendFrame();
+    ~RiuScalarMapperLegendFrame() override;
 
     void setTickPrecision( int precision );
     void setTickFormat( NumberFormat format );
diff --git a/ApplicationLibCode/UserInterface/RiuTextEditWithCompletion.h b/ApplicationLibCode/UserInterface/RiuTextEditWithCompletion.h
index c90da46677..fdda83b874 100644
--- a/ApplicationLibCode/UserInterface/RiuTextEditWithCompletion.h
+++ b/ApplicationLibCode/UserInterface/RiuTextEditWithCompletion.h
@@ -26,7 +26,7 @@ class TextEditWithCompletion : public QTextEdit
     Q_OBJECT
 public:
     TextEditWithCompletion( QWidget* parent = nullptr );
-    ~TextEditWithCompletion();
+    ~TextEditWithCompletion() override;
 
     void        setCompleter( QCompleter* completer );
     QCompleter* completer();