diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-15 15:15:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-15 15:15:39 +0300 |
| commit | b2b348d4baf2891fd82635e068a4f64d2694ba6d (patch) | |
| tree | c26a27f24697c0a3d925e1ee54239edf78dd6921 /src | |
| parent | b675c9444e268238f836fcd0deb827233df3d012 (diff) | |
| download | plus-b2b348d4baf2891fd82635e068a4f64d2694ba6d.tar.gz plus-b2b348d4baf2891fd82635e068a4f64d2694ba6d.tar.bz2 plus-b2b348d4baf2891fd82635e068a4f64d2694ba6d.tar.xz plus-b2b348d4baf2891fd82635e068a4f64d2694ba6d.zip | |
Fix compilation warnings without C++11 support.
Diffstat (limited to 'src')
321 files changed, 385 insertions, 385 deletions
diff --git a/src/actor.h b/src/actor.h index cb7046cc0..21d5172c5 100644 --- a/src/actor.h +++ b/src/actor.h @@ -39,7 +39,7 @@ class Actor public: Actor(); - A_DELETE_COPY(Actor); + A_DELETE_COPY(Actor) virtual ~Actor(); diff --git a/src/actorsprite.h b/src/actorsprite.h index 94778e49e..f7792ead0 100644 --- a/src/actorsprite.h +++ b/src/actorsprite.h @@ -68,7 +68,7 @@ public: ActorSprite(const int id); - A_DELETE_COPY(ActorSprite); + A_DELETE_COPY(ActorSprite) ~ActorSprite(); diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index 682b39054..bd5662c3c 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -38,7 +38,7 @@ class ActorSpriteManager final: public ConfigListener public: ActorSpriteManager(); - A_DELETE_COPY(ActorSpriteManager); + A_DELETE_COPY(ActorSpriteManager) ~ActorSpriteManager(); diff --git a/src/animatedsprite.h b/src/animatedsprite.h index a56d4bff3..7d3fefefb 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -44,7 +44,7 @@ class AnimatedSprite final : public Sprite */ AnimatedSprite(SpriteDef *const sprite); - A_DELETE_COPY(AnimatedSprite); + A_DELETE_COPY(AnimatedSprite) /** * An helper function, which will request the sprite to animate diff --git a/src/animationdelayload.h b/src/animationdelayload.h index 9e86f67db..0eea88a6f 100644 --- a/src/animationdelayload.h +++ b/src/animationdelayload.h @@ -33,7 +33,7 @@ class AnimationDelayLoad final AnimationDelayLoad(const std::string &fileName, const int variant, AnimatedSprite *const sprite); - A_DELETE_COPY(AnimationDelayLoad); + A_DELETE_COPY(AnimationDelayLoad) ~AnimationDelayLoad(); diff --git a/src/animationparticle.h b/src/animationparticle.h index e744cd332..b1dae7fcb 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -39,7 +39,7 @@ class AnimationParticle final : public ImageParticle AnimationParticle(Map *const map, XmlNodePtr const animationNode, const std::string& dyePalettes = std::string()); - A_DELETE_COPY(AnimationParticle); + A_DELETE_COPY(AnimationParticle) ~AnimationParticle(); diff --git a/src/auctionmanager.h b/src/auctionmanager.h index ef025b6fc..b61858efa 100644 --- a/src/auctionmanager.h +++ b/src/auctionmanager.h @@ -34,7 +34,7 @@ class AuctionManager final public: AuctionManager(); - A_DELETE_COPY(AuctionManager); + A_DELETE_COPY(AuctionManager) ~AuctionManager(); diff --git a/src/avatar.h b/src/avatar.h index 51505bfbc..b4c7d271a 100644 --- a/src/avatar.h +++ b/src/avatar.h @@ -37,7 +37,7 @@ class Avatar public: Avatar(const std::string &name = ""); - A_DELETE_COPY(Avatar); + A_DELETE_COPY(Avatar) virtual ~Avatar() { } diff --git a/src/being.cpp b/src/being.cpp index 3b35ad9f0..6be9effb4 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -86,7 +86,7 @@ class BeingCacheEntry final { } - A_DELETE_COPY(BeingCacheEntry); + A_DELETE_COPY(BeingCacheEntry) int getId() const { return mId; } diff --git a/src/being.h b/src/being.h index 37b752551..438707567 100644 --- a/src/being.h +++ b/src/being.h @@ -76,7 +76,7 @@ class BeingEquipBackend final : public Equipment::Backend public: BeingEquipBackend(Being *const being); - A_DELETE_COPY(BeingEquipBackend); + A_DELETE_COPY(BeingEquipBackend) virtual ~BeingEquipBackend(); @@ -171,7 +171,7 @@ class Being : public ActorSprite, public ConfigListener Being(const int id, const Type type, const uint16_t subtype, Map *const map); - A_DELETE_COPY(Being); + A_DELETE_COPY(Being) virtual ~Being(); diff --git a/src/channel.h b/src/channel.h index 63826082b..3ffd5326e 100644 --- a/src/channel.h +++ b/src/channel.h @@ -43,7 +43,7 @@ class Channel final const std::string &name, const std::string &announcement = std::string()); - A_DELETE_COPY(Channel); + A_DELETE_COPY(Channel) ~Channel(); diff --git a/src/channelmanager.h b/src/channelmanager.h index 209897db8..3ec58df77 100644 --- a/src/channelmanager.h +++ b/src/channelmanager.h @@ -34,7 +34,7 @@ class ChannelManager final { public: ChannelManager(); - A_DELETE_COPY(ChannelManager); + A_DELETE_COPY(ChannelManager) ~ChannelManager(); Channel *findById(const int id) const; diff --git a/src/chatlogger.h b/src/chatlogger.h index c94890ad4..57e5b7359 100644 --- a/src/chatlogger.h +++ b/src/chatlogger.h @@ -36,7 +36,7 @@ class ChatLogger final */ ChatLogger(); - A_DELETE_COPY(ChatLogger); + A_DELETE_COPY(ChatLogger) /** * Destructor, closes log file. diff --git a/src/client.h b/src/client.h index f25e30297..c8f338a53 100644 --- a/src/client.h +++ b/src/client.h @@ -200,7 +200,7 @@ public: Client(const Options &options); - A_DELETE_COPY(Client); + A_DELETE_COPY(Client) ~Client(); diff --git a/src/commandhandler.h b/src/commandhandler.h index 3063db970..ec42573a1 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -45,7 +45,7 @@ class CommandHandler final */ CommandHandler(); - A_DELETE_COPY(CommandHandler); + A_DELETE_COPY(CommandHandler) /** * Destructor diff --git a/src/compoundsprite.h b/src/compoundsprite.h index e53c5a463..5781bf171 100644 --- a/src/compoundsprite.h +++ b/src/compoundsprite.h @@ -36,7 +36,7 @@ class CompoundItem final public: CompoundItem(); - A_DELETE_COPY(CompoundItem); + A_DELETE_COPY(CompoundItem) ~CompoundItem(); @@ -54,7 +54,7 @@ public: CompoundSprite(); - A_DELETE_COPY(CompoundSprite); + A_DELETE_COPY(CompoundSprite) ~CompoundSprite(); diff --git a/src/configuration.h b/src/configuration.h index 8e2df7ca6..e351c05bf 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -227,7 +227,7 @@ class Configuration final : public ConfigurationObject public: Configuration(); - A_DELETE_COPY(Configuration); + A_DELETE_COPY(Configuration) ~Configuration(); diff --git a/src/dropshortcut.h b/src/dropshortcut.h index 3e23a10fd..7f4443638 100644 --- a/src/dropshortcut.h +++ b/src/dropshortcut.h @@ -40,7 +40,7 @@ class DropShortcut final */ DropShortcut(); - A_DELETE_COPY(DropShortcut); + A_DELETE_COPY(DropShortcut) /** * Destructor. diff --git a/src/effectmanager.h b/src/effectmanager.h index 4fbebc42b..9ec5aa5c6 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -43,7 +43,7 @@ class EffectManager final EffectManager(); - A_DELETE_COPY(EffectManager); + A_DELETE_COPY(EffectManager) ~EffectManager(); diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h index 91f7c1d76..a90e1f723 100644 --- a/src/emoteshortcut.h +++ b/src/emoteshortcut.h @@ -37,7 +37,7 @@ class EmoteShortcut final */ EmoteShortcut(); - A_DELETE_COPY(EmoteShortcut); + A_DELETE_COPY(EmoteShortcut) /** * Destructor. diff --git a/src/equipment.h b/src/equipment.h index 9bbb3e0bf..d0aa8a785 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -38,7 +38,7 @@ class Equipment Equipment(): mBackend(nullptr) { } - A_DELETE_COPY(Equipment); + A_DELETE_COPY(Equipment) /** * Destructor. diff --git a/src/flooritem.h b/src/flooritem.h index ef0bc454d..00cf49aa8 100644 --- a/src/flooritem.h +++ b/src/flooritem.h @@ -50,7 +50,7 @@ class FloorItem final : public ActorSprite Map *const map, const int amount, const unsigned char color, int subX, int subY); - A_DELETE_COPY(FloorItem); + A_DELETE_COPY(FloorItem) Type getType() const override { return FLOOR_ITEM; } diff --git a/src/game.h b/src/game.h index 6be43c169..001c7c348 100644 --- a/src/game.h +++ b/src/game.h @@ -57,7 +57,7 @@ class Game final */ Game(); - A_DELETE_COPY(Game); + A_DELETE_COPY(Game) /** * Destructor, cleans up the game. diff --git a/src/graphics.h b/src/graphics.h index 09fc48885..94b0ef8f3 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -60,7 +60,7 @@ class ImageRect final ImageRect() { } - A_DELETE_COPY(ImageRect); + A_DELETE_COPY(ImageRect) enum ImagePosition { @@ -95,7 +95,7 @@ class Graphics : public gcn::SDLGraphics */ Graphics(); - A_DELETE_COPY(Graphics); + A_DELETE_COPY(Graphics) /** * Destructor. diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index 3f2007919..b16c63fbf 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -46,7 +46,7 @@ class GraphicsManager final public: GraphicsManager(); - A_DELETE_COPY(GraphicsManager); + A_DELETE_COPY(GraphicsManager) virtual ~GraphicsManager(); diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h index 880370beb..69d391864 100644 --- a/src/graphicsvertexes.h +++ b/src/graphicsvertexes.h @@ -54,7 +54,7 @@ class SDLGraphicsVertexes final public: SDLGraphicsVertexes(); - A_DELETE_COPY(SDLGraphicsVertexes); + A_DELETE_COPY(SDLGraphicsVertexes) ~SDLGraphicsVertexes(); @@ -71,7 +71,7 @@ class NormalOpenGLGraphicsVertexes final public: NormalOpenGLGraphicsVertexes(); - A_DELETE_COPY(NormalOpenGLGraphicsVertexes); + A_DELETE_COPY(NormalOpenGLGraphicsVertexes) ~NormalOpenGLGraphicsVertexes(); @@ -128,7 +128,7 @@ class ImageVertexes final public: ImageVertexes(); - A_DELETE_COPY(ImageVertexes); + A_DELETE_COPY(ImageVertexes) ~ImageVertexes(); @@ -145,7 +145,7 @@ class GraphicsVertexes final public: GraphicsVertexes(); - A_DELETE_COPY(GraphicsVertexes); + A_DELETE_COPY(GraphicsVertexes) ~GraphicsVertexes(); diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h index c0c8f46ea..5c0e908a9 100644 --- a/src/gui/beingpopup.h +++ b/src/gui/beingpopup.h @@ -38,7 +38,7 @@ class BeingPopup final : public Popup */ BeingPopup(); - A_DELETE_COPY(BeingPopup); + A_DELETE_COPY(BeingPopup) /** * Destructor. Cleans up the being popup on deletion. diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index 6b2e9596a..eb7020189 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -68,7 +68,7 @@ public: playersUpdated(); } - A_DELETE_COPY(UsersTableModel); + A_DELETE_COPY(UsersTableModel) virtual ~UsersTableModel() { diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h index 2dc9edd38..61629ab90 100644 --- a/src/gui/botcheckerwindow.h +++ b/src/gui/botcheckerwindow.h @@ -55,7 +55,7 @@ class BotCheckerWindow final : public Window, */ BotCheckerWindow(); - A_DELETE_COPY(BotCheckerWindow); + A_DELETE_COPY(BotCheckerWindow) /** * Destructor. diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h index 01d99e194..fdfb90f48 100644 --- a/src/gui/buydialog.h +++ b/src/gui/buydialog.h @@ -62,7 +62,7 @@ class BuyDialog final : public Window, public gcn::ActionListener, */ BuyDialog(std::string nick); - A_DELETE_COPY(BuyDialog); + A_DELETE_COPY(BuyDialog) /** * Destructor diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h index 08a948145..0d43563f7 100644 --- a/src/gui/buyselldialog.h +++ b/src/gui/buyselldialog.h @@ -47,7 +47,7 @@ class BuySellDialog final : public Window, public gcn::ActionListener BuySellDialog(std::string nick); - A_DELETE_COPY(BuySellDialog); + A_DELETE_COPY(BuySellDialog) virtual ~BuySellDialog(); diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index bef7a9d71..9322919b3 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -52,7 +52,7 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener */ ChangeEmailDialog(LoginData *const data); - A_DELETE_COPY(ChangeEmailDialog); + A_DELETE_COPY(ChangeEmailDialog) /** * Destructor. diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index 00631e105..47a75b163 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -52,7 +52,7 @@ class ChangePasswordDialog final : public Window, public gcn::ActionListener */ ChangePasswordDialog(LoginData *const data); - A_DELETE_COPY(ChangePasswordDialog); + A_DELETE_COPY(ChangePasswordDialog) /** * Destructor diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index a6a82f94a..7db506e7f 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -56,7 +56,7 @@ class CharCreateDialog final : public Window, */ CharCreateDialog(CharSelectDialog *const parent, const int slot); - A_DELETE_COPY(CharCreateDialog); + A_DELETE_COPY(CharCreateDialog) /** * Destructor. diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 24a3f1d8a..1dd5f801b 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -78,7 +78,7 @@ class CharDeleteConfirm final : public ConfirmDialog { } - A_DELETE_COPY(CharDeleteConfirm); + A_DELETE_COPY(CharDeleteConfirm) void action(const gcn::ActionEvent &event) { @@ -98,7 +98,7 @@ class CharacterDisplay final : public Container public: CharacterDisplay(CharSelectDialog *const charSelectDialog); - A_DELETE_COPY(CharacterDisplay); + A_DELETE_COPY(CharacterDisplay) void setCharacter(Net::Character *const character); diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 1bf0ab88a..82b1cae0d 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -64,7 +64,7 @@ class CharSelectDialog final : public Window, */ CharSelectDialog(LoginData *const data); - A_DELETE_COPY(CharSelectDialog); + A_DELETE_COPY(CharSelectDialog) ~CharSelectDialog(); diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 4fb470eed..9f6953d1d 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -86,7 +86,7 @@ class ChatInput final : public TextField, public gcn::FocusListener addFocusListener(this); } - A_DELETE_COPY(ChatInput); + A_DELETE_COPY(ChatInput) /** * Called if the chat input loses focus. It will set itself to diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index a9531b404..1d21b248e 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -96,7 +96,7 @@ class ChatWindow final : public Window, */ ChatWindow(); - A_DELETE_COPY(ChatWindow); + A_DELETE_COPY(ChatWindow) /** * Destructor: used to write back values to the config file diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h index 471cc8a4d..64d2cd156 100644 --- a/src/gui/confirmdialog.h +++ b/src/gui/confirmdialog.h @@ -48,7 +48,7 @@ class ConfirmDialog : public Window, public gcn::ActionListener const bool ignore = false, const bool modal = false, Window *const parent = nullptr); - A_DELETE_COPY(ConfirmDialog); + A_DELETE_COPY(ConfirmDialog) /** * Called when receiving actions from the widgets. diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h index 0241c0184..77c97c92d 100644 --- a/src/gui/connectiondialog.h +++ b/src/gui/connectiondialog.h @@ -47,7 +47,7 @@ class ConnectionDialog final : public Window, private gcn::ActionListener */ ConnectionDialog(const std::string &text, const State cancelState); - A_DELETE_COPY(ConnectionDialog); + A_DELETE_COPY(ConnectionDialog) /** * Called when the user presses Cancel. Restores the global state to diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index 4d438921b..8ed1bad74 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -41,7 +41,7 @@ class DebugTab : public Container Container() { } - A_DELETE_COPY(DebugTab); + A_DELETE_COPY(DebugTab) void logic() override = 0; @@ -58,7 +58,7 @@ class MapDebugTab final : public DebugTab public: MapDebugTab(); - A_DELETE_COPY(MapDebugTab); + A_DELETE_COPY(MapDebugTab) void logic() override; @@ -84,7 +84,7 @@ class TargetDebugTab final : public DebugTab public: TargetDebugTab(); - A_DELETE_COPY(TargetDebugTab); + A_DELETE_COPY(TargetDebugTab) void logic() override; @@ -108,7 +108,7 @@ class NetDebugTab final : public DebugTab public: NetDebugTab(); - A_DELETE_COPY(NetDebugTab); + A_DELETE_COPY(NetDebugTab) void logic() override; @@ -131,7 +131,7 @@ class DebugWindow final : public Window */ DebugWindow(); - A_DELETE_COPY(DebugWindow); + A_DELETE_COPY(DebugWindow) ~DebugWindow(); diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h index e3b467685..c08fa832b 100644 --- a/src/gui/didyouknowwindow.h +++ b/src/gui/didyouknowwindow.h @@ -51,7 +51,7 @@ class DidYouKnowWindow final : public Window, */ DidYouKnowWindow(); - A_DELETE_COPY(DidYouKnowWindow); + A_DELETE_COPY(DidYouKnowWindow) /** * Called when receiving actions from the widgets. diff --git a/src/gui/editdialog.h b/src/gui/editdialog.h index e42743f5f..4d32c1ff9 100644 --- a/src/gui/editdialog.h +++ b/src/gui/editdialog.h @@ -51,7 +51,7 @@ class EditDialog final : public Window, public gcn::ActionListener std::string eventOk = ACTION_EDIT_OK, const int width = 300, Window *const parent = nullptr, const bool modal = true); - A_DELETE_COPY(EditDialog); + A_DELETE_COPY(EditDialog) /** * Called when receiving actions from the widgets. diff --git a/src/gui/editserverdialog.h b/src/gui/editserverdialog.h index 363134534..ea6ea326d 100644 --- a/src/gui/editserverdialog.h +++ b/src/gui/editserverdialog.h @@ -84,7 +84,7 @@ class EditServerDialog final : public Window, EditServerDialog(ServerDialog *const parent, ServerInfo server, const int index); - A_DELETE_COPY(EditServerDialog); + A_DELETE_COPY(EditServerDialog) ~EditServerDialog(); diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index df086f962..cb6d5c087 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -51,7 +51,7 @@ struct EquipmentBox final x(x0), y(y0), image(img) { } - A_DELETE_COPY(EquipmentBox); + A_DELETE_COPY(EquipmentBox) int x; int y; @@ -72,7 +72,7 @@ class EquipmentWindow final : public Window, public gcn::ActionListener EquipmentWindow(Equipment *const equipment, Being *const being, const bool foring = false); - A_DELETE_COPY(EquipmentWindow); + A_DELETE_COPY(EquipmentWindow) /** * Destructor. diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 71cec2ea4..e881c9aea 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -40,7 +40,7 @@ class FocusHandler final : public gcn::FocusHandler FocusHandler() { } - A_DELETE_COPY(FocusHandler); + A_DELETE_COPY(FocusHandler) /** * Sets modal focus to a widget. When there is already a modal widget diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 9f46559e5..e5893b69a 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -62,7 +62,7 @@ class GuiConfigListener final : public ConfigListener mGui(g) {} - A_DELETE_COPY(GuiConfigListener); + A_DELETE_COPY(GuiConfigListener) void optionChanged(const std::string &name) { diff --git a/src/gui/gui.h b/src/gui/gui.h index 1633859fb..c327a4b81 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -56,7 +56,7 @@ class Gui final : public gcn::Gui */ Gui(Graphics *const screen); - A_DELETE_COPY(Gui); + A_DELETE_COPY(Gui) /** * Destructor. diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h index 75608a435..f7c8ff690 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/helpwindow.h @@ -57,7 +57,7 @@ class HelpWindow final : public Window, public LinkHandler, */ HelpWindow(); - A_DELETE_COPY(HelpWindow); + A_DELETE_COPY(HelpWindow) /** * Called when receiving actions from the widgets. diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 3951958b5..5ae7295cd 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -68,7 +68,7 @@ class InventoryWindow final : public Window, */ InventoryWindow(Inventory *const inventory); - A_DELETE_COPY(InventoryWindow); + A_DELETE_COPY(InventoryWindow) /** * Destructor. diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp index cfd51f720..516b7f6f0 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/itemamountwindow.cpp @@ -78,7 +78,7 @@ public: } } - A_DELETE_COPY(ItemsModal); + A_DELETE_COPY(ItemsModal) virtual ~ItemsModal() { } diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h index 688450a20..53c7ea23f 100644 --- a/src/gui/itemamountwindow.h +++ b/src/gui/itemamountwindow.h @@ -62,7 +62,7 @@ class ItemAmountWindow final : public Window, ShopSellAdd }; - A_DELETE_COPY(ItemAmountWindow); + A_DELETE_COPY(ItemAmountWindow) /** * Called when receiving actions from widget. diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 4d2d2468d..22fd20e79 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -52,7 +52,7 @@ class ItemPopup final : public Popup */ ItemPopup(); - A_DELETE_COPY(ItemPopup); + A_DELETE_COPY(ItemPopup) /** * Destructor. Cleans up the item popup on deletion. diff --git a/src/gui/killstats.h b/src/gui/killstats.h index f0fbab9ab..3576f84be 100644 --- a/src/gui/killstats.h +++ b/src/gui/killstats.h @@ -47,7 +47,7 @@ class KillStats final : public Window, */ KillStats(); - A_DELETE_COPY(KillStats); + A_DELETE_COPY(KillStats) /** * Destructor. diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index f155d7293..8100bbb5b 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -63,7 +63,7 @@ class UpdateTypeModel final : public gcn::ListModel UpdateTypeModel() { } - A_DELETE_COPY(UpdateTypeModel); + A_DELETE_COPY(UpdateTypeModel) virtual ~UpdateTypeModel() { } @@ -91,7 +91,7 @@ class UpdateListModel final : public gcn::ListModel { } - A_DELETE_COPY(UpdateListModel); + A_DELETE_COPY(UpdateListModel) virtual ~UpdateListModel() { } diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h index d8df0d805..8cc94df04 100644 --- a/src/gui/logindialog.h +++ b/src/gui/logindialog.h @@ -62,7 +62,7 @@ class LoginDialog final : public Window, public gcn::ActionListener, LoginDialog(LoginData *const data, std::string serverName, std::string *const updateHost); - A_DELETE_COPY(LoginDialog); + A_DELETE_COPY(LoginDialog) ~LoginDialog(); diff --git a/src/gui/minimap.h b/src/gui/minimap.h index c744f2af2..78ca0b675 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -43,7 +43,7 @@ class Minimap final : public Window public: Minimap(); - A_DELETE_COPY(Minimap); + A_DELETE_COPY(Minimap) ~Minimap(); diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index 4d2693ddc..36acb7fb9 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -48,7 +48,7 @@ class MiniStatusWindow final : public Popup, public: MiniStatusWindow(); - A_DELETE_COPY(MiniStatusWindow); + A_DELETE_COPY(MiniStatusWindow) ~MiniStatusWindow(); diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index 9a50f69c3..aa4fc00ac 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -66,7 +66,7 @@ class NpcDialog final : public Window, public gcn::ActionListener, */ NpcDialog(const int npcId); - A_DELETE_COPY(NpcDialog); + A_DELETE_COPY(NpcDialog) ~NpcDialog(); diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h index 49d8fc729..8e2bdd588 100644 --- a/src/gui/npcpostdialog.h +++ b/src/gui/npcpostdialog.h @@ -38,7 +38,7 @@ public: */ NpcPostDialog(const int npcId); - A_DELETE_COPY(NpcPostDialog); + A_DELETE_COPY(NpcPostDialog) ~NpcPostDialog(); diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h index 97642ca71..be6d73c49 100644 --- a/src/gui/okdialog.h +++ b/src/gui/okdialog.h @@ -55,7 +55,7 @@ class OkDialog final : public Window, public gcn::ActionListener const int soundEvent = DIALOG_OK, const bool modal = true, const bool showCenter = true, Window *const parent = nullptr); - A_DELETE_COPY(OkDialog); + A_DELETE_COPY(OkDialog) /** * Called when receiving actions from the widgets. diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h index cbf0a7eb3..e6e910042 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/outfitwindow.h @@ -50,7 +50,7 @@ class OutfitWindow final : public Window, private gcn::ActionListener */ OutfitWindow(); - A_DELETE_COPY(OutfitWindow); + A_DELETE_COPY(OutfitWindow) /** * Destructor. diff --git a/src/gui/palette.h b/src/gui/palette.h index e5a4b8797..8fae00d6a 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -56,7 +56,7 @@ class Palette RAINBOW }; - A_DELETE_COPY(Palette); + A_DELETE_COPY(Palette) /** * Returns the color associated with a character, if it exists. Returns diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index efbf2bbe4..9ebf8d163 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -50,7 +50,7 @@ class RenameListener final : public gcn::ActionListener public: RenameListener(); - A_DELETE_COPY(RenameListener); + A_DELETE_COPY(RenameListener) void action(const gcn::ActionEvent &event) override; @@ -70,7 +70,7 @@ class PlayerListener : public gcn::ActionListener public: PlayerListener(); - A_DELETE_COPY(PlayerListener); + A_DELETE_COPY(PlayerListener) void action(const gcn::ActionEvent &event) override; @@ -100,7 +100,7 @@ class PopupMenu final : public Popup, public LinkHandler */ PopupMenu(); - A_DELETE_COPY(PopupMenu); + A_DELETE_COPY(PopupMenu) /** * Shows the being related popup menu at the specified mouse coords. diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp index 6192ab261..25a8f24e3 100644 --- a/src/gui/questswindow.cpp +++ b/src/gui/questswindow.cpp @@ -80,7 +80,7 @@ class QuestsModel final : public ExtendedNamesModel { } - A_DELETE_COPY(QuestsModel); + A_DELETE_COPY(QuestsModel) virtual ~QuestsModel() { } diff --git a/src/gui/questswindow.h b/src/gui/questswindow.h index de7b0229a..b3c6cdbe2 100644 --- a/src/gui/questswindow.h +++ b/src/gui/questswindow.h @@ -51,7 +51,7 @@ class QuestsWindow final : public Window, public gcn::ActionListener */ QuestsWindow(); - A_DELETE_COPY(QuestsWindow); + A_DELETE_COPY(QuestsWindow) ~QuestsWindow(); diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index 05f6e0139..a47808d04 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -53,7 +53,7 @@ class QuitDialog final : public Window, public gcn::ActionListener, */ QuitDialog(QuitDialog **const pointerToMe); - A_DELETE_COPY(QuitDialog); + A_DELETE_COPY(QuitDialog) /** * Destructor diff --git a/src/gui/registerdialog.h b/src/gui/registerdialog.h index 4c9edd926..e11bc7e40 100644 --- a/src/gui/registerdialog.h +++ b/src/gui/registerdialog.h @@ -50,7 +50,7 @@ class WrongDataNoticeListener final : public gcn::ActionListener public: WrongDataNoticeListener(); - A_DELETE_COPY(WrongDataNoticeListener); + A_DELETE_COPY(WrongDataNoticeListener) void setTarget(gcn::TextField *const textField); @@ -76,7 +76,7 @@ class RegisterDialog final : public Window, public gcn::ActionListener, */ RegisterDialog(LoginData *const loginData); - A_DELETE_COPY(RegisterDialog); + A_DELETE_COPY(RegisterDialog) /** * Destructor diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index 3a8b58e96..818ef7541 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -57,7 +57,7 @@ class SDLFont final : public gcn::Font */ SDLFont(std::string filename, const int size, const int style = 0); - A_DELETE_COPY(SDLFont); + A_DELETE_COPY(SDLFont) /** * Destructor. diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index afdbd525a..6cf9df904 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -138,7 +138,7 @@ public: */ SDLInput(); - A_DELETE_COPY(SDLInput); + A_DELETE_COPY(SDLInput) /** * Pushes an SDL event. It should be called at least once per frame to diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index ec30c2d64..1c62ede42 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -64,7 +64,7 @@ class SellDialog final : public Window, */ SellDialog(std::string nick); - A_DELETE_COPY(SellDialog); + A_DELETE_COPY(SellDialog) /** * Destructor diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h index 2939a7628..0e5764865 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/serverdialog.h @@ -58,7 +58,7 @@ class ServersListModel final : public gcn::ListModel ServersListModel(ServerInfos *const servers, ServerDialog *const parent); - A_DELETE_COPY(ServersListModel); + A_DELETE_COPY(ServersListModel) /** * Used to get number of line in the list @@ -105,7 +105,7 @@ class ServerDialog : public Window, */ ServerDialog(ServerInfo *const serverInfo, const std::string &dir); - A_DELETE_COPY(ServerDialog); + A_DELETE_COPY(ServerDialog) /** * Destructor diff --git a/src/gui/setup.h b/src/gui/setup.h index 45f9d202a..ef6521700 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -51,7 +51,7 @@ class Setup final : public Window, public gcn::ActionListener public: Setup(); - A_DELETE_COPY(Setup); + A_DELETE_COPY(Setup) ~Setup(); diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 390eba2ec..ec0843a72 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -34,7 +34,7 @@ class Setup_Audio final : public SetupTabScroll public: Setup_Audio(); - A_DELETE_COPY(Setup_Audio); + A_DELETE_COPY(Setup_Audio) ~Setup_Audio(); diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h index 7937a7658..46016f656 100644 --- a/src/gui/setup_chat.h +++ b/src/gui/setup_chat.h @@ -35,7 +35,7 @@ class Setup_Chat final : public SetupTabScroll public: Setup_Chat(); - A_DELETE_COPY(Setup_Chat); + A_DELETE_COPY(Setup_Chat) void apply(); }; diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h index 3f7be10b9..407175698 100644 --- a/src/gui/setup_colors.h +++ b/src/gui/setup_colors.h @@ -47,7 +47,7 @@ class Setup_Colors final : public SetupTab, public: Setup_Colors(); - A_DELETE_COPY(Setup_Colors); + A_DELETE_COPY(Setup_Colors) ~Setup_Colors(); diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp index 7891560ee..58e34857f 100644 --- a/src/gui/setup_input.cpp +++ b/src/gui/setup_input.cpp @@ -59,7 +59,7 @@ class KeyListModel final : public gcn::ListModel { } - A_DELETE_COPY(KeyListModel); + A_DELETE_COPY(KeyListModel) /** * Returns the number of elements in container. diff --git a/src/gui/setup_input.h b/src/gui/setup_input.h index 87b09c62b..8fefe9923 100644 --- a/src/gui/setup_input.h +++ b/src/gui/setup_input.h @@ -45,7 +45,7 @@ class Setup_Input final : public SetupTab */ Setup_Input(); - A_DELETE_COPY(Setup_Input); + A_DELETE_COPY(Setup_Input) /** * Destructor diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index cab6039fc..2082414dc 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -42,7 +42,7 @@ class Setup_Joystick final : public SetupTab public: Setup_Joystick(); - A_DELETE_COPY(Setup_Joystick); + A_DELETE_COPY(Setup_Joystick) ~Setup_Joystick(); diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h index 0e541f93a..a56742f26 100644 --- a/src/gui/setup_other.h +++ b/src/gui/setup_other.h @@ -35,7 +35,7 @@ class Setup_Other final : public SetupTabScroll public: Setup_Other(); - A_DELETE_COPY(Setup_Other); + A_DELETE_COPY(Setup_Other) ~Setup_Other(); diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h index 38097bbbc..8639520a1 100644 --- a/src/gui/setup_perfomance.h +++ b/src/gui/setup_perfomance.h @@ -35,7 +35,7 @@ class Setup_Perfomance final : public SetupTabScroll public: Setup_Perfomance(); - A_DELETE_COPY(Setup_Perfomance); + A_DELETE_COPY(Setup_Perfomance) void apply(); }; diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index ca6d9019d..2f1013d70 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -35,7 +35,7 @@ class Setup_Players final : public SetupTabScroll public: Setup_Players(); - A_DELETE_COPY(Setup_Players); + A_DELETE_COPY(Setup_Players) void apply(); }; diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index ed2f995e0..4b1d79e8f 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -102,7 +102,7 @@ public: playerRelationsUpdated(); } - A_DELETE_COPY(PlayerTableModel); + A_DELETE_COPY(PlayerTableModel) virtual ~PlayerTableModel() { diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index 61bd541b9..0e663aed6 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -49,7 +49,7 @@ class Setup_Relations final : public SetupTab, public: Setup_Relations(); - A_DELETE_COPY(Setup_Relations); + A_DELETE_COPY(Setup_Relations) virtual ~Setup_Relations(); diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h index 1aceda440..31588c9c2 100644 --- a/src/gui/setup_theme.h +++ b/src/gui/setup_theme.h @@ -45,7 +45,7 @@ class Setup_Theme final : public SetupTab public: Setup_Theme(); - A_DELETE_COPY(Setup_Theme); + A_DELETE_COPY(Setup_Theme) ~Setup_Theme(); diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index f84500ebb..c0a680116 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -78,7 +78,7 @@ class ModeListModel final : public gcn::ListModel */ ModeListModel(); - A_DELETE_COPY(ModeListModel); + A_DELETE_COPY(ModeListModel) /** * Destructor. diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 9b0fec0e4..e00495655 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -49,7 +49,7 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener public: Setup_Video(); - A_DELETE_COPY(Setup_Video); + A_DELETE_COPY(Setup_Video) ~Setup_Video(); diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h index 8311cf8af..976e1c1c2 100644 --- a/src/gui/setup_visual.h +++ b/src/gui/setup_visual.h @@ -29,7 +29,7 @@ class Setup_Visual final : public SetupTabScroll public: Setup_Visual(); - A_DELETE_COPY(Setup_Visual); + A_DELETE_COPY(Setup_Visual) ~Setup_Visual(); diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index 123c8655a..11e7f5e69 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -65,7 +65,7 @@ class ShopWindow final : public Window, public gcn::ActionListener, */ ShopWindow(); - A_DELETE_COPY(ShopWindow); + A_DELETE_COPY(ShopWindow) /** * Destructor diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index 3186598cb..8a4d45188 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -48,7 +48,7 @@ class ShortcutTab final : public Tab setCaption(name); } - A_DELETE_COPY(ShortcutTab); + A_DELETE_COPY(ShortcutTab) ShortcutContainer* mContent; }; diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index ff66f794b..e87d4706e 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -48,7 +48,7 @@ class ShortcutWindow final : public Window ShortcutWindow(const std::string &title, std::string skinFile = "", const int width = 0, const int height = 0); - A_DELETE_COPY(ShortcutWindow); + A_DELETE_COPY(ShortcutWindow) /** * Destructor. diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 1f8378a87..a735bf1b4 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -99,7 +99,7 @@ class SkillListBox final : public ListBox { } - A_DELETE_COPY(SkillListBox); + A_DELETE_COPY(SkillListBox) ~SkillListBox() { @@ -196,7 +196,7 @@ class SkillTab final : public Tab setCaption(name); } - A_DELETE_COPY(SkillTab); + A_DELETE_COPY(SkillTab) ~SkillTab() { diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 1b5bb7394..ccbb20064 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -65,7 +65,7 @@ struct SkillInfo final SkillInfo(); - A_DELETE_COPY(SkillInfo); + A_DELETE_COPY(SkillInfo) ~SkillInfo(); @@ -88,7 +88,7 @@ class SkillDialog final : public Window, public gcn::ActionListener public: SkillDialog(); - A_DELETE_COPY(SkillDialog); + A_DELETE_COPY(SkillDialog) ~SkillDialog(); diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 938817b0d..bb5bba68a 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -82,7 +82,7 @@ class SortFriendsFunctor final class SocialTab : public Tab { public: - A_DELETE_COPY(SocialTab); + A_DELETE_COPY(SocialTab) virtual void invite() = 0; @@ -155,7 +155,7 @@ public: mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); } - A_DELETE_COPY(SocialGuildTab); + A_DELETE_COPY(SocialGuildTab) ~SocialGuildTab() { @@ -261,7 +261,7 @@ public: mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); } - A_DELETE_COPY(SocialGuildTab2); + A_DELETE_COPY(SocialGuildTab2) ~SocialGuildTab2() { @@ -323,7 +323,7 @@ public: mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); } - A_DELETE_COPY(SocialPartyTab); + A_DELETE_COPY(SocialPartyTab) ~SocialPartyTab() { @@ -412,7 +412,7 @@ public: { } - A_DELETE_COPY(BeingsListModal); + A_DELETE_COPY(BeingsListModal) ~BeingsListModal() { @@ -456,7 +456,7 @@ public: setCaption(name); } - A_DELETE_COPY(SocialPlayersTab); + A_DELETE_COPY(SocialPlayersTab) ~SocialPlayersTab() { @@ -624,7 +624,7 @@ public: setCaption(_("Nav")); } - A_DELETE_COPY(SocialNavigationTab); + A_DELETE_COPY(SocialNavigationTab) ~SocialNavigationTab() { @@ -962,7 +962,7 @@ public: setCaption(_("Atk")); } - A_DELETE_COPY(SocialAttackTab); + A_DELETE_COPY(SocialAttackTab) ~SocialAttackTab() { @@ -1020,7 +1020,7 @@ public: setCaption(_("Pik")); } - A_DELETE_COPY(SocialPickupTab); + A_DELETE_COPY(SocialPickupTab) ~SocialPickupTab() { @@ -1078,7 +1078,7 @@ public: setCaption(name); } - A_DELETE_COPY(SocialFriendsTab); + A_DELETE_COPY(SocialFriendsTab) ~SocialFriendsTab() { @@ -1181,7 +1181,7 @@ public: mBrowserBox->getHeight() + 8); } - A_DELETE_COPY(CreatePopup); + A_DELETE_COPY(CreatePopup) void handleLink(const std::string &link, gcn::MouseEvent *event A_UNUSED) { diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index f3c1479db..06d00b9f0 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -54,7 +54,7 @@ class SocialWindow final : public Window, private gcn::ActionListener public: SocialWindow(); - A_DELETE_COPY(SocialWindow); + A_DELETE_COPY(SocialWindow) ~SocialWindow(); diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp index 60753aa54..cead5ebb6 100644 --- a/src/gui/specialswindow.cpp +++ b/src/gui/specialswindow.cpp @@ -58,7 +58,7 @@ class SpecialEntry final : public Container public: SpecialEntry(SpecialInfo *info); - A_DELETE_COPY(SpecialEntry); + A_DELETE_COPY(SpecialEntry) void update(int current, int needed); diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h index b51606c71..c7f2e8cde 100644 --- a/src/gui/specialswindow.h +++ b/src/gui/specialswindow.h @@ -44,7 +44,7 @@ class SpecialsWindow final : public Window, public gcn::ActionListener public: SpecialsWindow(); - A_DELETE_COPY(SpecialsWindow); + A_DELETE_COPY(SpecialsWindow) ~SpecialsWindow(); diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 428210f85..2edd7819f 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -39,7 +39,7 @@ class SpeechBubble final : public Popup */ SpeechBubble(); - A_DELETE_COPY(SpeechBubble); + A_DELETE_COPY(SpeechBubble) /** * Sets the name displayed for the speech bubble, and in what color. diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h index 7e11ba53a..84f57e4af 100644 --- a/src/gui/spellpopup.h +++ b/src/gui/spellpopup.h @@ -44,7 +44,7 @@ class SpellPopup final : public Popup */ SpellPopup(); - A_DELETE_COPY(SpellPopup); + A_DELETE_COPY(SpellPopup) /** * Destructor. Cleans up the item popup on deletion. diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h index c10a0b8ea..e636812f5 100644 --- a/src/gui/statuspopup.h +++ b/src/gui/statuspopup.h @@ -51,7 +51,7 @@ class StatusPopup final : public Popup */ StatusPopup(); - A_DELETE_COPY(StatusPopup); + A_DELETE_COPY(StatusPopup) /** * Destructor. Cleans up the item popup on deletion. diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 4f287f8c2..078669bca 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -61,7 +61,7 @@ class AttrDisplay : public Container UNKNOWN }; - A_DELETE_COPY(AttrDisplay); + A_DELETE_COPY(AttrDisplay) ~AttrDisplay(); @@ -94,7 +94,7 @@ class DerDisplay final : public AttrDisplay public: DerDisplay(const int id, const std::string &name); - A_DELETE_COPY(DerDisplay); + A_DELETE_COPY(DerDisplay) virtual Type getType() const { return DERIVED; } @@ -105,7 +105,7 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener public: ChangeDisplay(const int id, const std::string &name); - A_DELETE_COPY(ChangeDisplay); + A_DELETE_COPY(ChangeDisplay) std::string update(); diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 7c3c2d564..2efc4bfb2 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -53,7 +53,7 @@ class StatusWindow final : public Window, */ StatusWindow(); - A_DELETE_COPY(StatusWindow); + A_DELETE_COPY(StatusWindow) void processEvent(Channels channel, const DepricatedEvent &event) override; diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp index 2a2c2f218..2ac8ec6d3 100644 --- a/src/gui/textcommandeditor.cpp +++ b/src/gui/textcommandeditor.cpp @@ -83,7 +83,7 @@ public: } } - A_DELETE_COPY(IconsModal); + A_DELETE_COPY(IconsModal) virtual ~IconsModal() { } diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h index 2639e2e39..fbefe5848 100644 --- a/src/gui/textcommandeditor.h +++ b/src/gui/textcommandeditor.h @@ -50,7 +50,7 @@ class TextCommandEditor final : public Window, public gcn::ActionListener */ TextCommandEditor(TextCommand *const command); - A_DELETE_COPY(TextCommandEditor); + A_DELETE_COPY(TextCommandEditor) /** * Destructor. diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h index 2cd95d1e8..7f3f7119f 100644 --- a/src/gui/textdialog.h +++ b/src/gui/textdialog.h @@ -47,7 +47,7 @@ public: TextDialog(const std::string &title, const std::string &msg, Window *const parent = nullptr, const bool isPassword = false); - A_DELETE_COPY(TextDialog); + A_DELETE_COPY(TextDialog) ~TextDialog(); diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h index 02cf89d6f..4b0fe2728 100644 --- a/src/gui/textpopup.h +++ b/src/gui/textpopup.h @@ -42,7 +42,7 @@ class TextPopup final : public Popup */ TextPopup(); - A_DELETE_COPY(TextPopup); + A_DELETE_COPY(TextPopup) /** * Destructor. Cleans up the item popup on deletion. diff --git a/src/gui/theme.h b/src/gui/theme.h index 4d99649da..651bcb9bc 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -47,7 +47,7 @@ class Skin final const int padding = 3, const int titlePadding = 4, std::map<std::string, int> *const options = nullptr); - A_DELETE_COPY(Skin); + A_DELETE_COPY(Skin) ~Skin(); @@ -130,7 +130,7 @@ class Skin final class Theme final : public Palette, public ConfigListener { public: - A_DELETE_COPY(Theme); + A_DELETE_COPY(Theme) static Theme *instance(); diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h index 8b4854b6d..e6958ab23 100644 --- a/src/gui/tradewindow.h +++ b/src/gui/tradewindow.h @@ -57,7 +57,7 @@ class TradeWindow final : public Window, */ TradeWindow(); - A_DELETE_COPY(TradeWindow); + A_DELETE_COPY(TradeWindow) /** * Destructor. diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h index 5d583a07b..5bfb70f39 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/unregisterdialog.h @@ -52,7 +52,7 @@ class UnRegisterDialog final : public Window, public gcn::ActionListener */ UnRegisterDialog(LoginData *const loginData); - A_DELETE_COPY(UnRegisterDialog); + A_DELETE_COPY(UnRegisterDialog) ~UnRegisterDialog(); diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h index 111a01f5c..d4fc1257e 100644 --- a/src/gui/updaterwindow.h +++ b/src/gui/updaterwindow.h @@ -77,7 +77,7 @@ class UpdaterWindow final : public Window, const std::string &updatesDir, const bool applyUpdates, const int updateType); - A_DELETE_COPY(UpdaterWindow); + A_DELETE_COPY(UpdaterWindow) /** * Destructor diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 20e7e0418..1242554d7 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -84,7 +84,7 @@ class UserPalette final : public Palette, public gcn::ListModel */ UserPalette(); - A_DELETE_COPY(UserPalette); + A_DELETE_COPY(UserPalette) /** * Destructor diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 89833d20e..2803b1b97 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -70,7 +70,7 @@ class Viewport final : public WindowContainer, */ Viewport(); - A_DELETE_COPY(Viewport); + A_DELETE_COPY(Viewport) /** * Destructor. diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h index d6be4d14e..677f6a156 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/whoisonline.h @@ -58,7 +58,7 @@ class OnlinePlayer final { } - A_DELETE_COPY(OnlinePlayer); + A_DELETE_COPY(OnlinePlayer) const std::string getNick() const { return mNick; } @@ -115,7 +115,7 @@ public: */ WhoIsOnline(); - A_DELETE_COPY(WhoIsOnline); + A_DELETE_COPY(WhoIsOnline) /** * Destructor diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index 84c491cd2..e79515bd4 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -48,7 +48,7 @@ class AvatarListBox final : public ListBox, public ConfigListener public: AvatarListBox(AvatarListModel *const model); - A_DELETE_COPY(AvatarListBox); + A_DELETE_COPY(AvatarListBox) ~AvatarListBox(); diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h index 83dc44499..95042c9ea 100644 --- a/src/gui/widgets/battletab.h +++ b/src/gui/widgets/battletab.h @@ -33,7 +33,7 @@ class BattleTab final : public ChatTab public: BattleTab(); - A_DELETE_COPY(BattleTab); + A_DELETE_COPY(BattleTab) ~BattleTab(); diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 7f9812a99..ec7b15585 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -84,7 +84,7 @@ class BrowserBox final : public gcn::Widget, BrowserBox(const unsigned int mode = AUTO_SIZE, const bool opaque = true); - A_DELETE_COPY(BrowserBox); + A_DELETE_COPY(BrowserBox) /** * Destructor. diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 47ba4cb1f..fbcc941ed 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -75,7 +75,7 @@ class Button final : public gcn::Button, public gcn::WidgetListener const std::string &actionEventId, gcn::ActionListener *const listener); - A_DELETE_COPY(Button); + A_DELETE_COPY(Button) /** * Destructor. diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h index d51e71511..e02da3b1e 100644 --- a/src/gui/widgets/channeltab.h +++ b/src/gui/widgets/channeltab.h @@ -33,7 +33,7 @@ class Channel; class ChannelTab final : public ChatTab { public: - A_DELETE_COPY(ChannelTab); + A_DELETE_COPY(ChannelTab) Channel *getChannel() const { return mChannel; } diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 2ab19814d..bd90e4d2e 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -55,7 +55,7 @@ class ChatTab : public Tab */ ChatTab(const std::string &name); - A_DELETE_COPY(ChatTab); + A_DELETE_COPY(ChatTab) ~ChatTab(); diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index 63569214a..654c48d62 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -44,7 +44,7 @@ class CheckBox final : public gcn::CheckBox gcn::ActionListener *const listener = nullptr, const std::string &eventId = ""); - A_DELETE_COPY(CheckBox); + A_DELETE_COPY(CheckBox) /** * Destructor. diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index 818a1f037..253f22010 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -49,7 +49,7 @@ class Desktop final : public Container, private gcn::WidgetListener public: Desktop(); - A_DELETE_COPY(Desktop); + A_DELETE_COPY(Desktop) ~Desktop(); diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 97732db9b..1dd2f5a35 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -52,7 +52,7 @@ class DropDown final : public gcn::DropDown gcn::ActionListener *const listener = nullptr, const std::string &eventId = ""); - A_DELETE_COPY(DropDown); + A_DELETE_COPY(DropDown) ~DropDown(); diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h index 8b591b3c0..74f76fdaa 100644 --- a/src/gui/widgets/dropshortcutcontainer.h +++ b/src/gui/widgets/dropshortcutcontainer.h @@ -44,7 +44,7 @@ class DropShortcutContainer final : public ShortcutContainer */ DropShortcutContainer(); - A_DELETE_COPY(DropShortcutContainer); + A_DELETE_COPY(DropShortcutContainer) /** * Destructor. diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 75b1e5a03..05fa737a4 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -45,7 +45,7 @@ class EmoteShortcutContainer final : public ShortcutContainer */ EmoteShortcutContainer(); - A_DELETE_COPY(EmoteShortcutContainer); + A_DELETE_COPY(EmoteShortcutContainer) /** * Destructor. diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h index ac6c767c3..87e4ffde0 100644 --- a/src/gui/widgets/extendedlistbox.h +++ b/src/gui/widgets/extendedlistbox.h @@ -31,7 +31,7 @@ class ExtendedListBox final : public ListBox */ ExtendedListBox(gcn::ListModel *const listModel); - A_DELETE_COPY(ExtendedListBox); + A_DELETE_COPY(ExtendedListBox) ~ExtendedListBox(); diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h index 52f162edb..3078f977f 100644 --- a/src/gui/widgets/extendednamesmodel.h +++ b/src/gui/widgets/extendednamesmodel.h @@ -32,7 +32,7 @@ class ExtendedNamesModel : public ExtendedListModel public: ExtendedNamesModel(); - A_DELETE_COPY(ExtendedNamesModel); + A_DELETE_COPY(ExtendedNamesModel) virtual ~ExtendedNamesModel(); diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index 526bec6ff..a56b0e2e8 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -42,7 +42,7 @@ class FlowContainer final : public Container, */ FlowContainer(const int boxWidth, const int boxHeight); - A_DELETE_COPY(FlowContainer); + A_DELETE_COPY(FlowContainer) /** * Destructor. diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h index 4981ad41e..74a1d0949 100644 --- a/src/gui/widgets/guildchattab.h +++ b/src/gui/widgets/guildchattab.h @@ -33,7 +33,7 @@ class GuildChatTab final : public ChatTab public: GuildChatTab(); - A_DELETE_COPY(GuildChatTab); + A_DELETE_COPY(GuildChatTab) ~GuildChatTab(); diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index d00ff287b..18e7c37d7 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -45,7 +45,7 @@ public: GuiTableActionListener(GuiTable *_table, gcn::Widget *_widget, int _row, int _column); - A_DELETE_COPY(GuiTableActionListener); + A_DELETE_COPY(GuiTableActionListener) virtual ~GuiTableActionListener(); diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 5953348fc..edbaecef3 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -56,7 +56,7 @@ public: GuiTable(TableModel *const initial_model = nullptr, const bool opacity = true); - A_DELETE_COPY(GuiTable); + A_DELETE_COPY(GuiTable) virtual ~GuiTable(); diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index 48c1eaa84..7730c9bcf 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -38,7 +38,7 @@ class HorizontContainer final : public Container, public gcn::WidgetListener public: HorizontContainer(const int height, const int spacing); - A_DELETE_COPY(HorizontContainer); + A_DELETE_COPY(HorizontContainer) virtual void add(gcn::Widget *widget); diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index 97de87d25..d04b12d4a 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -47,7 +47,7 @@ class Icon final : public gcn::Widget */ Icon(Image *const image); - A_DELETE_COPY(Icon); + A_DELETE_COPY(Icon) /** * Gets the current Image. diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h index e846e0cbe..d2191433e 100644 --- a/src/gui/widgets/inttextfield.h +++ b/src/gui/widgets/inttextfield.h @@ -37,7 +37,7 @@ class IntTextField final : public TextField IntTextField(const int def = 0, const int min = 0, const int max = 0, const bool enabled = true, const int width = 0); - A_DELETE_COPY(IntTextField); + A_DELETE_COPY(IntTextField) /** * Sets the minimum and maximum values of the text box. diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 419f23632..f2c6163d2 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -65,7 +65,7 @@ class ItemContainer final : public gcn::Widget, ItemContainer(Inventory *const inventory, const bool forceQuantity = false); - A_DELETE_COPY(ItemContainer); + A_DELETE_COPY(ItemContainer) /** * Destructor. diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h index 329bdeb80..dede39db1 100644 --- a/src/gui/widgets/itemlinkhandler.h +++ b/src/gui/widgets/itemlinkhandler.h @@ -34,7 +34,7 @@ class ItemLinkHandler final : public LinkHandler public: ItemLinkHandler(); - A_DELETE_COPY(ItemLinkHandler); + A_DELETE_COPY(ItemLinkHandler) ~ItemLinkHandler(); diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 9b8bfe797..18a5c020f 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -45,7 +45,7 @@ class ItemShortcutContainer final : public ShortcutContainer */ ItemShortcutContainer(const unsigned number); - A_DELETE_COPY(ItemShortcutContainer); + A_DELETE_COPY(ItemShortcutContainer) /** * Destructor. diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 51dcb632b..09f193436 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -48,7 +48,7 @@ class Label final : public gcn::Label */ Label(const std::string &caption); - A_DELETE_COPY(Label); + A_DELETE_COPY(Label) ~Label(); diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index f5dab2d33..895cf6019 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -336,7 +336,7 @@ class Layout final : public LayoutCell public: Layout(); - A_DELETE_COPY(Layout); + A_DELETE_COPY(Layout) /** * Sets the margin around the layout. diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index 72402f630..75443d8ac 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -40,7 +40,7 @@ class LayoutHelper final : public gcn::WidgetListener */ LayoutHelper(gcn::Container *const container); - A_DELETE_COPY(LayoutHelper); + A_DELETE_COPY(LayoutHelper) /** * Destructor. diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 5ba710987..e3976454d 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -44,7 +44,7 @@ class ListBox : public gcn::ListBox */ ListBox(gcn::ListModel *const listModel); - A_DELETE_COPY(ListBox); + A_DELETE_COPY(ListBox) ~ListBox(); diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h index 47248e246..9138f90ce 100644 --- a/src/gui/widgets/namesmodel.h +++ b/src/gui/widgets/namesmodel.h @@ -32,7 +32,7 @@ class NamesModel : public gcn::ListModel public: NamesModel(); - A_DELETE_COPY(NamesModel); + A_DELETE_COPY(NamesModel) virtual ~NamesModel(); diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h index b5b2c4e53..55b884b4f 100644 --- a/src/gui/widgets/passwordfield.h +++ b/src/gui/widgets/passwordfield.h @@ -38,7 +38,7 @@ class PasswordField final : public TextField */ PasswordField(const std::string &text = ""); - A_DELETE_COPY(PasswordField); + A_DELETE_COPY(PasswordField) /** * Draws the password field. diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 4ae3c8866..5f9d3c54a 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -49,7 +49,7 @@ class PlayerBox final : public gcn::ScrollArea PlayerBox(std::string skin = ""); - A_DELETE_COPY(PlayerBox); + A_DELETE_COPY(PlayerBox) /** * Destructor. diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 26e73c183..d798966fd 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -60,7 +60,7 @@ class Popup : public Container, public gcn::MouseListener, */ Popup(const std::string &name = "", std::string skin = ""); - A_DELETE_COPY(Popup); + A_DELETE_COPY(Popup) /** * Destructor. Deletes all the added widgets. diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index 0039b245b..d306f58cb 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -51,7 +51,7 @@ class ProgressBar final : public gcn::Widget, public gcn::WidgetListener const int width = 40, const int height = 7, const int color = -1); - A_DELETE_COPY(ProgressBar); + A_DELETE_COPY(ProgressBar) ~ProgressBar(); diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h index 1a9b91529..d96cc8f8c 100644 --- a/src/gui/widgets/progressindicator.h +++ b/src/gui/widgets/progressindicator.h @@ -37,7 +37,7 @@ class ProgressIndicator final : public gcn::Widget public: ProgressIndicator(); - A_DELETE_COPY(ProgressIndicator); + A_DELETE_COPY(ProgressIndicator) ~ProgressIndicator(); diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index af73e7e75..7728d094e 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -41,7 +41,7 @@ class RadioButton final : public gcn::RadioButton RadioButton(const std::string &caption, const std::string &group, const bool marked = false); - A_DELETE_COPY(RadioButton); + A_DELETE_COPY(RadioButton) /** * Destructor. diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h index 008570faf..cdc9d8d0b 100644 --- a/src/gui/widgets/radiogroup.h +++ b/src/gui/widgets/radiogroup.h @@ -31,7 +31,7 @@ class RadioGroup final : public WidgetGroup RadioGroup(const std::string &group, const int height, const int spacing); - A_DELETE_COPY(RadioGroup); + A_DELETE_COPY(RadioGroup) gcn::Widget *createWidget(const std::string &name) override; }; diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 4ce1499b5..c457afc8a 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -58,7 +58,7 @@ class ScrollArea final : public gcn::ScrollArea, public gcn::WidgetListener ScrollArea(gcn::Widget *const widget, const bool opaque = true, const std::string &skin = ""); - A_DELETE_COPY(ScrollArea); + A_DELETE_COPY(ScrollArea) /** * Destructor. Also deletes the content. diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 4c843eebd..13540386f 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -69,7 +69,7 @@ class SetupItem : public gcn::ActionListener std::string eventName, std::string def, const bool mainConfig); - A_DELETE_COPY(SetupItem); + A_DELETE_COPY(SetupItem) ~SetupItem(); @@ -144,7 +144,7 @@ class SetupItemCheckBox final : public SetupItem std::string eventName, std::string def, const bool mainConfig = true); - A_DELETE_COPY(SetupItemCheckBox); + A_DELETE_COPY(SetupItemCheckBox) ~SetupItemCheckBox(); @@ -171,7 +171,7 @@ class SetupItemTextField final : public SetupItem std::string eventName, std::string def, const bool mainConfig = true); - A_DELETE_COPY(SetupItemTextField); + A_DELETE_COPY(SetupItemTextField) ~SetupItemTextField(); @@ -210,7 +210,7 @@ class SetupItemIntTextField final : public SetupItem const int min, const int max, std::string def, const bool mainConfig = true); - A_DELETE_COPY(SetupItemIntTextField); + A_DELETE_COPY(SetupItemIntTextField) ~SetupItemIntTextField(); @@ -241,7 +241,7 @@ class SetupItemLabel final : public SetupItem SetupTabScroll *const parent, const bool separator = true); - A_DELETE_COPY(SetupItemLabel); + A_DELETE_COPY(SetupItemLabel) ~SetupItemLabel(); @@ -273,7 +273,7 @@ class SetupItemDropDown final : public SetupItem std::string eventName, gcn::ListModel *const model, std::string def, const bool mainConfig = true); - A_DELETE_COPY(SetupItemDropDown); + A_DELETE_COPY(SetupItemDropDown) ~SetupItemDropDown(); @@ -308,7 +308,7 @@ class SetupItemSlider final : public SetupItem const bool onTheFly = false, const bool mainConfig = true); - A_DELETE_COPY(SetupItemSlider); + A_DELETE_COPY(SetupItemSlider) ~SetupItemSlider(); @@ -357,7 +357,7 @@ class SetupItemSlider2 final : public SetupItem const bool mainConfig = true, const bool doNotAlign = false); - A_DELETE_COPY(SetupItemSlider2); + A_DELETE_COPY(SetupItemSlider2) ~SetupItemSlider2(); @@ -407,7 +407,7 @@ class SetupItemSliderList : public SetupItem const bool onTheFly = false, const bool mainConfig = true); - A_DELETE_COPY(SetupItemSliderList); + A_DELETE_COPY(SetupItemSliderList) ~SetupItemSliderList(); @@ -441,7 +441,7 @@ class SetupItemSound final : public SetupItemSliderList const int width = 150, const bool onTheFly = false, const bool mainConfig = true); - A_DELETE_COPY(SetupItemSound); + A_DELETE_COPY(SetupItemSound) void action(const gcn::ActionEvent &event) override; diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h index 08da2dd67..caec8ab3f 100644 --- a/src/gui/widgets/setuptab.h +++ b/src/gui/widgets/setuptab.h @@ -39,7 +39,7 @@ class SetupTab : public Container, public gcn::ActionListener public: SetupTab(); - A_DELETE_COPY(SetupTab); + A_DELETE_COPY(SetupTab) const std::string &getName() const { return mName; } diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h index edc324306..9e974cbe5 100644 --- a/src/gui/widgets/setuptabscroll.h +++ b/src/gui/widgets/setuptabscroll.h @@ -37,7 +37,7 @@ class SetupTabScroll : public SetupTab public: SetupTabScroll(); - A_DELETE_COPY(SetupTabScroll); + A_DELETE_COPY(SetupTabScroll) ~SetupTabScroll(); diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h index dc0b5cbf1..5a9e36151 100644 --- a/src/gui/widgets/shopitems.h +++ b/src/gui/widgets/shopitems.h @@ -52,7 +52,7 @@ class ShopItems final : public gcn::ListModel */ ShopItems(const bool mergeDuplicates = false); - A_DELETE_COPY(ShopItems); + A_DELETE_COPY(ShopItems) ~ShopItems(); diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index 87885064e..d5d649e8b 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -49,7 +49,7 @@ class ShopListBox final : public ListBox ShopListBox(gcn::ListModel *const listModel, ShopItems *const shopListModel); - A_DELETE_COPY(ShopListBox); + A_DELETE_COPY(ShopListBox) /** * Draws the list box. diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 02d22a283..62e06db58 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -46,7 +46,7 @@ class ShortcutContainer : public gcn::Widget, */ ShortcutContainer(); - A_DELETE_COPY(ShortcutContainer); + A_DELETE_COPY(ShortcutContainer) /** * Destructor. diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index 9dfd53a1b..fafa6c4cd 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -48,7 +48,7 @@ class Slider final : public gcn::Slider */ Slider(const double scaleStart, const double scaleEnd); - A_DELETE_COPY(Slider); + A_DELETE_COPY(Slider) /** * Destructor. diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h index 349ac5b86..3295a87cd 100644 --- a/src/gui/widgets/sliderlist.h +++ b/src/gui/widgets/sliderlist.h @@ -41,7 +41,7 @@ class SliderList final : public Container, gcn::ActionListener *const listener = nullptr, std::string eventId = ""); - A_DELETE_COPY(SliderList); + A_DELETE_COPY(SliderList) ~SliderList(); diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h index f18d76c21..6e0de1c6a 100644 --- a/src/gui/widgets/spellshortcutcontainer.h +++ b/src/gui/widgets/spellshortcutcontainer.h @@ -44,7 +44,7 @@ class SpellShortcutContainer final : public ShortcutContainer */ SpellShortcutContainer(const unsigned number); - A_DELETE_COPY(SpellShortcutContainer); + A_DELETE_COPY(SpellShortcutContainer) /** * Destructor. diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index c41864e6c..fd3353707 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -50,7 +50,7 @@ class Tab : public gcn::BasicContainer, public: Tab(); - A_DELETE_COPY(Tab); + A_DELETE_COPY(Tab) ~Tab(); diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 6fe8066a2..e27f879f7 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -49,7 +49,7 @@ class TabbedArea final : public gcn::ActionListener, */ TabbedArea(); - A_DELETE_COPY(TabbedArea); + A_DELETE_COPY(TabbedArea) ~TabbedArea(); diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h index ecc922dc7..6fa820467 100644 --- a/src/gui/widgets/tablemodel.h +++ b/src/gui/widgets/tablemodel.h @@ -110,7 +110,7 @@ class StaticTableModel final : public TableModel public: StaticTableModel(const int width, const int height); - A_DELETE_COPY(StaticTableModel); + A_DELETE_COPY(StaticTableModel) virtual ~StaticTableModel(); diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h index 4b297a016..2524b95e8 100644 --- a/src/gui/widgets/tabstrip.h +++ b/src/gui/widgets/tabstrip.h @@ -34,7 +34,7 @@ class TabStrip final : public WidgetGroup TabStrip(const int height, const int spacing = 0); - A_DELETE_COPY(TabStrip); + A_DELETE_COPY(TabStrip) gcn::Widget *createWidget(const std::string &name) override; diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index e854fac1a..300a9d771 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -42,7 +42,7 @@ class TextBox final : public gcn::TextBox */ TextBox(); - A_DELETE_COPY(TextBox); + A_DELETE_COPY(TextBox) /** * Sets the text after wrapping it to the current width of the widget. diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 205cb3fe3..f231dfb77 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -47,7 +47,7 @@ class TextField : public gcn::TextField std::string eventId = "", const bool sendAlwaysEvents = false); - A_DELETE_COPY(TextField); + A_DELETE_COPY(TextField) ~TextField(); diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h index 401cdbb8b..e9b23006d 100644 --- a/src/gui/widgets/textpreview.h +++ b/src/gui/widgets/textpreview.h @@ -37,7 +37,7 @@ class TextPreview final : public gcn::Widget public: TextPreview(const std::string &text); - A_DELETE_COPY(TextPreview); + A_DELETE_COPY(TextPreview) /** * Sets the color the text is printed in. diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h index 1609fe997..79f9a5d0c 100644 --- a/src/gui/widgets/tradetab.h +++ b/src/gui/widgets/tradetab.h @@ -33,7 +33,7 @@ class TradeTab final : public ChatTab public: TradeTab(); - A_DELETE_COPY(TradeTab); + A_DELETE_COPY(TradeTab) ~TradeTab(); diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 50eb54ffd..f81fdc90b 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -41,7 +41,7 @@ class VertContainer final : public Container, public gcn::WidgetListener VertContainer(const int verticalItemSize, const bool resizable = true, const int leftSpacing = 0); - A_DELETE_COPY(VertContainer); + A_DELETE_COPY(VertContainer) virtual void add2(gcn::Widget *const widget, const bool resizable, const int spacing = -1); diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h index 05def5818..d97c961e4 100644 --- a/src/gui/widgets/whispertab.h +++ b/src/gui/widgets/whispertab.h @@ -33,7 +33,7 @@ class Channel; class WhisperTab final : public ChatTab { public: - A_DELETE_COPY(WhisperTab); + A_DELETE_COPY(WhisperTab) const std::string &getNick() const { return mNick; } diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h index 6c53c3fda..7f1b7c8d5 100644 --- a/src/gui/widgets/widgetgroup.h +++ b/src/gui/widgets/widgetgroup.h @@ -36,7 +36,7 @@ class WidgetGroup : public Container, WidgetGroup(const std::string &group, const int height, const int spacing); - A_DELETE_COPY(WidgetGroup); + A_DELETE_COPY(WidgetGroup) virtual void addButton(std::string tag); diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index f97662534..00a72660e 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -61,7 +61,7 @@ class Window : public gcn::Window, private gcn::WidgetListener Window(const std::string &caption = "Window", const bool modal = false, Window *const parent = nullptr, std::string skin = ""); - A_DELETE_COPY(Window); + A_DELETE_COPY(Window) /** * Destructor. Deletes all the added widgets. diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index a6d55de68..63fae9215 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -53,7 +53,7 @@ class WindowMenu final : public Container, public: WindowMenu(); - A_DELETE_COPY(WindowMenu); + A_DELETE_COPY(WindowMenu) ~WindowMenu(); diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp index d6e1abfb2..b2b8b0bd5 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/worldselectdialog.cpp @@ -54,7 +54,7 @@ class WorldListModel final : public gcn::ListModel { } - A_DELETE_COPY(WorldListModel); + A_DELETE_COPY(WorldListModel) virtual ~WorldListModel() { } diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h index fb405616f..ce238cb0e 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/worldselectdialog.h @@ -58,7 +58,7 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener, */ WorldSelectDialog(Worlds worlds); - A_DELETE_COPY(WorldSelectDialog); + A_DELETE_COPY(WorldSelectDialog) /** * Destructor. diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp index 5df1fafd2..9c1a22b2e 100644 --- a/src/guichan/include/guichan/basiccontainer.hpp +++ b/src/guichan/include/guichan/basiccontainer.hpp @@ -69,7 +69,7 @@ namespace gcn BasicContainer() { } - A_DELETE_COPY(BasicContainer); + A_DELETE_COPY(BasicContainer) /** * Destructor diff --git a/src/guichan/include/guichan/event.hpp b/src/guichan/include/guichan/event.hpp index f6cfe55d1..c6afee48c 100644 --- a/src/guichan/include/guichan/event.hpp +++ b/src/guichan/include/guichan/event.hpp @@ -70,7 +70,7 @@ namespace gcn */ Event(Widget *const source); - A_DELETE_COPY(Event); + A_DELETE_COPY(Event) /** * Destructor. diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp index ef600c511..716f3966a 100644 --- a/src/guichan/include/guichan/focushandler.hpp +++ b/src/guichan/include/guichan/focushandler.hpp @@ -77,7 +77,7 @@ namespace gcn */ FocusHandler(); - A_DELETE_COPY(FocusHandler); + A_DELETE_COPY(FocusHandler) /** * Destructor. diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp index 0a45d0cb8..291e01766 100644 --- a/src/guichan/include/guichan/graphics.hpp +++ b/src/guichan/include/guichan/graphics.hpp @@ -110,7 +110,7 @@ namespace gcn */ Graphics(); - A_DELETE_COPY(Graphics); + A_DELETE_COPY(Graphics) /** * Destructor. diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp index 092e5c0fa..782983dd4 100644 --- a/src/guichan/include/guichan/gui.hpp +++ b/src/guichan/include/guichan/gui.hpp @@ -103,7 +103,7 @@ namespace gcn */ Gui(); - A_DELETE_COPY(Gui); + A_DELETE_COPY(Gui) /** * Destructor. diff --git a/src/guichan/include/guichan/sdl/sdlgraphics.hpp b/src/guichan/include/guichan/sdl/sdlgraphics.hpp index 08532939b..092d58de3 100644 --- a/src/guichan/include/guichan/sdl/sdlgraphics.hpp +++ b/src/guichan/include/guichan/sdl/sdlgraphics.hpp @@ -71,7 +71,7 @@ namespace gcn */ SDLGraphics(); - A_DELETE_COPY(SDLGraphics); + A_DELETE_COPY(SDLGraphics) /** * Sets the target SDL_Surface to draw to. The target can be any diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp index 87d2868c3..26aef1d0d 100644 --- a/src/guichan/include/guichan/widget.hpp +++ b/src/guichan/include/guichan/widget.hpp @@ -90,7 +90,7 @@ namespace gcn */ Widget(); - A_DELETE_COPY(Widget); + A_DELETE_COPY(Widget) /** * Default destructor. diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp index 5c1b94443..90877cb17 100644 --- a/src/guichan/include/guichan/widgets/button.hpp +++ b/src/guichan/include/guichan/widgets/button.hpp @@ -85,7 +85,7 @@ namespace gcn */ Button(const std::string& caption); - A_DELETE_COPY(Button); + A_DELETE_COPY(Button) /** * Sets the caption of the button. It's advisable to call diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp index 68cf949d0..d59eb44a2 100644 --- a/src/guichan/include/guichan/widgets/checkbox.hpp +++ b/src/guichan/include/guichan/widgets/checkbox.hpp @@ -83,7 +83,7 @@ namespace gcn */ CheckBox(const std::string &caption, bool selected = false); - A_DELETE_COPY(CheckBox); + A_DELETE_COPY(CheckBox) /** * Destructor. diff --git a/src/guichan/include/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp index ed955dc2c..0bdec632c 100644 --- a/src/guichan/include/guichan/widgets/dropdown.hpp +++ b/src/guichan/include/guichan/widgets/dropdown.hpp @@ -99,7 +99,7 @@ namespace gcn ScrollArea *const scrollArea = nullptr, ListBox *const listBox = nullptr); - A_DELETE_COPY(DropDown); + A_DELETE_COPY(DropDown) /** * Destructor. diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/guichan/include/guichan/widgets/label.hpp index d5b2ed9f5..473f6e530 100644 --- a/src/guichan/include/guichan/widgets/label.hpp +++ b/src/guichan/include/guichan/widgets/label.hpp @@ -72,7 +72,7 @@ namespace gcn */ Label(const std::string& caption); - A_DELETE_COPY(Label); + A_DELETE_COPY(Label) /** * Gets the caption of the label. diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp index 2e8e56d52..b007c3b88 100644 --- a/src/guichan/include/guichan/widgets/listbox.hpp +++ b/src/guichan/include/guichan/widgets/listbox.hpp @@ -86,7 +86,7 @@ namespace gcn */ ListBox(ListModel *listModel); - A_DELETE_COPY(ListBox); + A_DELETE_COPY(ListBox) /** * Destructor. diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp index 44e1a5eab..c9acfa4f4 100644 --- a/src/guichan/include/guichan/widgets/radiobutton.hpp +++ b/src/guichan/include/guichan/widgets/radiobutton.hpp @@ -89,7 +89,7 @@ namespace gcn const std::string &group, bool selected = false); - A_DELETE_COPY(RadioButton); + A_DELETE_COPY(RadioButton) /** * Destructor. diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp index 1a116ce50..fd7461665 100644 --- a/src/guichan/include/guichan/widgets/scrollarea.hpp +++ b/src/guichan/include/guichan/widgets/scrollarea.hpp @@ -105,7 +105,7 @@ namespace gcn ScrollPolicy hPolicy, ScrollPolicy vPolicy); - A_DELETE_COPY(ScrollArea); + A_DELETE_COPY(ScrollArea) /** * Destructor. diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp index 57d517f99..44a2ea296 100644 --- a/src/guichan/include/guichan/widgets/slider.hpp +++ b/src/guichan/include/guichan/widgets/slider.hpp @@ -91,7 +91,7 @@ namespace gcn */ Slider(const double scaleStart, const double scaleEnd); - A_DELETE_COPY(Slider); + A_DELETE_COPY(Slider) /** * Destructor. diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp index 8a5f61fa7..e220bf46a 100644 --- a/src/guichan/include/guichan/widgets/textbox.hpp +++ b/src/guichan/include/guichan/widgets/textbox.hpp @@ -77,7 +77,7 @@ namespace gcn */ TextBox(const std::string& text); - A_DELETE_COPY(TextBox); + A_DELETE_COPY(TextBox) /** * Sets the text of the text box. diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp index e301b6d1f..9c2fde894 100644 --- a/src/guichan/include/guichan/widgets/textfield.hpp +++ b/src/guichan/include/guichan/widgets/textfield.hpp @@ -76,7 +76,7 @@ namespace gcn */ TextField(const std::string& text); - A_DELETE_COPY(TextField); + A_DELETE_COPY(TextField) /** * Sets the text of the text field. diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp index 68438b421..ddaf9f8ce 100644 --- a/src/guichan/include/guichan/widgets/window.hpp +++ b/src/guichan/include/guichan/widgets/window.hpp @@ -73,7 +73,7 @@ namespace gcn */ Window(const std::string& caption); - A_DELETE_COPY(Window); + A_DELETE_COPY(Window) /** * Destructor. diff --git a/src/guild.h b/src/guild.h index 5a1c13c5f..c2eee3cb4 100644 --- a/src/guild.h +++ b/src/guild.h @@ -39,7 +39,7 @@ typedef std::map<unsigned, std::string> PositionsMap; class GuildMember final : public Avatar { public: - A_DELETE_COPY(GuildMember); + A_DELETE_COPY(GuildMember) Guild *getGuild() const { return mGuild; } @@ -67,7 +67,7 @@ protected: class Guild final : public AvatarListModel { public: - A_DELETE_COPY(Guild); + A_DELETE_COPY(Guild) virtual ~Guild(); diff --git a/src/guildmanager.h b/src/guildmanager.h index c19975c9b..b8504313a 100644 --- a/src/guildmanager.h +++ b/src/guildmanager.h @@ -35,7 +35,7 @@ class GuildManager final public: GuildManager(); - A_DELETE_COPY(GuildManager); + A_DELETE_COPY(GuildManager) ~GuildManager(); diff --git a/src/imageparticle.h b/src/imageparticle.h index 8116deb62..d4f819660 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -44,7 +44,7 @@ class ImageParticle : public Particle */ ImageParticle(Map *const map, Image *const image); - A_DELETE_COPY(ImageParticle); + A_DELETE_COPY(ImageParticle) /** * Destructor. diff --git a/src/imagesprite.h b/src/imagesprite.h index 0e420a26a..0522533d7 100644 --- a/src/imagesprite.h +++ b/src/imagesprite.h @@ -33,7 +33,7 @@ class ImageSprite final : public Sprite public: ImageSprite(Image *const image); - A_DELETE_COPY(ImageSprite); + A_DELETE_COPY(ImageSprite) ~ImageSprite(); diff --git a/src/inputmanager.h b/src/inputmanager.h index 4cd2926d6..b315ec00c 100644 --- a/src/inputmanager.h +++ b/src/inputmanager.h @@ -94,7 +94,7 @@ class InputManager final public: InputManager(); - A_DELETE_COPY(InputManager); + A_DELETE_COPY(InputManager) void init(); diff --git a/src/inventory.h b/src/inventory.h index cec366b71..ff4ffa3d7 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -47,7 +47,7 @@ class InventoryListener class Inventory final { public: - A_DELETE_COPY(Inventory); + A_DELETE_COPY(Inventory) static const int NO_SLOT_INDEX = -1; /**< Slot has no index. */ diff --git a/src/item.h b/src/item.h index 05ab7d011..fd66681de 100644 --- a/src/item.h +++ b/src/item.h @@ -44,7 +44,7 @@ class Item const unsigned char color = 1, const bool equipment = false, const bool equipped = false); - A_DELETE_COPY(Item); + A_DELETE_COPY(Item) /** * Destructor. diff --git a/src/itemshortcut.h b/src/itemshortcut.h index d84a85df4..8b587cd59 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -41,7 +41,7 @@ class ItemShortcut final */ ItemShortcut(const int number); - A_DELETE_COPY(ItemShortcut); + A_DELETE_COPY(ItemShortcut) /** * Destructor. diff --git a/src/joystick.h b/src/joystick.h index b85af4077..a3a609d2f 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -69,7 +69,7 @@ class Joystick final */ Joystick(const int no); - A_DELETE_COPY(Joystick); + A_DELETE_COPY(Joystick) ~Joystick(); diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index b24cedecb..ee373911f 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -39,7 +39,7 @@ class KeyboardConfig final public: KeyboardConfig(); - A_DELETE_COPY(KeyboardConfig); + A_DELETE_COPY(KeyboardConfig) /** * Initializes the keyboard config explicitly. diff --git a/src/keyevent.h b/src/keyevent.h index ca1e2900a..dd2235cea 100644 --- a/src/keyevent.h +++ b/src/keyevent.h @@ -42,7 +42,7 @@ class KeyEvent final : public gcn::KeyEvent const int actionId, const gcn::Key& key); - A_DELETE_COPY(KeyEvent); + A_DELETE_COPY(KeyEvent) virtual ~KeyEvent(); diff --git a/src/localconsts.h b/src/localconsts.h index d4b2f5157..5bc4c6fb3 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -39,7 +39,7 @@ #define Z_NULL nullptr #define A_DELETE(func) func = delete #define A_DELETE_COPY(name) name(const name &) = delete; \ - name &operator=(const name&) = delete + name &operator=(const name&) = delete; #endif #ifdef __GNUC__ diff --git a/src/localplayer.h b/src/localplayer.h index c2082a9df..cc81c1615 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -76,7 +76,7 @@ class LocalPlayer final : public Being, */ LocalPlayer(const int id = 65535, const int subtype = 0); - A_DELETE_COPY(LocalPlayer); + A_DELETE_COPY(LocalPlayer) /** * Destructor. diff --git a/src/logger.h b/src/logger.h index f78e31ecf..1ed7473df 100644 --- a/src/logger.h +++ b/src/logger.h @@ -47,7 +47,7 @@ class Logger final */ Logger(); - A_DELETE_COPY(Logger); + A_DELETE_COPY(Logger) /** * Destructor, closes log file. @@ -66,7 +66,7 @@ struct MetaTile final parentX(0), parentY(0), blockmask(0) {} - A_DELETE_COPY(MetaTile); + A_DELETE_COPY(MetaTile) // Pathfinding members int Fcost; /**< Estimation of total path cost */ @@ -88,7 +88,7 @@ class TileAnimation final ~TileAnimation(); - A_DELETE_COPY(TileAnimation); + A_DELETE_COPY(TileAnimation) bool update(const int ticks = 1); @@ -160,7 +160,7 @@ class Map final : public Properties, public ConfigListener Map(const int width, const int height, const int tileWidth, const int tileHeight); - A_DELETE_COPY(Map); + A_DELETE_COPY(Map) /** * Destructor. diff --git a/src/maplayer.h b/src/maplayer.h index 75dba70b9..134a7ac39 100644 --- a/src/maplayer.h +++ b/src/maplayer.h @@ -46,7 +46,7 @@ class MapRowVertexes final images.reserve(30); } - A_DELETE_COPY(MapRowVertexes); + A_DELETE_COPY(MapRowVertexes) ~MapRowVertexes(); @@ -71,7 +71,7 @@ class MapObjectList final MapObjectList() { } - A_DELETE_COPY(MapObjectList); + A_DELETE_COPY(MapObjectList) std::vector<MapObject> objects; }; @@ -93,7 +93,7 @@ class MapLayer final: public ConfigListener MapLayer(const int x, const int y, const int width, const int height, const bool isFringeLayer); - A_DELETE_COPY(MapLayer); + A_DELETE_COPY(MapLayer) /** * Destructor. @@ -198,7 +198,7 @@ class SpecialLayer final SpecialLayer(const int width, const int height, const bool drawSprites = false); - A_DELETE_COPY(SpecialLayer); + A_DELETE_COPY(SpecialLayer) ~SpecialLayer(); @@ -259,7 +259,7 @@ class MapItem final MapItem(const int type, std::string comment, const int x, const int y); - A_DELETE_COPY(MapItem); + A_DELETE_COPY(MapItem) ~MapItem(); @@ -305,7 +305,7 @@ class ObjectsLayer final public: ObjectsLayer(const unsigned width, const unsigned height); - A_DELETE_COPY(ObjectsLayer); + A_DELETE_COPY(ObjectsLayer) ~ObjectsLayer(); diff --git a/src/mumblemanager.h b/src/mumblemanager.h index 21fa38e7d..f8e25974a 100644 --- a/src/mumblemanager.h +++ b/src/mumblemanager.h @@ -41,7 +41,7 @@ class MumbleManager final public: MumbleManager(); - A_DELETE_COPY(MumbleManager); + A_DELETE_COPY(MumbleManager) ~MumbleManager(); diff --git a/src/net/charhandler.h b/src/net/charhandler.h index ecaabfebb..54b7704e7 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -47,7 +47,7 @@ struct Character { } - A_DELETE_COPY(Character); + A_DELETE_COPY(Character) ~Character() { @@ -65,7 +65,7 @@ typedef std::list<Character*> Characters; class CharHandler { public: - A_DELETE_COPY(CharHandler); + A_DELETE_COPY(CharHandler) virtual ~CharHandler() { } diff --git a/src/net/download.h b/src/net/download.h index fdc048447..8931c8200 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -59,7 +59,7 @@ class Download final Download(void *ptr, const std::string &url, DownloadUpdate updateFunction, bool ignoreError = false); - A_DELETE_COPY(Download); + A_DELETE_COPY(Download) ~Download(); diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index a6c88f8c5..b17f1ffa4 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -35,7 +35,7 @@ class AdminHandler : public Net::AdminHandler AdminHandler() { } - A_DELETE_COPY(AdminHandler); + A_DELETE_COPY(AdminHandler) virtual ~AdminHandler() { } diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index f49dbb427..468368a32 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -34,7 +34,7 @@ class BeingHandler : public Net::BeingHandler public: BeingHandler(bool enableSync); - A_DELETE_COPY(BeingHandler); + A_DELETE_COPY(BeingHandler) protected: virtual void requestNameById(int id) = 0; diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 3119d5d18..ce087919f 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -39,7 +39,7 @@ class BuySellHandler : public Net::BuySellHandler public: BuySellHandler(); - A_DELETE_COPY(BuySellHandler); + A_DELETE_COPY(BuySellHandler) virtual void requestSellList(std::string nick); diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index b2cbd3044..f84d2634e 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -40,7 +40,7 @@ class CharServerHandler : public Net::CharHandler public: CharServerHandler(); - A_DELETE_COPY(CharServerHandler); + A_DELETE_COPY(CharServerHandler) virtual void setCharSelectDialog(CharSelectDialog *window); diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index f7bf0e861..e326f9a8b 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -38,7 +38,7 @@ class ChatHandler : public Net::ChatHandler public: ChatHandler(); - A_DELETE_COPY(ChatHandler); + A_DELETE_COPY(ChatHandler) virtual void talk(const std::string &text) = 0; diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 89546301b..186bbaa3c 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -37,7 +37,7 @@ class GameHandler : public Net::GameHandler, public Listener public: GameHandler(); - A_DELETE_COPY(GameHandler); + A_DELETE_COPY(GameHandler) virtual void processEvent(Channels channel, const DepricatedEvent &event) override; diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index 986231cd3..58f94e4d3 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -36,7 +36,7 @@ class GuildTab : public ChatTab public: GuildTab(); - A_DELETE_COPY(GuildTab); + A_DELETE_COPY(GuildTab) ~GuildTab(); diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index e80840dc5..8104217ee 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -36,7 +36,7 @@ class PartyTab : public ChatTab public: PartyTab(); - A_DELETE_COPY(PartyTab); + A_DELETE_COPY(PartyTab) ~PartyTab(); diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index e518a290e..dd326608e 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -35,7 +35,7 @@ class GuildHandler : public Net::GuildHandler public: GuildHandler(); - A_DELETE_COPY(GuildHandler); + A_DELETE_COPY(GuildHandler) ~GuildHandler(); diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index cd56dd31f..80ddcc25f 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -46,7 +46,7 @@ class EquipBackend : public Equipment::Backend memset(mEquipment, -1, sizeof(mEquipment)); } - A_DELETE_COPY(EquipBackend); + A_DELETE_COPY(EquipBackend) Item *getEquipment(int index) const { @@ -142,7 +142,7 @@ class InventoryHandler : public Net::InventoryHandler InventoryHandler(); - A_DELETE_COPY(InventoryHandler); + A_DELETE_COPY(InventoryHandler) ~InventoryHandler(); diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index c5193dda6..0fa682377 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -34,7 +34,7 @@ class ItemHandler public: ItemHandler(); - A_DELETE_COPY(ItemHandler); + A_DELETE_COPY(ItemHandler) void processItemVisible(Net::MessageIn &msg); diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 02789a999..bd527418b 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -41,7 +41,7 @@ class LoginHandler : public Net::LoginHandler public: LoginHandler(); - A_DELETE_COPY(LoginHandler); + A_DELETE_COPY(LoginHandler) ~LoginHandler(); diff --git a/src/net/ea/network.h b/src/net/ea/network.h index ab21fab37..deb770dba 100644 --- a/src/net/ea/network.h +++ b/src/net/ea/network.h @@ -42,7 +42,7 @@ class Network public: Network(); - A_DELETE_COPY(Network); + A_DELETE_COPY(Network) ~Network(); diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 93978c62e..6bd038235 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -39,7 +39,7 @@ class NpcHandler : public Net::NpcHandler public: NpcHandler(); - A_DELETE_COPY(NpcHandler); + A_DELETE_COPY(NpcHandler) void sendLetter(int npcId, const std::string &recipient, const std::string &text); diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 8c10bb71e..47ccd5016 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -38,7 +38,7 @@ class PartyHandler : public Net::PartyHandler public: PartyHandler(); - A_DELETE_COPY(PartyHandler); + A_DELETE_COPY(PartyHandler) ~PartyHandler(); diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 168bd2a89..eebb9da96 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -35,7 +35,7 @@ class PlayerHandler : public Net::PlayerHandler public: PlayerHandler(); - A_DELETE_COPY(PlayerHandler); + A_DELETE_COPY(PlayerHandler) void decreaseAttribute(int attr); diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h index fefef91b8..b951f9aab 100644 --- a/src/net/ea/specialhandler.h +++ b/src/net/ea/specialhandler.h @@ -35,7 +35,7 @@ class SpecialHandler : public Net::SpecialHandler public: SpecialHandler(); - A_DELETE_COPY(SpecialHandler); + A_DELETE_COPY(SpecialHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index a97f066ec..e669ccf4f 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -35,7 +35,7 @@ class TradeHandler : public Net::TradeHandler public: TradeHandler(); - A_DELETE_COPY(TradeHandler); + A_DELETE_COPY(TradeHandler) void removeItem(int slotNum, int amount); diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index f6a3bc961..f23e93904 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -38,7 +38,7 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler public: AdminHandler(); - A_DELETE_COPY(AdminHandler); + A_DELETE_COPY(AdminHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index f278ef72a..2851f66f3 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -38,7 +38,7 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler public: BeingHandler(bool enableSync); - A_DELETE_COPY(BeingHandler); + A_DELETE_COPY(BeingHandler) virtual void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index 337e0e8c2..736b7119a 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -37,7 +37,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler public: BuySellHandler(); - A_DELETE_COPY(BuySellHandler); + A_DELETE_COPY(BuySellHandler) virtual void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index d5362be28..952fde5f9 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -45,7 +45,7 @@ class CharServerHandler final : public MessageHandler, public: CharServerHandler(); - A_DELETE_COPY(CharServerHandler); + A_DELETE_COPY(CharServerHandler) virtual void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index 61d926240..7e79ee003 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -38,7 +38,7 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler public: ChatHandler(); - A_DELETE_COPY(ChatHandler); + A_DELETE_COPY(ChatHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index 05a61a18a..dc661157a 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -38,7 +38,7 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler public: GameHandler(); - A_DELETE_COPY(GameHandler); + A_DELETE_COPY(GameHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index f20fec9f9..0a02712b7 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -40,7 +40,7 @@ class GeneralHandler final : public MessageHandler, public: GeneralHandler(); - A_DELETE_COPY(GeneralHandler); + A_DELETE_COPY(GeneralHandler) ~GeneralHandler(); diff --git a/src/net/eathena/gui/guildtab.h b/src/net/eathena/gui/guildtab.h index e06e76cf3..e751e19ac 100644 --- a/src/net/eathena/gui/guildtab.h +++ b/src/net/eathena/gui/guildtab.h @@ -36,7 +36,7 @@ class GuildTab : public Ea::GuildTab public: GuildTab(); - A_DELETE_COPY(GuildTab); + A_DELETE_COPY(GuildTab) ~GuildTab(); }; diff --git a/src/net/eathena/gui/partytab.h b/src/net/eathena/gui/partytab.h index ba093fa2d..621ebfc9e 100644 --- a/src/net/eathena/gui/partytab.h +++ b/src/net/eathena/gui/partytab.h @@ -36,7 +36,7 @@ class PartyTab : public Ea::PartyTab public: PartyTab(); - A_DELETE_COPY(PartyTab); + A_DELETE_COPY(PartyTab) ~PartyTab(); }; diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index a1c1c5b0c..04861e9b1 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -36,7 +36,7 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler public: GuildHandler(); - A_DELETE_COPY(GuildHandler); + A_DELETE_COPY(GuildHandler) ~GuildHandler(); diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index 9291aef89..0e0bc965c 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -40,7 +40,7 @@ class InventoryHandler final : public MessageHandler, public: InventoryHandler(); - A_DELETE_COPY(InventoryHandler); + A_DELETE_COPY(InventoryHandler) ~InventoryHandler(); diff --git a/src/net/eathena/itemhandler.h b/src/net/eathena/itemhandler.h index 0c0fea12f..cd5a91ed5 100644 --- a/src/net/eathena/itemhandler.h +++ b/src/net/eathena/itemhandler.h @@ -35,7 +35,7 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler public: ItemHandler(); - A_DELETE_COPY(ItemHandler); + A_DELETE_COPY(ItemHandler) virtual void handleMessage(Net::MessageIn &msg); }; diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index de46e890a..ab7ae482a 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -41,7 +41,7 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler public: LoginHandler(); - A_DELETE_COPY(LoginHandler); + A_DELETE_COPY(LoginHandler) ~LoginHandler(); diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h index 4252ed948..652af466f 100644 --- a/src/net/eathena/messagehandler.h +++ b/src/net/eathena/messagehandler.h @@ -44,7 +44,7 @@ class MessageHandler : public Net::MessageHandler public: MessageHandler(); - A_DELETE_COPY(MessageHandler); + A_DELETE_COPY(MessageHandler) ~MessageHandler(); diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h index b2538313c..b38cd7d4e 100644 --- a/src/net/eathena/messagein.h +++ b/src/net/eathena/messagein.h @@ -46,7 +46,7 @@ class MessageIn final : public Net::MessageIn */ MessageIn(const char *data, unsigned int length); - A_DELETE_COPY(MessageIn); + A_DELETE_COPY(MessageIn) int16_t readInt16(); /**< Reads a short. */ int readInt32(); /**< Reads a long. */ diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h index 79d858c07..8a4ddb1d1 100644 --- a/src/net/eathena/messageout.h +++ b/src/net/eathena/messageout.h @@ -48,7 +48,7 @@ class MessageOut final : public Net::MessageOut */ MessageOut(short id); - A_DELETE_COPY(MessageOut); + A_DELETE_COPY(MessageOut) void writeInt16(int16_t value); /**< Writes a short. */ diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h index b9cbff28e..e66a3c642 100644 --- a/src/net/eathena/network.h +++ b/src/net/eathena/network.h @@ -48,7 +48,7 @@ class Network final : public Ea::Network public: Network(); - A_DELETE_COPY(Network); + A_DELETE_COPY(Network) ~Network(); diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index 4a98f3aa5..cc6dd499d 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -42,7 +42,7 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler public: NpcHandler(); - A_DELETE_COPY(NpcHandler); + A_DELETE_COPY(NpcHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index b9a9f9d56..2306db7ce 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -37,7 +37,7 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler public: PartyHandler(); - A_DELETE_COPY(PartyHandler); + A_DELETE_COPY(PartyHandler) ~PartyHandler(); diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index 130a22019..80d905460 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -38,7 +38,7 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler public: PlayerHandler(); - A_DELETE_COPY(PlayerHandler); + A_DELETE_COPY(PlayerHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/specialhandler.h b/src/net/eathena/specialhandler.h index 17989fae2..31d704515 100644 --- a/src/net/eathena/specialhandler.h +++ b/src/net/eathena/specialhandler.h @@ -38,7 +38,7 @@ class SpecialHandler final : public MessageHandler, public Ea::SpecialHandler public: SpecialHandler(); - A_DELETE_COPY(SpecialHandler); + A_DELETE_COPY(SpecialHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h index dcff97340..b88417a75 100644 --- a/src/net/eathena/tradehandler.h +++ b/src/net/eathena/tradehandler.h @@ -38,7 +38,7 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler public: TradeHandler(); - A_DELETE_COPY(TradeHandler); + A_DELETE_COPY(TradeHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/logindata.h b/src/net/logindata.h index 3d8a2bea3..1aed31b19 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -45,7 +45,7 @@ class LoginData final resetCharacterSlots(); } - A_DELETE_COPY(LoginData); + A_DELETE_COPY(LoginData) enum UpdateType { diff --git a/src/net/messagein.h b/src/net/messagein.h index 5713ab4ee..d8cdf96e2 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -40,7 +40,7 @@ namespace Net class MessageIn { public: - A_DELETE_COPY(MessageIn); + A_DELETE_COPY(MessageIn) /** * Returns the message ID. diff --git a/src/net/messageout.h b/src/net/messageout.h index 81f805014..2fb25d38b 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -41,7 +41,7 @@ namespace Net class MessageOut { public: - A_DELETE_COPY(MessageOut); + A_DELETE_COPY(MessageOut) virtual void writeInt8(int8_t value); /**< Writes a byte. */ diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 34d009f05..120a1a3fc 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -38,7 +38,7 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler public: AdminHandler(); - A_DELETE_COPY(AdminHandler); + A_DELETE_COPY(AdminHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 94ba5b234..8cf8f577b 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -38,7 +38,7 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler public: BeingHandler(bool enableSync); - A_DELETE_COPY(BeingHandler); + A_DELETE_COPY(BeingHandler) virtual void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index 942a00c11..a5d51aaa2 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -37,7 +37,7 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler public: BuySellHandler(); - A_DELETE_COPY(BuySellHandler); + A_DELETE_COPY(BuySellHandler) virtual void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 61cf6333d..a907bb33f 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -45,7 +45,7 @@ class CharServerHandler final : public MessageHandler, public: CharServerHandler(); - A_DELETE_COPY(CharServerHandler); + A_DELETE_COPY(CharServerHandler) virtual void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 95af1068d..e3ca9c113 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -38,7 +38,7 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler public: ChatHandler(); - A_DELETE_COPY(ChatHandler); + A_DELETE_COPY(ChatHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 117555bda..8d0c8f073 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -38,7 +38,7 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler public: GameHandler(); - A_DELETE_COPY(GameHandler); + A_DELETE_COPY(GameHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 0358b6020..3101db558 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -39,7 +39,7 @@ class GeneralHandler final : public MessageHandler, public Net::GeneralHandler, public: GeneralHandler(); - A_DELETE_COPY(GeneralHandler); + A_DELETE_COPY(GeneralHandler) ~GeneralHandler(); diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h index 5fe71f236..8757cb533 100644 --- a/src/net/tmwa/gui/guildtab.h +++ b/src/net/tmwa/gui/guildtab.h @@ -36,7 +36,7 @@ class GuildTab : public Ea::GuildTab public: GuildTab(); - A_DELETE_COPY(GuildTab); + A_DELETE_COPY(GuildTab) ~GuildTab(); }; diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h index e1a5e94b1..8431340b6 100644 --- a/src/net/tmwa/gui/partytab.h +++ b/src/net/tmwa/gui/partytab.h @@ -36,7 +36,7 @@ class PartyTab : public Ea::PartyTab public: PartyTab(); - A_DELETE_COPY(PartyTab); + A_DELETE_COPY(PartyTab) ~PartyTab(); }; diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index 8a4bae92b..4c159d55b 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -36,7 +36,7 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler public: GuildHandler(); - A_DELETE_COPY(GuildHandler); + A_DELETE_COPY(GuildHandler) ~GuildHandler(); diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index a84e43f5f..572147272 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -40,7 +40,7 @@ class InventoryHandler final : public MessageHandler, public: InventoryHandler(); - A_DELETE_COPY(InventoryHandler); + A_DELETE_COPY(InventoryHandler) ~InventoryHandler(); diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h index a66169015..75c5069e6 100644 --- a/src/net/tmwa/itemhandler.h +++ b/src/net/tmwa/itemhandler.h @@ -35,7 +35,7 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler public: ItemHandler(); - A_DELETE_COPY(ItemHandler); + A_DELETE_COPY(ItemHandler) virtual void handleMessage(Net::MessageIn &msg); }; diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index b2149caff..67afbee09 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -41,7 +41,7 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler public: LoginHandler(); - A_DELETE_COPY(LoginHandler); + A_DELETE_COPY(LoginHandler) ~LoginHandler(); diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index b5012d906..ce743d55e 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -44,7 +44,7 @@ class MessageHandler : public Net::MessageHandler public: MessageHandler(); - A_DELETE_COPY(MessageHandler); + A_DELETE_COPY(MessageHandler) ~MessageHandler(); diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index 8c5fc7c77..72ad06238 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -46,7 +46,7 @@ class MessageIn final : public Net::MessageIn */ MessageIn(const char *data, unsigned int length); - A_DELETE_COPY(MessageIn); + A_DELETE_COPY(MessageIn) int16_t readInt16(); /**< Reads a short. */ int readInt32(); /**< Reads a long. */ diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index 6ebcca8e3..20526846f 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -48,7 +48,7 @@ class MessageOut final : public Net::MessageOut */ MessageOut(short id); - A_DELETE_COPY(MessageOut); + A_DELETE_COPY(MessageOut) void writeInt16(int16_t value); /**< Writes a short. */ diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 2ec62d25c..90c48eb19 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -49,7 +49,7 @@ class Network final : public Ea::Network public: Network(); - A_DELETE_COPY(Network); + A_DELETE_COPY(Network) ~Network(); diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 3b0f29d64..de0f3382a 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -42,7 +42,7 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler public: NpcHandler(); - A_DELETE_COPY(NpcHandler); + A_DELETE_COPY(NpcHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index 3b92b7c33..65fbb047a 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -37,7 +37,7 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler public: PartyHandler(); - A_DELETE_COPY(PartyHandler); + A_DELETE_COPY(PartyHandler) ~PartyHandler(); diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index 923e3e934..6c342785c 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -38,7 +38,7 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler public: PlayerHandler(); - A_DELETE_COPY(PlayerHandler); + A_DELETE_COPY(PlayerHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h index 09e6ef362..a514f9cec 100644 --- a/src/net/tmwa/questhandler.h +++ b/src/net/tmwa/questhandler.h @@ -38,7 +38,7 @@ class QuestHandler final : public MessageHandler public: QuestHandler(); - A_DELETE_COPY(QuestHandler); + A_DELETE_COPY(QuestHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h index 9213f270f..567ddc250 100644 --- a/src/net/tmwa/specialhandler.h +++ b/src/net/tmwa/specialhandler.h @@ -38,7 +38,7 @@ class SpecialHandler final : public MessageHandler, public Ea::SpecialHandler public: SpecialHandler(); - A_DELETE_COPY(SpecialHandler); + A_DELETE_COPY(SpecialHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index c16172a83..adaa8c0b1 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -38,7 +38,7 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler public: TradeHandler(); - A_DELETE_COPY(TradeHandler); + A_DELETE_COPY(TradeHandler) void handleMessage(Net::MessageIn &msg); diff --git a/src/normalopenglgraphics.h b/src/normalopenglgraphics.h index 8b773d2c4..b6a09728e 100644 --- a/src/normalopenglgraphics.h +++ b/src/normalopenglgraphics.h @@ -46,7 +46,7 @@ class NormalOpenGLGraphics final : public Graphics public: NormalOpenGLGraphics(); - A_DELETE_COPY(NormalOpenGLGraphics); + A_DELETE_COPY(NormalOpenGLGraphics) ~NormalOpenGLGraphics(); diff --git a/src/particle.h b/src/particle.h index 5d961e84c..821be8baa 100644 --- a/src/particle.h +++ b/src/particle.h @@ -80,7 +80,7 @@ class Particle : public Actor */ Particle(Map *const map); - A_DELETE_COPY(Particle); + A_DELETE_COPY(Particle) /** * Destructor. diff --git a/src/particlecontainer.h b/src/particlecontainer.h index 550cc6389..0cf90940d 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -47,7 +47,7 @@ public: ParticleContainer(ParticleContainer *const parent = nullptr, const bool delParent = true); - A_DELETE_COPY(ParticleContainer); + A_DELETE_COPY(ParticleContainer) virtual ~ParticleContainer(); @@ -81,7 +81,7 @@ public: ParticleList(ParticleContainer *const parent = nullptr, const bool delParent = true); - A_DELETE_COPY(ParticleList); + A_DELETE_COPY(ParticleList) virtual ~ParticleList(); @@ -112,7 +112,7 @@ public: ParticleVector(ParticleContainer *const parent = nullptr, const bool delParent = true); - A_DELETE_COPY(ParticleVector); + A_DELETE_COPY(ParticleVector) virtual ~ParticleVector(); diff --git a/src/party.h b/src/party.h index 0739184fc..278097eed 100644 --- a/src/party.h +++ b/src/party.h @@ -35,7 +35,7 @@ class Party; class PartyMember final : public Avatar { public: - A_DELETE_COPY(PartyMember); + A_DELETE_COPY(PartyMember) Party *getParty() const { return mParty; } @@ -58,7 +58,7 @@ protected: class Party final : public AvatarListModel { public: - A_DELETE_COPY(Party); + A_DELETE_COPY(Party) /** * Set the party's name. diff --git a/src/playerrelations.h b/src/playerrelations.h index a2f2a8d08..5df8f8ded 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -64,7 +64,7 @@ struct PlayerRelation final PlayerRelation(const Relation relation); - A_DELETE_COPY(PlayerRelation); + A_DELETE_COPY(PlayerRelation) Relation mRelation; // bitmask for all of the above }; @@ -111,7 +111,7 @@ class PlayerRelationsManager final public: PlayerRelationsManager(); - A_DELETE_COPY(PlayerRelationsManager); + A_DELETE_COPY(PlayerRelationsManager) ~PlayerRelationsManager(); diff --git a/src/resources/action.h b/src/resources/action.h index 4cfb498f1..ea1e1d195 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -37,7 +37,7 @@ class Action final public: Action(); - A_DELETE_COPY(Action); + A_DELETE_COPY(Action) ~Action(); diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h index 6c051774e..e5dac80bc 100644 --- a/src/resources/ambientlayer.h +++ b/src/resources/ambientlayer.h @@ -44,7 +44,7 @@ class AmbientLayer final const float speedX, const float speedY, const bool keepRatio = false); - A_DELETE_COPY(AmbientLayer); + A_DELETE_COPY(AmbientLayer) ~AmbientLayer(); diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h index 4976185a7..fd0beb4cd 100644 --- a/src/resources/atlasmanager.h +++ b/src/resources/atlasmanager.h @@ -42,7 +42,7 @@ struct AtlasItem { } - A_DELETE_COPY(AtlasItem); + A_DELETE_COPY(AtlasItem) Image *image; std::string name; @@ -62,7 +62,7 @@ struct TextureAtlas { } - A_DELETE_COPY(TextureAtlas); + A_DELETE_COPY(TextureAtlas) std::string name; Image *atlasImage; @@ -78,7 +78,7 @@ class AtlasResource : public Resource AtlasResource() { } - A_DELETE_COPY(AtlasResource); + A_DELETE_COPY(AtlasResource) ~AtlasResource(); @@ -94,7 +94,7 @@ class AtlasManager public: AtlasManager(); - A_DELETE_COPY(AtlasManager); + A_DELETE_COPY(AtlasManager) static AtlasResource *loadTextureAtlas(const std::string &name, const StringVect &files); diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index f5e9650c1..8f3d09001 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -49,7 +49,7 @@ struct Attack final { } - A_DELETE_COPY(Attack); + A_DELETE_COPY(Attack) }; typedef std::map<int, Attack*> Attacks; @@ -83,7 +83,7 @@ class BeingInfo final BeingInfo(); - A_DELETE_COPY(BeingInfo); + A_DELETE_COPY(BeingInfo) ~BeingInfo(); diff --git a/src/resources/dye.h b/src/resources/dye.h index 0795f1276..d3960f04c 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -47,7 +47,7 @@ class DyePalette final */ DyePalette(const std::string &pallete, const int8_t blockSize); - A_DELETE_COPY(DyePalette); + A_DELETE_COPY(DyePalette) /** * Gets a pixel color depending on its intensity. First color is @@ -104,7 +104,7 @@ class Dye final */ Dye(const std::string &dye); - A_DELETE_COPY(Dye); + A_DELETE_COPY(Dye) /** * Destroys the associated palettes. diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h index 1083980e2..6389d9ada 100644 --- a/src/resources/emotedb.h +++ b/src/resources/emotedb.h @@ -37,7 +37,7 @@ struct EmoteSprite final sprite(nullptr) { } - A_DELETE_COPY(EmoteSprite); + A_DELETE_COPY(EmoteSprite) const AnimatedSprite *sprite; std::string name; @@ -48,7 +48,7 @@ struct EmoteInfo final EmoteInfo() { } - A_DELETE_COPY(EmoteInfo); + A_DELETE_COPY(EmoteInfo) std::list<EmoteSprite*> sprites; StringVect particles; diff --git a/src/resources/image.h b/src/resources/image.h index 3374c8697..3752965bc 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -65,7 +65,7 @@ class Image : public Resource #endif public: - A_DELETE_COPY(Image); + A_DELETE_COPY(Image) /** * Destructor. diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index ddd4ace97..2d25091fd 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -46,7 +46,7 @@ class ImageHelper ImageHelper() { } - A_DELETE_COPY(ImageHelper); + A_DELETE_COPY(ImageHelper) virtual ~ImageHelper() { } diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 35a429329..b87891249 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -43,7 +43,7 @@ class ImageSet : public Resource ImageSet(Image *const img, const int w, const int h, const int margin = 0, const int spacing = 0); - A_DELETE_COPY(ImageSet); + A_DELETE_COPY(ImageSet) /** * Destructor. diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 704ad79eb..4e4e9f424 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -105,7 +105,7 @@ class ItemInfo final */ ItemInfo(); - A_DELETE_COPY(ItemInfo); + A_DELETE_COPY(ItemInfo) ~ItemInfo(); diff --git a/src/resources/music.h b/src/resources/music.h index 0e459c724..d1e3d1836 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -39,7 +39,7 @@ class Music final : public Resource mMusic(nullptr) { } - A_DELETE_COPY(Music); + A_DELETE_COPY(Music) /** * Destructor. diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h index 75a6c52ad..02641f85f 100644 --- a/src/resources/openglimagehelper.h +++ b/src/resources/openglimagehelper.h @@ -53,7 +53,7 @@ class OpenGLImageHelper final : public ImageHelper { } - A_DELETE_COPY(OpenGLImageHelper); + A_DELETE_COPY(OpenGLImageHelper) virtual ~OpenGLImageHelper() { } diff --git a/src/resources/resource.h b/src/resources/resource.h index 4df9b47a0..9f07ead75 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -51,7 +51,7 @@ class Resource { } - A_DELETE_COPY(Resource); + A_DELETE_COPY(Resource) /** * Increments the internal reference count. diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index dcd909aa7..5cf9e6e8a 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -62,7 +62,7 @@ class ResourceManager final ResourceManager(); - A_DELETE_COPY(ResourceManager); + A_DELETE_COPY(ResourceManager) /** * Destructor. Cleans up remaining resources, warning about resources diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index 3c790e7b7..ab91825b3 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -43,7 +43,7 @@ class SDLImageHelper final : public ImageHelper SDLImageHelper() { } - A_DELETE_COPY(SDLImageHelper); + A_DELETE_COPY(SDLImageHelper) virtual ~SDLImageHelper() { } diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 229977c2a..8c30aed48 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -35,7 +35,7 @@ class SoundEffect final : public Resource { public: - A_DELETE_COPY(SoundEffect); + A_DELETE_COPY(SoundEffect) /** * Destructor. diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h index 9a01cf7d2..725542a29 100644 --- a/src/resources/specialdb.h +++ b/src/resources/specialdb.h @@ -40,7 +40,7 @@ struct SpecialInfo final rechargeCurrent(0) { } - A_DELETE_COPY(SpecialInfo); + A_DELETE_COPY(SpecialInfo) enum TargetMode { diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 09e5171e4..58ac6cfe9 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -49,7 +49,7 @@ struct SpriteReference final { } - A_DELETE_COPY(SpriteReference); + A_DELETE_COPY(SpriteReference) std::string sprite; int variant; @@ -112,7 +112,7 @@ enum SpriteDirection class SpriteDef final : public Resource { public: - A_DELETE_COPY(SpriteDef); + A_DELETE_COPY(SpriteDef) /** * Loads a sprite definition file. diff --git a/src/resources/subimage.h b/src/resources/subimage.h index c30b39177..47d8476cb 100644 --- a/src/resources/subimage.h +++ b/src/resources/subimage.h @@ -59,7 +59,7 @@ class SubImage final : public Image const int texWidth, const int textHeight); #endif - A_DELETE_COPY(SubImage); + A_DELETE_COPY(SubImage) /** * Destructor. diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h index 5e537c21d..a7a4a139c 100644 --- a/src/rotationalparticle.h +++ b/src/rotationalparticle.h @@ -39,7 +39,7 @@ class RotationalParticle final : public ImageParticle RotationalParticle(Map *const map, const XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); - A_DELETE_COPY(RotationalParticle); + A_DELETE_COPY(RotationalParticle) ~RotationalParticle(); diff --git a/src/safeopenglgraphics.h b/src/safeopenglgraphics.h index 83ccc25cb..44c15545f 100644 --- a/src/safeopenglgraphics.h +++ b/src/safeopenglgraphics.h @@ -41,7 +41,7 @@ class SafeOpenGLGraphics final : public Graphics public: SafeOpenGLGraphics(); - A_DELETE_COPY(SafeOpenGLGraphics); + A_DELETE_COPY(SafeOpenGLGraphics) ~SafeOpenGLGraphics(); diff --git a/src/shopitem.h b/src/shopitem.h index 25a5a0da3..f42f9ca9c 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -57,7 +57,7 @@ class ShopItem final : public Item */ ShopItem(const int id, const unsigned char color, const int price); - A_DELETE_COPY(ShopItem); + A_DELETE_COPY(ShopItem) /** * Destructor. diff --git a/src/simpleanimation.h b/src/simpleanimation.h index fb2ba1136..8a68f478f 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -52,7 +52,7 @@ class SimpleAnimation final SimpleAnimation(const XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); - A_DELETE_COPY(SimpleAnimation); + A_DELETE_COPY(SimpleAnimation) ~SimpleAnimation(); diff --git a/src/sound.h b/src/sound.h index 21a17a770..eb81bf028 100644 --- a/src/sound.h +++ b/src/sound.h @@ -53,7 +53,7 @@ class Sound final : public ConfigListener public: Sound(); - A_DELETE_COPY(Sound); + A_DELETE_COPY(Sound) ~Sound(); diff --git a/src/spellmanager.h b/src/spellmanager.h index 2f7e5167d..d232c4408 100644 --- a/src/spellmanager.h +++ b/src/spellmanager.h @@ -38,7 +38,7 @@ class SpellManager final public: SpellManager(); - A_DELETE_COPY(SpellManager); + A_DELETE_COPY(SpellManager) ~SpellManager(); diff --git a/src/spellshortcut.h b/src/spellshortcut.h index e28b6d6f3..d4c77023b 100644 --- a/src/spellshortcut.h +++ b/src/spellshortcut.h @@ -38,7 +38,7 @@ class SpellShortcut final */ SpellShortcut(); - A_DELETE_COPY(SpellShortcut); + A_DELETE_COPY(SpellShortcut) /** * Destructor. diff --git a/src/statuseffect.h b/src/statuseffect.h index 7e5f3c382..1d36ed6cd 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -33,7 +33,7 @@ class StatusEffect final public: StatusEffect(); - A_DELETE_COPY(StatusEffect); + A_DELETE_COPY(StatusEffect) ~StatusEffect(); diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h index 8bb7c99f0..ba462175d 100644 --- a/src/test/testlauncher.h +++ b/src/test/testlauncher.h @@ -36,7 +36,7 @@ class TestLauncher public: TestLauncher(std::string test); - A_DELETE_COPY(TestLauncher); + A_DELETE_COPY(TestLauncher) ~TestLauncher(); diff --git a/src/test/testmain.h b/src/test/testmain.h index e38639126..0385822dc 100644 --- a/src/test/testmain.h +++ b/src/test/testmain.h @@ -34,7 +34,7 @@ class TestMain public: TestMain(); - A_DELETE_COPY(TestMain); + A_DELETE_COPY(TestMain) int exec(const bool testAudio = true); diff --git a/src/text.h b/src/text.h index 215884e30..115713eef 100644 --- a/src/text.h +++ b/src/text.h @@ -44,7 +44,7 @@ class Text const gcn::Color *const color, const bool isSpeech = false, gcn::Font *const font = nullptr); - A_DELETE_COPY(Text); + A_DELETE_COPY(Text) /** * Destructor. The text is removed from the screen. @@ -94,7 +94,7 @@ class FlashText final : public Text const gcn::Color *const color, gcn::Font *const font = nullptr); - A_DELETE_COPY(FlashText); + A_DELETE_COPY(FlashText) /** * Remove the text from the screen diff --git a/src/textcommand.h b/src/textcommand.h index 96c0ee157..acf443588 100644 --- a/src/textcommand.h +++ b/src/textcommand.h @@ -82,7 +82,7 @@ class TextCommand final */ TextCommand(const unsigned int id); - A_DELETE_COPY(TextCommand); + A_DELETE_COPY(TextCommand) /** * Destructor. diff --git a/src/textmanager.h b/src/textmanager.h index 3afa08ea4..b16527498 100644 --- a/src/textmanager.h +++ b/src/textmanager.h @@ -41,7 +41,7 @@ class TextManager final */ TextManager(); - A_DELETE_COPY(TextManager); + A_DELETE_COPY(TextManager) /** * Destroy the manager diff --git a/src/textparticle.h b/src/textparticle.h index 2bafd7a3c..1b19c62be 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -35,7 +35,7 @@ class TextParticle final : public Particle const gcn::Color *const color, gcn::Font *const font, const bool outline = false); - A_DELETE_COPY(TextParticle); + A_DELETE_COPY(TextParticle) /** * Draws the particle image. diff --git a/src/textrenderer.h b/src/textrenderer.h index 65134bdb5..5f42f87fb 100644 --- a/src/textrenderer.h +++ b/src/textrenderer.h @@ -32,7 +32,7 @@ class TextRenderer final { public: - A_DELETE_COPY(TextRenderer); + A_DELETE_COPY(TextRenderer) /** * Renders a specified text. diff --git a/src/tileset.h b/src/tileset.h index 577fe7937..0bd2c48f2 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -43,7 +43,7 @@ class Tileset final : public ImageSet { } - A_DELETE_COPY(Tileset); + A_DELETE_COPY(Tileset) /** * Returns the first gid. diff --git a/src/units.h b/src/units.h index 85935fea6..e40c1aa6f 100644 --- a/src/units.h +++ b/src/units.h @@ -30,7 +30,7 @@ class Units final { public: - A_DELETE_COPY(Units); + A_DELETE_COPY(Units) /** * Loads and parses the units.xml file (if found). diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 3ea607029..21e1ff9c9 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -36,7 +36,7 @@ class Mutex public: Mutex(); - A_DELETE_COPY(Mutex); + A_DELETE_COPY(Mutex) ~Mutex(); diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h index d1f0a9677..bfedc2578 100644 --- a/src/utils/translation/podict.h +++ b/src/utils/translation/podict.h @@ -33,7 +33,7 @@ class PoDict final public: PoDict(std::string lang); - A_DELETE_COPY(PoDict); + A_DELETE_COPY(PoDict) ~PoDict(); diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h index a0ffc2669..1fc44adb0 100644 --- a/src/utils/translation/poparser.h +++ b/src/utils/translation/poparser.h @@ -33,7 +33,7 @@ class PoParser final public: PoParser(); - A_DELETE_COPY(PoParser); + A_DELETE_COPY(PoParser) PoDict *load(const std::string &lang, const std::string &fileName = "", diff --git a/src/utils/xml.h b/src/utils/xml.h index 4889c4a1f..cba9e0a0e 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -76,7 +76,7 @@ namespace XML */ Document(const char *const data, const int size); - A_DELETE_COPY(Document); + A_DELETE_COPY(Document) /** * Destructor. Frees the loaded XML file. |