Merge branch 'master' into feature/getting-started-tour

# Conflicts:
#	modules/skybrowser/skybrowsermodule.cpp

modules/globebrowsing/src/dashboarditemglobelocation.h

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

modules/globebrowsing/src/gdalwrapper.h

@@ -55,7 +55,7 @@ public:
 
 private:
     GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize);
-    ~GdalWrapper() = default;
+    ~GdalWrapper() override = default;
 
     void setGdalProxyConfiguration();
 

modules/globebrowsing/src/globelabelscomponent.h

@@ -50,7 +50,7 @@ namespace globebrowsing { class RenderableGlobe; }
 class GlobeLabelsComponent : public properties::PropertyOwner {
 public:
     GlobeLabelsComponent();
-    ~GlobeLabelsComponent() = default;
+    ~GlobeLabelsComponent() override = default;
 
     void initialize(const ghoul::Dictionary& dictionary,
         globebrowsing::RenderableGlobe* globe);

modules/globebrowsing/src/layeradjustment.h

@@ -39,7 +39,7 @@ namespace openspace::globebrowsing {
 class LayerAdjustment : public properties::PropertyOwner {
 public:
     LayerAdjustment();
-    ~LayerAdjustment() = default;
+    ~LayerAdjustment() override = default;
 
     void setValuesFromDictionary(const ghoul::Dictionary& adjustmentDict);
 

modules/globebrowsing/src/renderableglobe.h

@@ -95,7 +95,7 @@ enum class ShadowCompType {
 class RenderableGlobe : public Renderable {
 public:
     RenderableGlobe(const ghoul::Dictionary& dictionary);
-    ~RenderableGlobe() = default;
+    ~RenderableGlobe() override = default;
 
     void initializeGL() override;
     void deinitialize() override;

modules/globebrowsing/src/tileloadjob.h

@@ -47,7 +47,7 @@ struct TileLoadJob : public Job<RawTile> {
      * Destroys the allocated data pointer if it has been allocated and the TileLoadJob
      * has ownership of it.
      */
-    ~TileLoadJob();
+    ~TileLoadJob() override;
 
     /**
      * If the TileLoadJob has been created using PBO, this is the address that the

modules/globebrowsing/src/tileprovider/temporaltileprovider.h

@@ -65,7 +65,7 @@ private:
 
     struct InterpolateTileProvider : public TileProvider {
         InterpolateTileProvider(const ghoul::Dictionary&);
-        virtual ~InterpolateTileProvider();
+        ~InterpolateTileProvider() override;
 
         Tile tile(const TileIndex& tileIndex) override final;
         Tile::Status tileStatus(const TileIndex& index) override final;

modules/globebrowsing/src/tileprovider/texttileprovider.h

@@ -32,7 +32,7 @@ namespace openspace::globebrowsing {
 class TextTileProvider : public TileProvider {
 public:
     TextTileProvider(TileTextureInitData initData, size_t fontSize = 48);
-    virtual ~TextTileProvider();
+    ~TextTileProvider() override;
 
     void reset() override;
 

modules/globebrowsing/src/tileprovider/tileprovider.h

@@ -80,7 +80,7 @@ struct TileProvider : public properties::PropertyOwner {
     static void deinitializeDefaultTile();
 
     TileProvider();
-    virtual ~TileProvider() = default;
+    ~TileProvider() override = default;
 
     void initialize();
     void deinitialize();