From b2b348d4baf2891fd82635e068a4f64d2694ba6d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Oct 2012 15:15:39 +0300 Subject: Fix compilation warnings without C++11 support. --- src/gui/beingpopup.h | 2 +- src/gui/botcheckerwindow.cpp | 2 +- src/gui/botcheckerwindow.h | 2 +- src/gui/buydialog.h | 2 +- src/gui/buyselldialog.h | 2 +- src/gui/changeemaildialog.h | 2 +- src/gui/changepassworddialog.h | 2 +- src/gui/charcreatedialog.h | 2 +- src/gui/charselectdialog.cpp | 4 ++-- src/gui/charselectdialog.h | 2 +- src/gui/chatwindow.cpp | 2 +- src/gui/chatwindow.h | 2 +- src/gui/confirmdialog.h | 2 +- src/gui/connectiondialog.h | 2 +- src/gui/debugwindow.h | 10 +++++----- src/gui/didyouknowwindow.h | 2 +- src/gui/editdialog.h | 2 +- src/gui/editserverdialog.h | 2 +- src/gui/equipmentwindow.h | 4 ++-- src/gui/focushandler.h | 2 +- src/gui/gui.cpp | 2 +- src/gui/gui.h | 2 +- src/gui/helpwindow.h | 2 +- src/gui/inventorywindow.h | 2 +- src/gui/itemamountwindow.cpp | 2 +- src/gui/itemamountwindow.h | 2 +- src/gui/itempopup.h | 2 +- src/gui/killstats.h | 2 +- src/gui/logindialog.cpp | 4 ++-- src/gui/logindialog.h | 2 +- src/gui/minimap.h | 2 +- src/gui/ministatuswindow.h | 2 +- src/gui/npcdialog.h | 2 +- src/gui/npcpostdialog.h | 2 +- src/gui/okdialog.h | 2 +- src/gui/outfitwindow.h | 2 +- src/gui/palette.h | 2 +- src/gui/popupmenu.h | 6 +++--- src/gui/questswindow.cpp | 2 +- src/gui/questswindow.h | 2 +- src/gui/quitdialog.h | 2 +- src/gui/registerdialog.h | 4 ++-- src/gui/sdlfont.h | 2 +- src/gui/sdlinput.h | 2 +- src/gui/selldialog.h | 2 +- src/gui/serverdialog.h | 4 ++-- src/gui/setup.h | 2 +- src/gui/setup_audio.h | 2 +- src/gui/setup_chat.h | 2 +- src/gui/setup_colors.h | 2 +- src/gui/setup_input.cpp | 2 +- src/gui/setup_input.h | 2 +- src/gui/setup_joystick.h | 2 +- src/gui/setup_other.h | 2 +- src/gui/setup_perfomance.h | 2 +- src/gui/setup_players.h | 2 +- src/gui/setup_relations.cpp | 2 +- src/gui/setup_relations.h | 2 +- src/gui/setup_theme.h | 2 +- src/gui/setup_video.cpp | 2 +- src/gui/setup_video.h | 2 +- src/gui/setup_visual.h | 2 +- src/gui/shopwindow.h | 2 +- src/gui/shortcutwindow.cpp | 2 +- src/gui/shortcutwindow.h | 2 +- src/gui/skilldialog.cpp | 4 ++-- src/gui/skilldialog.h | 4 ++-- src/gui/socialwindow.cpp | 22 +++++++++++----------- src/gui/socialwindow.h | 2 +- src/gui/specialswindow.cpp | 2 +- src/gui/specialswindow.h | 2 +- src/gui/speechbubble.h | 2 +- src/gui/spellpopup.h | 2 +- src/gui/statuspopup.h | 2 +- src/gui/statuswindow.cpp | 6 +++--- src/gui/statuswindow.h | 2 +- src/gui/textcommandeditor.cpp | 2 +- src/gui/textcommandeditor.h | 2 +- src/gui/textdialog.h | 2 +- src/gui/textpopup.h | 2 +- src/gui/theme.h | 4 ++-- src/gui/tradewindow.h | 2 +- src/gui/unregisterdialog.h | 2 +- src/gui/updaterwindow.h | 2 +- src/gui/userpalette.h | 2 +- src/gui/viewport.h | 2 +- src/gui/whoisonline.h | 4 ++-- src/gui/widgets/avatarlistbox.h | 2 +- src/gui/widgets/battletab.h | 2 +- src/gui/widgets/browserbox.h | 2 +- src/gui/widgets/button.h | 2 +- src/gui/widgets/channeltab.h | 2 +- src/gui/widgets/chattab.h | 2 +- src/gui/widgets/checkbox.h | 2 +- src/gui/widgets/desktop.h | 2 +- src/gui/widgets/dropdown.h | 2 +- src/gui/widgets/dropshortcutcontainer.h | 2 +- src/gui/widgets/emoteshortcutcontainer.h | 2 +- src/gui/widgets/extendedlistbox.h | 2 +- src/gui/widgets/extendednamesmodel.h | 2 +- src/gui/widgets/flowcontainer.h | 2 +- src/gui/widgets/guildchattab.h | 2 +- src/gui/widgets/guitable.cpp | 2 +- src/gui/widgets/guitable.h | 2 +- src/gui/widgets/horizontcontainer.h | 2 +- src/gui/widgets/icon.h | 2 +- src/gui/widgets/inttextfield.h | 2 +- src/gui/widgets/itemcontainer.h | 2 +- src/gui/widgets/itemlinkhandler.h | 2 +- src/gui/widgets/itemshortcutcontainer.h | 2 +- src/gui/widgets/label.h | 2 +- src/gui/widgets/layout.h | 2 +- src/gui/widgets/layouthelper.h | 2 +- src/gui/widgets/listbox.h | 2 +- src/gui/widgets/namesmodel.h | 2 +- src/gui/widgets/passwordfield.h | 2 +- src/gui/widgets/playerbox.h | 2 +- src/gui/widgets/popup.h | 2 +- src/gui/widgets/progressbar.h | 2 +- src/gui/widgets/progressindicator.h | 2 +- src/gui/widgets/radiobutton.h | 2 +- src/gui/widgets/radiogroup.h | 2 +- src/gui/widgets/scrollarea.h | 2 +- src/gui/widgets/setupitem.h | 20 ++++++++++---------- src/gui/widgets/setuptab.h | 2 +- src/gui/widgets/setuptabscroll.h | 2 +- src/gui/widgets/shopitems.h | 2 +- src/gui/widgets/shoplistbox.h | 2 +- src/gui/widgets/shortcutcontainer.h | 2 +- src/gui/widgets/slider.h | 2 +- src/gui/widgets/sliderlist.h | 2 +- src/gui/widgets/spellshortcutcontainer.h | 2 +- src/gui/widgets/tab.h | 2 +- src/gui/widgets/tabbedarea.h | 2 +- src/gui/widgets/tablemodel.h | 2 +- src/gui/widgets/tabstrip.h | 2 +- src/gui/widgets/textbox.h | 2 +- src/gui/widgets/textfield.h | 2 +- src/gui/widgets/textpreview.h | 2 +- src/gui/widgets/tradetab.h | 2 +- src/gui/widgets/vertcontainer.h | 2 +- src/gui/widgets/whispertab.h | 2 +- src/gui/widgets/widgetgroup.h | 2 +- src/gui/widgets/window.h | 2 +- src/gui/windowmenu.h | 2 +- src/gui/worldselectdialog.cpp | 2 +- src/gui/worldselectdialog.h | 2 +- 147 files changed, 183 insertions(+), 183 deletions(-) (limited to 'src/gui') 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 *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. -- cgit v1.2.3-60-g2f50