Merge branch 'modernize_use_override_openmw_cs' into 'master'

Using override keyword in OpenMW CS

See merge request OpenMW/openmw!888

apps/opencs/model/world/data.hpp

@@ -152,7 +152,7 @@ namespace CSMWorld
             Data (ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
                 const std::vector<std::string>& archives, const boost::filesystem::path& resDir);
 
-            virtual ~Data();
+            ~Data() override;
 
             const VFS::Manager* getVFS() const;
 

apps/opencs/model/world/idtree.hpp

@@ -42,7 +42,7 @@ namespace CSMWorld
             IdTree (NestedCollection *nestedCollection, CollectionBase *idCollection, unsigned int features = 0);
             ///< The ownerships of \a nestedCollecton and \a idCollection are not transferred.
 
-            virtual ~IdTree();
+            ~IdTree() override;
 
             int rowCount (const QModelIndex & parent = QModelIndex()) const override;
 

apps/opencs/model/world/nestedidcollection.hpp

@@ -30,7 +30,7 @@ namespace CSMWorld
         public:
 
             NestedIdCollection ();
-            ~NestedIdCollection();
+            ~NestedIdCollection() override;
 
             void addNestedRow(int row, int column, int position) override;
 

apps/opencs/model/world/nestedinfocollection.hpp

@@ -22,7 +22,7 @@ namespace CSMWorld
         public:
 
             NestedInfoCollection ();
-            ~NestedInfoCollection();
+            ~NestedInfoCollection() override;
 
             void addNestedRow(int row, int column, int position) override;
 

apps/opencs/model/world/nestedtablewrapper.hpp

@@ -20,7 +20,7 @@ namespace CSMWorld
         NestedTableWrapper(const NestedTable& nestedTable)
             : mNestedTable(nestedTable) {}
 
-        virtual ~NestedTableWrapper() {}
+        ~NestedTableWrapper() override {}
 
         int size() const override
         {

apps/opencs/model/world/refidadapterimp.hpp

@@ -384,7 +384,7 @@ namespace CSMWorld
 
         IngredEffectRefIdAdapter();
 
-        virtual ~IngredEffectRefIdAdapter();
+        ~IngredEffectRefIdAdapter() override;
 
         void addNestedRow (const RefIdColumn *column,
                 RefIdData& data, int index, int position) const override;
@@ -998,7 +998,7 @@ namespace CSMWorld
     public:
 
         NpcMiscRefIdAdapter ();
-        virtual ~NpcMiscRefIdAdapter();
+        ~NpcMiscRefIdAdapter() override;
 
         void addNestedRow (const RefIdColumn *column,
                 RefIdData& data, int index, int position) const override;
@@ -1089,7 +1089,7 @@ namespace CSMWorld
     public:
 
         CreatureMiscRefIdAdapter ();
-        virtual ~CreatureMiscRefIdAdapter();
+        ~CreatureMiscRefIdAdapter() override;
 
         void addNestedRow (const RefIdColumn *column,
                 RefIdData& data, int index, int position) const override;

apps/opencs/model/world/refidcollection.hpp

@@ -58,7 +58,7 @@ namespace CSMWorld
 
             RefIdCollection();
 
-            virtual ~RefIdCollection();
+            ~RefIdCollection() override;
 
             int getSize() const override;
 

apps/opencs/model/world/resourcetable.hpp

@@ -16,7 +16,7 @@ namespace CSMWorld
             /// \note The feature Feature_Constant will be added implicitly.
             ResourceTable (const Resources *resources, unsigned int features = 0);
 
-            virtual ~ResourceTable();
+            ~ResourceTable() override;
 
             int rowCount (const QModelIndex & parent = QModelIndex()) const override;
 

apps/opencs/view/doc/loader.hpp

@@ -75,7 +75,7 @@ namespace CSVDoc
 
             Loader();
 
-            virtual ~Loader();
+            ~Loader() override;
 
         signals:
 

apps/opencs/view/doc/operation.hpp

@@ -28,7 +28,7 @@ namespace CSVDoc
         public:
 
             Operation (int type, QWidget *parent);
-            ~Operation();
+            ~Operation() override;
 
             void setProgress (int current, int max, int threads);
 

apps/opencs/view/doc/sizehint.hpp

@@ -12,7 +12,7 @@ namespace CSVDoc
 
         public:
             SizeHintWidget(QWidget *parent = nullptr);
-            ~SizeHintWidget();
+            ~SizeHintWidget() override;
 
             QSize sizeHint() const override;
             void setSizeHint(const QSize &size);

apps/opencs/view/doc/view.hpp

@@ -110,7 +110,7 @@ namespace CSVDoc
 
             ///< The ownership of \a document is not transferred to *this.
 
-            virtual ~View();
+            ~View() override;
 
             const CSMDoc::Document *getDocument() const;
 

apps/opencs/view/doc/viewmanager.hpp

@@ -52,7 +52,7 @@ namespace CSVDoc
 
             ViewManager (CSMDoc::DocumentManager& documentManager);
 
-            virtual ~ViewManager();
+            ~ViewManager() override;
 
             View *addView (CSMDoc::Document *document);
             ///< The ownership of the returned view is not transferred.

apps/opencs/view/prefs/dialogue.hpp

@@ -30,7 +30,7 @@ namespace CSVPrefs
 
             Dialogue();
 
-            virtual ~Dialogue();
+            ~Dialogue() override;
 
         protected:
 

apps/opencs/view/world/tablebottombox.hpp

@@ -61,7 +61,7 @@ namespace CSVWorld
                             const CSMWorld::UniversalId& id,
                             QWidget *parent = nullptr);
 
-            virtual ~TableBottomBox();
+            ~TableBottomBox() override;
 
             bool eventFilter(QObject *object, QEvent *event) override;