summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-28 19:29:05 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-28 19:29:05 +0300
commit00f62e4f3db5aa737b4242a3d691d2ade299fc72 (patch)
treeee6fd7021bc7e4a69a1f9e69a4f3c3041f183f4d /src/resources/map
parent1fc73fd6d8cb70e306b3bdeb375de1dd1e9458cc (diff)
downloadmv-00f62e4f3db5aa737b4242a3d691d2ade299fc72.tar.gz
mv-00f62e4f3db5aa737b4242a3d691d2ade299fc72.tar.bz2
mv-00f62e4f3db5aa737b4242a3d691d2ade299fc72.tar.xz
mv-00f62e4f3db5aa737b4242a3d691d2ade299fc72.zip
Add missing override and final to destructors.
Also remove some empty destructors.
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/map.h2
-rw-r--r--src/resources/map/mapheights.h2
-rw-r--r--src/resources/map/maplayer.h2
-rw-r--r--src/resources/map/objectslayer.h2
-rw-r--r--src/resources/map/speciallayer.h2
-rw-r--r--src/resources/map/walklayer.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index 39e4e651e..4a3dc9f48 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -84,7 +84,7 @@ class Map final : public Properties,
/**
* Destructor.
*/
- ~Map();
+ ~Map() override final;
/**
* Initialize ambient layers. Has to be called after all the properties
diff --git a/src/resources/map/mapheights.h b/src/resources/map/mapheights.h
index ef8c4151b..d4bf90632 100644
--- a/src/resources/map/mapheights.h
+++ b/src/resources/map/mapheights.h
@@ -36,7 +36,7 @@ class MapHeights final : public MemoryCounter
A_DELETE_COPY(MapHeights)
- ~MapHeights();
+ ~MapHeights() override final;
void setHeight(const int x, const int y, const uint8_t height);
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index c21ac33bc..87ddb96ec 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -69,7 +69,7 @@ class MapLayer final: public MemoryCounter, public ConfigListener
/**
* Destructor.
*/
- ~MapLayer();
+ ~MapLayer() override final;
/**
* Set tile image, with x and y in layer coordinates.
diff --git a/src/resources/map/objectslayer.h b/src/resources/map/objectslayer.h
index 3deed3d36..4894b3469 100644
--- a/src/resources/map/objectslayer.h
+++ b/src/resources/map/objectslayer.h
@@ -34,7 +34,7 @@ class ObjectsLayer final : public MemoryCounter
A_DELETE_COPY(ObjectsLayer)
- ~ObjectsLayer();
+ ~ObjectsLayer() override final;
void addObject(const std::string &name, const int type,
const unsigned x, const unsigned y,
diff --git a/src/resources/map/speciallayer.h b/src/resources/map/speciallayer.h
index 8f6f914d3..20ade5f73 100644
--- a/src/resources/map/speciallayer.h
+++ b/src/resources/map/speciallayer.h
@@ -42,7 +42,7 @@ class SpecialLayer final : public MemoryCounter
A_DELETE_COPY(SpecialLayer)
- ~SpecialLayer();
+ ~SpecialLayer() override final;
void draw(Graphics *const graphics,
int startX, int startY,
diff --git a/src/resources/map/walklayer.h b/src/resources/map/walklayer.h
index 4e5cc9c65..33cbc2bb4 100644
--- a/src/resources/map/walklayer.h
+++ b/src/resources/map/walklayer.h
@@ -32,7 +32,7 @@ class WalkLayer final : public Resource
A_DELETE_COPY(WalkLayer)
- ~WalkLayer();
+ ~WalkLayer() override final;
int *getData()
{ return mTiles; }