Merge branch 'master' into issue/1607

modules/base/basemodule.h

@@ -37,7 +37,7 @@ public:
     constexpr static const char* Name = "Base";
 
     BaseModule();
-    virtual ~BaseModule() = default;
+    ~BaseModule() override = default;
 
     std::vector<documentation::Documentation> documentations() const override;
     std::vector<scripting::LuaLibrary> luaLibraries() const override;

modules/base/dashboard/dashboarditemangle.h

@@ -40,7 +40,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemAngle : public DashboardTextItem {
 public:
     DashboardItemAngle(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemAngle() = default;
+    ~DashboardItemAngle() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditemdate.h

@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemDate : public DashboardTextItem {
 public:
     DashboardItemDate(const ghoul::Dictionary& dictionary);
-    ~DashboardItemDate() = default;
+    ~DashboardItemDate() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditemdistance.h

@@ -41,7 +41,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemDistance : public DashboardTextItem {
 public:
     DashboardItemDistance(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemDistance() = default;
+    ~DashboardItemDistance() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditemmission.h

@@ -34,7 +34,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemMission : public DashboardTextItem {
 public:
     DashboardItemMission(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemMission() = default;
+    ~DashboardItemMission() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditemparallelconnection.h

@@ -34,7 +34,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemParallelConnection : public DashboardTextItem {
 public:
     DashboardItemParallelConnection(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemParallelConnection() = default;
+    ~DashboardItemParallelConnection() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditempropertyvalue.h

@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemPropertyValue : public DashboardTextItem {
 public:
     DashboardItemPropertyValue(const ghoul::Dictionary& dictionary);
-    ~DashboardItemPropertyValue() = default;
+    ~DashboardItemPropertyValue() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditemsimulationincrement.h

@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemSimulationIncrement : public DashboardTextItem {
 public:
     DashboardItemSimulationIncrement(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemSimulationIncrement() = default;
+    ~DashboardItemSimulationIncrement() override = default;
 
     void render(glm::vec2& penPosition) override;
     glm::vec2 size() const override;

modules/base/dashboard/dashboarditemspacing.h

@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemSpacing : public DashboardItem {
 public:
     DashboardItemSpacing(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemSpacing() = default;
+    ~DashboardItemSpacing() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditemtext.h

@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemText : public DashboardTextItem {
 public:
     DashboardItemText(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemText() = default;
+    ~DashboardItemText() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/dashboard/dashboarditemvelocity.h

@@ -40,7 +40,7 @@ namespace documentation { struct Documentation; }
 class DashboardItemVelocity : public DashboardTextItem {
 public:
     DashboardItemVelocity(const ghoul::Dictionary& dictionary);
-    virtual ~DashboardItemVelocity() = default;
+    ~DashboardItemVelocity() override = default;
 
     void render(glm::vec2& penPosition) override;
 

modules/base/rendering/grids/renderableradialgrid.h

@@ -44,7 +44,7 @@ namespace openspace {
 class RenderableRadialGrid : public Renderable {
 public:
     RenderableRadialGrid(const ghoul::Dictionary& dictionary);
-    ~RenderableRadialGrid() = default;
+    ~RenderableRadialGrid() override = default;
 
     void initializeGL() override;
     void deinitializeGL() override;

modules/base/rendering/grids/renderablesphericalgrid.h

@@ -41,7 +41,7 @@ namespace openspace {
 class RenderableSphericalGrid : public Renderable {
 public:
     RenderableSphericalGrid(const ghoul::Dictionary& dictionary);
-    ~RenderableSphericalGrid() = default;
+    ~RenderableSphericalGrid() override = default;
 
     void initializeGL() override;
     void deinitializeGL() override;

modules/base/rendering/renderablecartesianaxes.h

@@ -43,7 +43,7 @@ namespace openspace {
 class RenderableCartesianAxes : public Renderable {
 public:
     RenderableCartesianAxes(const ghoul::Dictionary& dictionary);
-    ~RenderableCartesianAxes() = default;
+    ~RenderableCartesianAxes() override = default;
 
     void initializeGL() override;
     void deinitializeGL() override;

modules/base/rendering/renderablemodel.h

@@ -57,7 +57,7 @@ namespace documentation { struct Documentation; }
 class RenderableModel : public Renderable {
 public:
     RenderableModel(const ghoul::Dictionary& dictionary);
-    ~RenderableModel() = default;
+    ~RenderableModel() override = default;
 
     void initialize() override;
     void initializeGL() override;

modules/base/rendering/renderablenodeline.h

@@ -46,7 +46,7 @@ class Translation;
 class RenderableNodeLine : public Renderable {
 public:
     RenderableNodeLine(const ghoul::Dictionary& dictionary);
-    ~RenderableNodeLine() = default;
+    ~RenderableNodeLine() override = default;
 
     static documentation::Documentation Documentation();
 

modules/base/rendering/renderabletrail.h

@@ -91,7 +91,7 @@ struct Appearance : properties::PropertyOwner {
         properties::OptionProperty renderingModes;
     };
 
-    ~RenderableTrail() = default;
+    virtual ~RenderableTrail() override = default;
 
     void initializeGL() override;
     void deinitializeGL() override;

modules/base/rendering/screenspacedashboard.h

@@ -43,7 +43,7 @@ namespace scripting { struct LuaLibrary; }
 class ScreenSpaceDashboard: public ScreenSpaceFramebuffer {
 public:
     ScreenSpaceDashboard(const ghoul::Dictionary& dictionary);
-    ~ScreenSpaceDashboard() = default;
+    virtual ~ScreenSpaceDashboard() override = default;
 
     bool initializeGL() override;
     bool deinitializeGL() override;

modules/base/rendering/screenspaceframebuffer.h

@@ -51,7 +51,7 @@ public:
     using RenderFunction = std::function<void()>;
 
     ScreenSpaceFramebuffer(const ghoul::Dictionary& dictionary = ghoul::Dictionary());
-    ~ScreenSpaceFramebuffer();
+    virtual ~ScreenSpaceFramebuffer() override;
 
     bool initializeGL() override;
     bool deinitializeGL() override;

modules/base/rendering/screenspaceimageonline.h

@@ -39,7 +39,7 @@ namespace documentation { struct Documentation; }
 class ScreenSpaceImageOnline : public ScreenSpaceRenderable {
 public:
     ScreenSpaceImageOnline(const ghoul::Dictionary& dictionary);
-    ~ScreenSpaceImageOnline();
+    virtual ~ScreenSpaceImageOnline() override;
 
     bool deinitializeGL() override;