From 53ec80d8a45cf7e164c614484fe42b83eb18521c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 17 Jan 2017 18:20:54 +0300 Subject: Add missing A_DEFAULT_COPY / A_DELETE_COPY into listeners. --- src/listeners/actionlistener.h | 2 ++ src/listeners/actorspritelistener.h | 5 +++++ src/listeners/arrowslistener.h | 2 ++ src/listeners/attributelistener.h | 2 ++ src/listeners/awaylistener.h | 5 +++++ src/listeners/banklistener.h | 2 ++ src/listeners/buyingstoremodelistener.h | 2 ++ src/listeners/buyingstoreslotslistener.h | 2 ++ src/listeners/configlistener.h | 5 +++++ src/listeners/debugmessagelistener.h | 2 ++ src/listeners/errorlistener.h | 6 ++++++ src/listeners/focuslistener.h | 2 ++ src/listeners/gamemodifierlistener.h | 2 ++ src/listeners/inventorylistener.h | 2 ++ src/listeners/keylistener.h | 2 ++ src/listeners/mouselistener.h | 2 ++ src/listeners/pincodelistener.h | 6 ++++++ src/listeners/playerdeathlistener.h | 2 ++ src/listeners/playerpostdeathlistener.h | 6 ++++++ src/listeners/playerrelationslistener.h | 2 ++ src/listeners/requestadoptchildlistener.h | 6 ++++++ src/listeners/requesttradelistener.h | 5 +++++ src/listeners/selectionlistener.h | 2 ++ src/listeners/statlistener.h | 2 ++ src/listeners/tablemodellistener.h | 5 +++++ src/listeners/updatestatuslistener.h | 2 ++ src/listeners/uploadlistener.h | 6 ++++++ src/listeners/vendingmodelistener.h | 2 ++ src/listeners/vendingslotslistener.h | 2 ++ src/listeners/weightlistener.h | 6 ++++++ src/listeners/widgetdeathlistener.h | 2 ++ src/listeners/widgetlistener.h | 2 ++ 32 files changed, 103 insertions(+) (limited to 'src/listeners') diff --git a/src/listeners/actionlistener.h b/src/listeners/actionlistener.h index 5a67f0cbe..4303ddda3 100644 --- a/src/listeners/actionlistener.h +++ b/src/listeners/actionlistener.h @@ -77,6 +77,8 @@ class ActionListener notfinal { public: + A_DELETE_COPY(ActionListener) + /** * Destructor. */ diff --git a/src/listeners/actorspritelistener.h b/src/listeners/actorspritelistener.h index bcd5c0775..4f4bcd799 100644 --- a/src/listeners/actorspritelistener.h +++ b/src/listeners/actorspritelistener.h @@ -29,6 +29,11 @@ class ActorSprite; class ActorSpriteListener notfinal { public: + ActorSpriteListener() + { } + + A_DELETE_COPY(ActorSpriteListener) + /** * Destructor. */ diff --git a/src/listeners/arrowslistener.h b/src/listeners/arrowslistener.h index c546185fa..5dfa68d6e 100644 --- a/src/listeners/arrowslistener.h +++ b/src/listeners/arrowslistener.h @@ -28,6 +28,8 @@ class ArrowsListener notfinal { public: + A_DELETE_COPY(ArrowsListener) + virtual void arrowsChanged() = 0; static void distributeEvent(); diff --git a/src/listeners/attributelistener.h b/src/listeners/attributelistener.h index d098bd2ae..634dd2d61 100644 --- a/src/listeners/attributelistener.h +++ b/src/listeners/attributelistener.h @@ -30,6 +30,8 @@ class AttributeListener notfinal { public: + A_DELETE_COPY(AttributeListener) + virtual void attributeChanged(const AttributesT id, const int oldVal, const int newVal) = 0; diff --git a/src/listeners/awaylistener.h b/src/listeners/awaylistener.h index 35e7115a5..08fa908c7 100644 --- a/src/listeners/awaylistener.h +++ b/src/listeners/awaylistener.h @@ -28,6 +28,11 @@ class AwayListener final : public ActionListener { public: + AwayListener() + { } + + A_DELETE_COPY(AwayListener) + void action(const ActionEvent &event) override final; }; diff --git a/src/listeners/banklistener.h b/src/listeners/banklistener.h index 1b287f7e0..a71d13d05 100644 --- a/src/listeners/banklistener.h +++ b/src/listeners/banklistener.h @@ -28,6 +28,8 @@ class BankListener notfinal { public: + A_DELETE_COPY(BankListener) + virtual void bankMoneyChanged(const int money) = 0; static void distributeEvent(const int money); diff --git a/src/listeners/buyingstoremodelistener.h b/src/listeners/buyingstoremodelistener.h index 13ac13dee..5da4e901e 100644 --- a/src/listeners/buyingstoremodelistener.h +++ b/src/listeners/buyingstoremodelistener.h @@ -28,6 +28,8 @@ class BuyingStoreModeListener notfinal { public: + A_DELETE_COPY(BuyingStoreModeListener) + virtual void buyingStoreEnabled(const bool b) = 0; static void distributeEvent(const bool b); diff --git a/src/listeners/buyingstoreslotslistener.h b/src/listeners/buyingstoreslotslistener.h index c7fa87f7a..d508069c3 100644 --- a/src/listeners/buyingstoreslotslistener.h +++ b/src/listeners/buyingstoreslotslistener.h @@ -28,6 +28,8 @@ class BuyingStoreSlotsListener notfinal { public: + A_DELETE_COPY(BuyingStoreSlotsListener) + virtual void buyingStoreSlotsChanged(const int slots) = 0; static void distributeEvent(const int slots); diff --git a/src/listeners/configlistener.h b/src/listeners/configlistener.h index 074574b05..76250eea6 100644 --- a/src/listeners/configlistener.h +++ b/src/listeners/configlistener.h @@ -36,6 +36,11 @@ class ConfigListener notfinal { public: + ConfigListener() + { } + + A_DELETE_COPY(ConfigListener) + /** * Destructor. */ diff --git a/src/listeners/debugmessagelistener.h b/src/listeners/debugmessagelistener.h index 7976ff0db..2e981cfbf 100644 --- a/src/listeners/debugmessagelistener.h +++ b/src/listeners/debugmessagelistener.h @@ -30,6 +30,8 @@ class DebugMessageListener notfinal { public: + A_DELETE_COPY(DebugMessageListener) + virtual void debugMessage(const std::string &msg) = 0; static void distributeEvent(const std::string &msg); diff --git a/src/listeners/errorlistener.h b/src/listeners/errorlistener.h index 0f8e441dd..6573e8107 100644 --- a/src/listeners/errorlistener.h +++ b/src/listeners/errorlistener.h @@ -30,6 +30,12 @@ class ErrorListener final : public ActionListener { public: + ErrorListener() : + ActionListener() + { } + + A_DELETE_COPY(ErrorListener) + void action(const ActionEvent &event) override final; }; diff --git a/src/listeners/focuslistener.h b/src/listeners/focuslistener.h index c74ed130c..013d8137b 100644 --- a/src/listeners/focuslistener.h +++ b/src/listeners/focuslistener.h @@ -77,6 +77,8 @@ class FocusListener notfinal { public: + A_DELETE_COPY(FocusListener) + /** * Destructor. */ diff --git a/src/listeners/gamemodifierlistener.h b/src/listeners/gamemodifierlistener.h index 72bfe4c48..86635f5df 100644 --- a/src/listeners/gamemodifierlistener.h +++ b/src/listeners/gamemodifierlistener.h @@ -28,6 +28,8 @@ class GameModifierListener notfinal { public: + A_DELETE_COPY(GameModifierListener) + virtual void gameModifiersChanged() = 0; static void distributeEvent(); diff --git a/src/listeners/inventorylistener.h b/src/listeners/inventorylistener.h index a6b454f70..c8ca86dcb 100644 --- a/src/listeners/inventorylistener.h +++ b/src/listeners/inventorylistener.h @@ -30,6 +30,8 @@ class Inventory; class InventoryListener notfinal { public: + A_DELETE_COPY(InventoryListener) + virtual ~InventoryListener() { } diff --git a/src/listeners/keylistener.h b/src/listeners/keylistener.h index 847edb37e..e89e6d9d1 100644 --- a/src/listeners/keylistener.h +++ b/src/listeners/keylistener.h @@ -78,6 +78,8 @@ class Key; class KeyListener notfinal { public: + A_DELETE_COPY(KeyListener) + /** * Destructor. */ diff --git a/src/listeners/mouselistener.h b/src/listeners/mouselistener.h index 7943415d9..cebc89e60 100644 --- a/src/listeners/mouselistener.h +++ b/src/listeners/mouselistener.h @@ -76,6 +76,8 @@ class MouseListener notfinal { public: + A_DELETE_COPY(MouseListener) + /** * Destructor. */ diff --git a/src/listeners/pincodelistener.h b/src/listeners/pincodelistener.h index cdcc30f22..45bce5be3 100644 --- a/src/listeners/pincodelistener.h +++ b/src/listeners/pincodelistener.h @@ -28,6 +28,12 @@ class PincodeListener final : public ActionListener { public: + PincodeListener() : + ActionListener() + { } + + A_DELETE_COPY(PincodeListener) + void action(const ActionEvent &event) override final; }; diff --git a/src/listeners/playerdeathlistener.h b/src/listeners/playerdeathlistener.h index 40ae26ce6..2e9ea99a9 100644 --- a/src/listeners/playerdeathlistener.h +++ b/src/listeners/playerdeathlistener.h @@ -28,6 +28,8 @@ class PlayerDeathListener notfinal { public: + A_DELETE_COPY(PlayerDeathListener) + virtual void playerDeath() = 0; static void distributeEvent(); diff --git a/src/listeners/playerpostdeathlistener.h b/src/listeners/playerpostdeathlistener.h index 54140685b..dc7128422 100644 --- a/src/listeners/playerpostdeathlistener.h +++ b/src/listeners/playerpostdeathlistener.h @@ -41,6 +41,12 @@ extern OkDialog *deathNotice; */ struct PlayerPostDeathListener final : public ActionListener { + PlayerPostDeathListener() : + ActionListener() + { } + + A_DELETE_COPY(PlayerPostDeathListener) + void action(const ActionEvent &event A_UNUSED) override final { if (playerHandler) diff --git a/src/listeners/playerrelationslistener.h b/src/listeners/playerrelationslistener.h index abf1fe1d2..ced919964 100644 --- a/src/listeners/playerrelationslistener.h +++ b/src/listeners/playerrelationslistener.h @@ -30,6 +30,8 @@ class PlayerRelationsListener notfinal { public: + A_DELETE_COPY(PlayerRelationsListener) + virtual ~PlayerRelationsListener() { } diff --git a/src/listeners/requestadoptchildlistener.h b/src/listeners/requestadoptchildlistener.h index c41dfb7a9..e69759ed9 100644 --- a/src/listeners/requestadoptchildlistener.h +++ b/src/listeners/requestadoptchildlistener.h @@ -30,6 +30,12 @@ struct RequestAdoptChildListener final : public ActionListener { public: + RequestAdoptChildListener() : + ActionListener() + { } + + A_DELETE_COPY(RequestAdoptChildListener) + void action(const ActionEvent &event) override final { const std::string &eventId = event.getId(); diff --git a/src/listeners/requesttradelistener.h b/src/listeners/requesttradelistener.h index 8e60ad36d..ef94d267a 100644 --- a/src/listeners/requesttradelistener.h +++ b/src/listeners/requesttradelistener.h @@ -40,6 +40,11 @@ extern ConfirmDialog *confirmDlg; struct RequestTradeListener final : public ActionListener { public: + RequestTradeListener() + { } + + A_DELETE_COPY(RequestTradeListener) + void action(const ActionEvent &event) override final { confirmDlg = nullptr; diff --git a/src/listeners/selectionlistener.h b/src/listeners/selectionlistener.h index 4a2f7a625..ab4d0478b 100644 --- a/src/listeners/selectionlistener.h +++ b/src/listeners/selectionlistener.h @@ -105,6 +105,8 @@ class SelectionListener notfinal */ SelectionListener() { } + + A_DELETE_COPY(SelectionListener) }; #endif // LISTENERS_SELECTIONLISTENER_H diff --git a/src/listeners/statlistener.h b/src/listeners/statlistener.h index 9e8b6b6aa..485401728 100644 --- a/src/listeners/statlistener.h +++ b/src/listeners/statlistener.h @@ -30,6 +30,8 @@ class StatListener notfinal { public: + A_DELETE_COPY(StatListener) + virtual void statChanged(const AttributesT id, const int oldVal1, const int oldVal2) = 0; diff --git a/src/listeners/tablemodellistener.h b/src/listeners/tablemodellistener.h index bb1db458b..717df4f11 100644 --- a/src/listeners/tablemodellistener.h +++ b/src/listeners/tablemodellistener.h @@ -30,6 +30,11 @@ class Widget; class TableModelListener notfinal { public: + TableModelListener() + { } + + A_DELETE_COPY(TableModelListener) + /** * Must be invoked by the TableModel whenever a global change is about * to occur or has occurred (e.g., when a row or column is being diff --git a/src/listeners/updatestatuslistener.h b/src/listeners/updatestatuslistener.h index 68fa95e36..68b7b14b5 100644 --- a/src/listeners/updatestatuslistener.h +++ b/src/listeners/updatestatuslistener.h @@ -28,6 +28,8 @@ class UpdateStatusListener notfinal { public: + A_DELETE_COPY(UpdateStatusListener) + virtual void updateStatus() = 0; static void distributeEvent(); diff --git a/src/listeners/uploadlistener.h b/src/listeners/uploadlistener.h index 8654748fc..b75fe58b8 100644 --- a/src/listeners/uploadlistener.h +++ b/src/listeners/uploadlistener.h @@ -30,6 +30,12 @@ class UploadListener final : public ActionListener { public: + UploadListener() : + ActionListener() + { } + + A_DELETE_COPY(UploadListener) + void action(const ActionEvent &event A_UNUSED) override final; }; diff --git a/src/listeners/vendingmodelistener.h b/src/listeners/vendingmodelistener.h index 78a3b4c35..65035e32d 100644 --- a/src/listeners/vendingmodelistener.h +++ b/src/listeners/vendingmodelistener.h @@ -28,6 +28,8 @@ class VendingModeListener notfinal { public: + A_DELETE_COPY(VendingModeListener) + virtual void vendingEnabled(const bool b) = 0; static void distributeEvent(const bool b); diff --git a/src/listeners/vendingslotslistener.h b/src/listeners/vendingslotslistener.h index df3b3504f..ea79848a9 100644 --- a/src/listeners/vendingslotslistener.h +++ b/src/listeners/vendingslotslistener.h @@ -28,6 +28,8 @@ class VendingSlotsListener notfinal { public: + A_DELETE_COPY(VendingSlotsListener) + virtual void vendingSlotsChanged(const int slots) = 0; static void distributeEvent(const int slots); diff --git a/src/listeners/weightlistener.h b/src/listeners/weightlistener.h index 185f2b14a..781a76988 100644 --- a/src/listeners/weightlistener.h +++ b/src/listeners/weightlistener.h @@ -35,6 +35,12 @@ extern OkDialog *weightNotice; struct WeightListener final : public ActionListener { public: + WeightListener() : + ActionListener() + { } + + A_DELETE_COPY(WeightListener) + void action(const ActionEvent &event A_UNUSED) override final { weightNotice = nullptr; diff --git a/src/listeners/widgetdeathlistener.h b/src/listeners/widgetdeathlistener.h index d64dabe55..5933edcec 100644 --- a/src/listeners/widgetdeathlistener.h +++ b/src/listeners/widgetdeathlistener.h @@ -75,6 +75,8 @@ class WidgetDeathListener notfinal { public: + A_DELETE_COPY(WidgetDeathListener) + /** * Destructor. */ diff --git a/src/listeners/widgetlistener.h b/src/listeners/widgetlistener.h index 105a53849..c3e44ebb6 100644 --- a/src/listeners/widgetlistener.h +++ b/src/listeners/widgetlistener.h @@ -79,6 +79,8 @@ class WidgetListener notfinal { public: + A_DELETE_COPY(WidgetListener) + /** * Destructor. */ -- cgit v1.2.3-60-g2f50