diff options
68 files changed, 81 insertions, 77 deletions
diff --git a/src/net/download.h b/src/net/download.h index 021daae32..ec55e60ae 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -51,7 +51,7 @@ struct curl_slist; namespace Net { -class Download +class Download final { public: Download(void *ptr, const std::string &url, diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 85b0da0bd..ce341e53f 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -33,7 +33,7 @@ namespace EAthena { -class AdminHandler : public MessageHandler, public Ea::AdminHandler +class AdminHandler final : public MessageHandler, public Ea::AdminHandler { public: AdminHandler(); diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 0ddb0b348..956b3758a 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -33,7 +33,7 @@ namespace EAthena { -class BeingHandler : public MessageHandler, public Ea::BeingHandler +class BeingHandler final : public MessageHandler, public Ea::BeingHandler { public: BeingHandler(bool enableSync); diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index 499ec691e..3985aa184 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -32,7 +32,7 @@ namespace EAthena { -class BuySellHandler : public MessageHandler, public Ea::BuySellHandler +class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler { public: BuySellHandler(); diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index f276b6346..aa24318cf 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -39,7 +39,8 @@ namespace EAthena /** * Deals with incoming messages from the character server. */ -class CharServerHandler : public MessageHandler, public Ea::CharServerHandler +class CharServerHandler final : public MessageHandler, + public Ea::CharServerHandler { public: CharServerHandler(); diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index cf999fd63..ab8f81659 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -33,7 +33,7 @@ namespace EAthena { -class ChatHandler : public MessageHandler, public Ea::ChatHandler +class ChatHandler final : public MessageHandler, public Ea::ChatHandler { public: ChatHandler(); diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index 97df941ee..ec0c99c91 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -33,7 +33,7 @@ namespace EAthena { -class GameHandler : public MessageHandler, public Ea::GameHandler +class GameHandler final : public MessageHandler, public Ea::GameHandler { public: GameHandler(); diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index 85c220a79..7e3a1ad9e 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -33,8 +33,9 @@ namespace EAthena { -class GeneralHandler : public MessageHandler, public Net::GeneralHandler, - public Listener +class GeneralHandler final : public MessageHandler, + public Net::GeneralHandler, + public Listener { public: GeneralHandler(); diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 7fd318259..fdcb88368 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -31,7 +31,7 @@ namespace EAthena { -class GuildHandler : public Ea::GuildHandler, public MessageHandler +class GuildHandler final : public Ea::GuildHandler, public MessageHandler { public: GuildHandler(); diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index c59621c4a..5a83e7b87 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -34,7 +34,8 @@ namespace EAthena { -class InventoryHandler : public MessageHandler, public Ea::InventoryHandler +class InventoryHandler final : public MessageHandler, + public Ea::InventoryHandler { public: InventoryHandler(); diff --git a/src/net/eathena/itemhandler.h b/src/net/eathena/itemhandler.h index 63adb56ac..60e65d27a 100644 --- a/src/net/eathena/itemhandler.h +++ b/src/net/eathena/itemhandler.h @@ -30,7 +30,7 @@ namespace EAthena { -class ItemHandler : public MessageHandler, public Ea::ItemHandler +class ItemHandler final : public MessageHandler, public Ea::ItemHandler { public: ItemHandler(); diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index ec7713eca..26cafb5c7 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -36,7 +36,7 @@ class LoginData; namespace EAthena { -class LoginHandler : public MessageHandler, public Ea::LoginHandler +class LoginHandler final : public MessageHandler, public Ea::LoginHandler { public: LoginHandler(); diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h index a9cf0ce0f..b5f5e8baa 100644 --- a/src/net/eathena/messagein.h +++ b/src/net/eathena/messagein.h @@ -36,7 +36,7 @@ namespace EAthena * * \ingroup Network */ - class MessageIn : public Net::MessageIn +class MessageIn final : public Net::MessageIn { public: /** diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h index c01962221..58937434c 100644 --- a/src/net/eathena/messageout.h +++ b/src/net/eathena/messageout.h @@ -38,7 +38,7 @@ class Network; * * \ingroup Network */ -class MessageOut : public Net::MessageOut +class MessageOut final : public Net::MessageOut { public: /** diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h index 3c8ab2a65..63ec5a20b 100644 --- a/src/net/eathena/network.h +++ b/src/net/eathena/network.h @@ -43,7 +43,7 @@ namespace EAthena { -class Network : public Ea::Network +class Network final : public Ea::Network { public: Network(); diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index f905c7fff..2417629e3 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -37,7 +37,7 @@ class NpcDialog; namespace EAthena { -class NpcHandler : public MessageHandler, public Ea::NpcHandler +class NpcHandler final : public MessageHandler, public Ea::NpcHandler { public: NpcHandler(); diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index 1054f6d2d..22433c668 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -32,7 +32,7 @@ namespace EAthena { -class PartyHandler : public MessageHandler, public Ea::PartyHandler +class PartyHandler final : public MessageHandler, public Ea::PartyHandler { public: PartyHandler(); diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index c0a04a52e..0dc5d3a17 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -33,7 +33,7 @@ namespace EAthena { -class PlayerHandler : public MessageHandler, public Ea::PlayerHandler +class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler { public: PlayerHandler(); diff --git a/src/net/eathena/specialhandler.h b/src/net/eathena/specialhandler.h index fe76204f2..e8603ac2e 100644 --- a/src/net/eathena/specialhandler.h +++ b/src/net/eathena/specialhandler.h @@ -33,7 +33,7 @@ namespace EAthena { -class SpecialHandler : public MessageHandler, public Ea::SpecialHandler +class SpecialHandler final : public MessageHandler, public Ea::SpecialHandler { public: SpecialHandler(); diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h index ec5393340..acd282961 100644 --- a/src/net/eathena/tradehandler.h +++ b/src/net/eathena/tradehandler.h @@ -33,7 +33,7 @@ namespace EAthena { -class TradeHandler : public MessageHandler, public Ea::TradeHandler +class TradeHandler final : public MessageHandler, public Ea::TradeHandler { public: TradeHandler(); diff --git a/src/net/logindata.h b/src/net/logindata.h index dda58e10f..8988c5890 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -27,7 +27,7 @@ #include <string> -class LoginData +class LoginData final { public: LoginData(): diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h index 936217c95..86277d5d7 100644 --- a/src/net/packetcounters.h +++ b/src/net/packetcounters.h @@ -23,7 +23,7 @@ #ifndef PACKETCOUNTERS_H #define PACKETCOUNTERS_H -class PacketCounters +class PacketCounters final { public: static void incInBytes(int cnt); diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index b4665946c..7be5957d2 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -30,7 +30,7 @@ #include "localconsts.h" -class ServerInfo +class ServerInfo final { public: enum Type diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 4063a7fba..6bb1b9fd0 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class AdminHandler : public MessageHandler, public Ea::AdminHandler +class AdminHandler final : public MessageHandler, public Ea::AdminHandler { public: AdminHandler(); diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index a45e33d36..a5732166c 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class BeingHandler : public MessageHandler, public Ea::BeingHandler +class BeingHandler final : public MessageHandler, public Ea::BeingHandler { public: BeingHandler(bool enableSync); diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index 69188099f..4c9736cf2 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -32,7 +32,7 @@ namespace TmwAthena { -class BuySellHandler : public MessageHandler, public Ea::BuySellHandler +class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler { public: BuySellHandler(); diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 7a6629237..f85d128b6 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -39,7 +39,8 @@ namespace TmwAthena /** * Deals with incoming messages from the character server. */ -class CharServerHandler : public MessageHandler, public Ea::CharServerHandler +class CharServerHandler final : public MessageHandler, + public Ea::CharServerHandler { public: CharServerHandler(); diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 8652d297d..4d46bbeac 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class ChatHandler : public MessageHandler, public Ea::ChatHandler +class ChatHandler final : public MessageHandler, public Ea::ChatHandler { public: ChatHandler(); diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 8f399d230..9dac38d19 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class GameHandler : public MessageHandler, public Ea::GameHandler +class GameHandler final : public MessageHandler, public Ea::GameHandler { public: GameHandler(); diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index a296d6ad5..1438ce4db 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -33,8 +33,8 @@ namespace TmwAthena { -class GeneralHandler : public MessageHandler, public Net::GeneralHandler, - public Listener +class GeneralHandler final : public MessageHandler, public Net::GeneralHandler, + public Listener { public: GeneralHandler(); diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index a2e6a88e3..bea2b2c3b 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -31,7 +31,7 @@ namespace TmwAthena { -class GuildHandler : public Ea::GuildHandler, public MessageHandler +class GuildHandler final : public Ea::GuildHandler, public MessageHandler { public: GuildHandler(); diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index c6e000b3a..7e3fabf42 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -34,7 +34,8 @@ namespace TmwAthena { -class InventoryHandler : public MessageHandler, public Ea::InventoryHandler +class InventoryHandler final : public MessageHandler, + public Ea::InventoryHandler { public: InventoryHandler(); diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h index 0f2459fbf..02fbba796 100644 --- a/src/net/tmwa/itemhandler.h +++ b/src/net/tmwa/itemhandler.h @@ -30,7 +30,7 @@ namespace TmwAthena { -class ItemHandler : public MessageHandler, public Ea::ItemHandler +class ItemHandler final : public MessageHandler, public Ea::ItemHandler { public: ItemHandler(); diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index ecd9d2428..108b5fbd3 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -36,7 +36,7 @@ class LoginData; namespace TmwAthena { -class LoginHandler : public MessageHandler, public Ea::LoginHandler +class LoginHandler final : public MessageHandler, public Ea::LoginHandler { public: LoginHandler(); diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index c8dfb5bff..35804b34e 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -36,7 +36,7 @@ namespace TmwAthena * * \ingroup Network */ - class MessageIn : public Net::MessageIn +class MessageIn final : public Net::MessageIn { public: /** diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index d283de4ca..17c1cb5e5 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -38,7 +38,7 @@ class Network; * * \ingroup Network */ -class MessageOut : public Net::MessageOut +class MessageOut final : public Net::MessageOut { public: /** diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 57fa339e1..4db67e92c 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -44,7 +44,7 @@ namespace TmwAthena { -class Network : public Ea::Network +class Network final : public Ea::Network { public: Network(); diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 1cfcacb20..a10c455f3 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -37,7 +37,7 @@ class NpcDialog; namespace TmwAthena { -class NpcHandler : public MessageHandler, public Ea::NpcHandler +class NpcHandler final : public MessageHandler, public Ea::NpcHandler { public: NpcHandler(); diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index c4d20b353..61b873d5d 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -32,7 +32,7 @@ namespace TmwAthena { -class PartyHandler : public MessageHandler, public Ea::PartyHandler +class PartyHandler final : public MessageHandler, public Ea::PartyHandler { public: PartyHandler(); diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index e7e99375f..6633eb506 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class PlayerHandler : public MessageHandler, public Ea::PlayerHandler +class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler { public: PlayerHandler(); diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h index aa2534ddb..a2f7ad9a7 100644 --- a/src/net/tmwa/questhandler.h +++ b/src/net/tmwa/questhandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class QuestHandler : public MessageHandler +class QuestHandler final : public MessageHandler { public: QuestHandler(); diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h index 216adddc6..3fbca307c 100644 --- a/src/net/tmwa/specialhandler.h +++ b/src/net/tmwa/specialhandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class SpecialHandler : public MessageHandler, public Ea::SpecialHandler +class SpecialHandler final : public MessageHandler, public Ea::SpecialHandler { public: SpecialHandler(); diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index b5a06ef6a..8ac152e71 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -33,7 +33,7 @@ namespace TmwAthena { -class TradeHandler : public MessageHandler, public Ea::TradeHandler +class TradeHandler final : public MessageHandler, public Ea::TradeHandler { public: TradeHandler(); diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index 26733a0da..3b562e6ec 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -26,7 +26,7 @@ #include <string> #include <vector> -struct WorldInfo +struct WorldInfo final { int address; std::string name; diff --git a/src/resources/action.h b/src/resources/action.h index 7b6494c99..0ad4ceaa1 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -31,7 +31,7 @@ class Animation; /** * An action consists of several animations, one for each direction. */ -class Action +class Action final { public: Action(); diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h index e0593ce4f..a4890b24e 100644 --- a/src/resources/ambientlayer.h +++ b/src/resources/ambientlayer.h @@ -25,7 +25,7 @@ class Graphics; class Image; -class AmbientLayer +class AmbientLayer final { public: /** diff --git a/src/resources/animation.h b/src/resources/animation.h index ab2d83c4c..ad4b1b187 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -31,7 +31,7 @@ class Image; /** * A single frame in an animation, with a delay and an offset. */ -struct Frame +struct Frame final { enum FrameType { @@ -54,7 +54,7 @@ struct Frame * An animation consists of several frames, each with their own delay and * offset. */ -class Animation +class Animation final { friend class AnimatedSprite; friend class ParticleEmitter; diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 0d3973a5c..ccd9ccf21 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -28,7 +28,7 @@ #include <list> #include <map> -struct Attack +struct Attack final { std::string action; std::string particleEffect; @@ -66,7 +66,7 @@ typedef std::map<SoundEvent, StringVect*> SoundEvents; * @see MonsterDB * @see NPCDB */ -class BeingInfo +class BeingInfo final { public: static BeingInfo *unknown; diff --git a/src/resources/colordb.h b/src/resources/colordb.h index 4be6503fb..1aa955d68 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -30,7 +30,7 @@ */ namespace ColorDB { - class ItemColor + class ItemColor final { public: ItemColor(): diff --git a/src/resources/dye.h b/src/resources/dye.h index cd5e58093..c519d6aec 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -35,10 +35,9 @@ const int aPaleteIndex = 8; /** * Class for performing a linear interpolation between colors. */ -class DyePalette +class DyePalette final { public: - /** * Creates a palette based on the given string. * The string is either a file name or a sequence of hexadecimal RGB @@ -89,7 +88,7 @@ class DyePalette /** * Class for dispatching pixel-recoloring amongst several palettes. */ -class Dye +class Dye final { public: diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h index 50742d7b5..1c210263a 100644 --- a/src/resources/emotedb.h +++ b/src/resources/emotedb.h @@ -29,13 +29,13 @@ class AnimatedSprite; -struct EmoteSprite +struct EmoteSprite final { const AnimatedSprite *sprite; std::string name; }; -struct EmoteInfo +struct EmoteInfo final { std::list<EmoteSprite*> sprites; StringVect particles; diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h index 9dd754c19..54415e697 100644 --- a/src/resources/fboinfo.h +++ b/src/resources/fboinfo.h @@ -31,7 +31,7 @@ #include <SDL_opengl.h> #include <GL/glext.h> -struct FBOInfo +struct FBOInfo final { FBOInfo() : fboId(0), textureId(0), rboId(0) diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index 20705d26f..a95a53900 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -24,7 +24,7 @@ struct SDL_Surface; -class ImageWriter +class ImageWriter final { public: static bool writePNG(SDL_Surface *const surface, diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 9a81d65e9..644b80154 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -97,7 +97,7 @@ typedef SpriteToItemMap::const_iterator SpriteToItemMapCIter; * Defines a class for storing item infos. This includes information used when * the item is equipped. */ -class ItemInfo +class ItemInfo final { public: /** diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 186d643fc..172b8c1c5 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -34,7 +34,7 @@ class Tileset; /** * Reader for XML map files (*.tmx) */ -class MapReader +class MapReader final { public: /** diff --git a/src/resources/music.h b/src/resources/music.h index 0afbb428b..7e75ceaeb 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -30,7 +30,7 @@ /** * Defines a class for loading and storing music. */ -class Music : public Resource +class Music final : public Resource { public: /** diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h index 36d51c29b..c93216e12 100644 --- a/src/resources/openglimagehelper.h +++ b/src/resources/openglimagehelper.h @@ -48,7 +48,7 @@ class Image; /** * Defines a class for loading and storing images. */ -class OpenGLImageHelper : public ImageHelper +class OpenGLImageHelper final : public ImageHelper { friend class CompoundSprite; friend class Graphics; diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index dee7f5459..7d6d38416 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -49,7 +49,7 @@ typedef DelayedAnim::iterator DelayedAnimIter; /** * A class for loading and managing resources. */ -class ResourceManager +class ResourceManager final { friend class Resource; diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index 183627435..2742755c2 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -35,7 +35,7 @@ class Image; /** * Defines a class for loading and storing images. */ -class SDLImageHelper : public ImageHelper +class SDLImageHelper final : public ImageHelper { friend class Image; diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 7d23dcca0..203e3a8f8 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -30,7 +30,7 @@ /** * Defines a class for loading and storing sound effects. */ -class SoundEffect : public Resource +class SoundEffect final : public Resource { public: /** diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h index 146d9d00f..1fa11df9e 100644 --- a/src/resources/specialdb.h +++ b/src/resources/specialdb.h @@ -25,7 +25,7 @@ #include <string> #include <map> -struct SpecialInfo +struct SpecialInfo final { enum TargetMode { diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 74960f64e..bc4f13a13 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -36,7 +36,7 @@ class Action; class Animation; class ImageSet; -struct SpriteReference +struct SpriteReference final { static SpriteReference *Empty; @@ -53,7 +53,7 @@ struct SpriteReference int variant; }; -struct SpriteDisplay +struct SpriteDisplay final { std::string image; std::string floor; @@ -107,7 +107,7 @@ enum SpriteDirection /** * Defines a class to load an animation. */ -class SpriteDef : public Resource +class SpriteDef final : public Resource { public: /** diff --git a/src/resources/subimage.h b/src/resources/subimage.h index 4b5478b71..719b9f4c1 100644 --- a/src/resources/subimage.h +++ b/src/resources/subimage.h @@ -45,7 +45,7 @@ /** * A clipped version of a larger image. */ -class SubImage : public Image +class SubImage final : public Image { public: /** diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h index 517ace011..37168e093 100644 --- a/src/resources/wallpaper.h +++ b/src/resources/wallpaper.h @@ -28,7 +28,7 @@ /** * Handles organizing and choosing of wallpapers. */ -class Wallpaper +class Wallpaper final { public: /** diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h index 86a09b0d9..71c604f38 100644 --- a/src/utils/translation/podict.h +++ b/src/utils/translation/podict.h @@ -26,7 +26,7 @@ typedef std::map <std::string, std::string> PoMap; -class PoDict +class PoDict final { public: PoDict(std::string lang); diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h index 254c44a34..274591d3b 100644 --- a/src/utils/translation/poparser.h +++ b/src/utils/translation/poparser.h @@ -28,7 +28,7 @@ #include <sstream> #include <string> -class PoParser +class PoParser final { public: PoParser(); diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h index 25f88a4c1..55d8a44e4 100644 --- a/src/utils/translation/translationmanager.h +++ b/src/utils/translation/translationmanager.h @@ -27,7 +27,7 @@ class PoDict; -class TranslationManager +class TranslationManager final { public: static PoDict *loadLang(StringVect lang, diff --git a/src/utils/xml.h b/src/utils/xml.h index cef1ebae2..40922db5d 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -43,7 +43,7 @@ namespace XML * A helper class for parsing an XML document, which also cleans it up * again (RAII). */ - class Document + class Document final { public: /** |