From 82644cd319e46e35a7b4e3b4a61fac2465a2ea66 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 2 Jun 2014 22:15:12 +0300
Subject: Add missing final/notfinal to classes.

---
 src/resources/cursor.h            |  2 +-
 src/resources/db/itemdb.cpp       |  2 +-
 src/resources/dyecolor.h          |  2 +-
 src/resources/imagehelper.h       |  2 +-
 src/resources/map/map.h           |  2 +-
 src/resources/map/properties.h    |  2 +-
 src/resources/resource.h          |  2 +-
 src/resources/resourcemanager.cpp | 18 +++++++++---------
 8 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/cursor.h b/src/resources/cursor.h
index 021fbf048..e4bfdc025 100644
--- a/src/resources/cursor.h
+++ b/src/resources/cursor.h
@@ -50,7 +50,7 @@ namespace Cursor
         CURSOR_TOTAL
     };
 
-    struct StrToCursor
+    struct StrToCursor final
     {
         std::string str;
         Cursor cursor;
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index eeac1c73f..c41fc07a5 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -71,7 +71,7 @@ static int parseDirectionName(const std::string &name);
 
 namespace
 {
-    struct FieldType
+    struct FieldType final
     {
 #ifdef ADVGCC
         FieldType(const char *const name0,
diff --git a/src/resources/dyecolor.h b/src/resources/dyecolor.h
index 75037468d..b6e79edf8 100644
--- a/src/resources/dyecolor.h
+++ b/src/resources/dyecolor.h
@@ -25,7 +25,7 @@
 
 #include "localconsts.h"
 
-struct DyeColor
+struct DyeColor final
 {
     DyeColor()
     {
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index f87c17ef2..b91d9aaee 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -37,7 +37,7 @@ class Image;
 /**
  * Defines a class for loading and storing images.
  */
-class ImageHelper
+class ImageHelper notfinal
 {
     friend class CompoundSprite;
     friend class Image;
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 82783e4bc..e8be23ca4 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -393,7 +393,7 @@ class Map final : public Properties, public ConfigListener
         float mLastAScrollY;
 
         // Particle effect data
-        struct ParticleEffectData
+        struct ParticleEffectData final
         {
             ParticleEffectData() :
                 file(),
diff --git a/src/resources/map/properties.h b/src/resources/map/properties.h
index 7d3ff6ebf..3593aa218 100644
--- a/src/resources/map/properties.h
+++ b/src/resources/map/properties.h
@@ -32,7 +32,7 @@
 /**
  * A class holding a set of properties.
  */
-class Properties
+class Properties notfinal
 {
     public:
         Properties() :
diff --git a/src/resources/resource.h b/src/resources/resource.h
index bc3d54f51..b82eb802e 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -33,7 +33,7 @@
 /**
  * A generic reference counted resource object.
  */
-class Resource
+class Resource notfinal
 {
     friend class ResourceManager;
 
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index ea4698862..bf7b09897 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -498,7 +498,7 @@ Resource *ResourceManager::get(const std::string &idPath, const generator fun,
     return resource;
 }
 
-struct ResourceLoader
+struct ResourceLoader final
 {
     ResourceManager *manager;
     std::string path;
@@ -534,7 +534,7 @@ SoundEffect *ResourceManager::getSoundEffect(const std::string &idPath)
     return static_cast<SoundEffect*>(load(idPath, &SoundEffect::load));
 }
 
-struct DyedImageLoader
+struct DyedImageLoader final
 {
     ResourceManager *manager;
     std::string path;
@@ -575,7 +575,7 @@ Image *ResourceManager::getImage(const std::string &idPath)
     return static_cast<Image*>(get(idPath, &DyedImageLoader::load, &rl));
 }
 
-struct ImageSetLoader
+struct ImageSetLoader final
 {
     ResourceManager *manager;
     std::string path;
@@ -609,7 +609,7 @@ ImageSet *ResourceManager::getImageSet(const std::string &imagePath,
 }
 
 
-struct SubImageSetLoader
+struct SubImageSetLoader final
 {
     ResourceManager *manager;
     Image *parent;
@@ -644,7 +644,7 @@ ImageSet *ResourceManager::getSubImageSet(Image *const parent,
         &SubImageSetLoader::load, &rl));
 }
 
-struct SubImageLoader
+struct SubImageLoader final
 {
     ResourceManager *manager;
     Image *parent;
@@ -682,7 +682,7 @@ Image *ResourceManager::getSubImage(Image *const parent,
 }
 
 #ifdef USE_OPENGL
-struct AtlasLoader
+struct AtlasLoader final
 {
     const std::string name;
     const StringVect *files;
@@ -708,7 +708,7 @@ Resource *ResourceManager::getAtlas(const std::string &name,
 }
 #endif
 
-struct WalkLayerLoader
+struct WalkLayerLoader final
 {
     const std::string name;
     Map *map;
@@ -733,7 +733,7 @@ WalkLayer *ResourceManager::getWalkLayer(const std::string &name,
         &WalkLayerLoader::load, &rl));
 }
 
-struct SpriteDefLoader
+struct SpriteDefLoader final
 {
     std::string path;
     int variant;
@@ -936,7 +936,7 @@ void ResourceManager::clearScheduled()
     BLOCK_END("ResourceManager::clearScheduled")
 }
 
-struct RescaledLoader
+struct RescaledLoader final
 {
     ResourceManager *manager;
     const Image *image;
-- 
cgit v1.2.3-60-g2f50