diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-10 01:40:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-10 01:40:58 +0300 |
commit | dd996d01676d7dca3eec442b14c4966ba0bb0935 (patch) | |
tree | cf33c3b0ab342ad7eace2c79d75fa5ba3e852f5e /src/net/ea | |
parent | 75d9cadaf376cad8f7244ee4d4632e94c0ef3bc0 (diff) | |
download | mv-dd996d01676d7dca3eec442b14c4966ba0bb0935.tar.gz mv-dd996d01676d7dca3eec442b14c4966ba0bb0935.tar.bz2 mv-dd996d01676d7dca3eec442b14c4966ba0bb0935.tar.xz mv-dd996d01676d7dca3eec442b14c4966ba0bb0935.zip |
Delete copy constructor from net classes.
Diffstat (limited to 'src/net/ea')
-rw-r--r-- | src/net/ea/adminhandler.h | 5 | ||||
-rw-r--r-- | src/net/ea/beinghandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/buysellhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/charserverhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/chathandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/gamehandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/gui/guildtab.h | 2 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.h | 2 | ||||
-rw-r--r-- | src/net/ea/guildhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/inventoryhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/ea/inventoryhandler.h | 4 | ||||
-rw-r--r-- | src/net/ea/itemhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/loginhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/network.h | 2 | ||||
-rw-r--r-- | src/net/ea/npchandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/partyhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/playerhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/specialhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/tradehandler.h | 2 |
19 files changed, 42 insertions, 1 deletions
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index 5b5224174..a6c88f8c5 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -32,6 +32,11 @@ namespace Ea class AdminHandler : public Net::AdminHandler { public: + AdminHandler() + { } + + A_DELETE_COPY(AdminHandler); + virtual ~AdminHandler() { } diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index b4fd5f93f..f49dbb427 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -34,6 +34,8 @@ class BeingHandler : public Net::BeingHandler public: BeingHandler(bool enableSync); + 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 26f0d2716..3119d5d18 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -39,6 +39,8 @@ class BuySellHandler : public Net::BuySellHandler public: BuySellHandler(); + A_DELETE_COPY(BuySellHandler); + virtual void requestSellList(std::string nick); virtual void requestBuyList(std::string nick); diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index c0978157c..b2cbd3044 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -40,6 +40,8 @@ class CharServerHandler : public Net::CharHandler public: 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 baa9a01b5..f7bf0e861 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -38,6 +38,8 @@ class ChatHandler : public Net::ChatHandler public: ChatHandler(); + A_DELETE_COPY(ChatHandler); + virtual void talk(const std::string &text) = 0; virtual void talkRaw(const std::string &text) = 0; diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 969abbbbb..89546301b 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -37,6 +37,8 @@ class GameHandler : public Net::GameHandler, public Listener public: 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 07b9831ec..986231cd3 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -36,6 +36,8 @@ class GuildTab : public ChatTab public: GuildTab(); + A_DELETE_COPY(GuildTab); + ~GuildTab(); bool handleCommand(const std::string &type, diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 7b503fd71..e80840dc5 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -36,6 +36,8 @@ class PartyTab : public ChatTab public: PartyTab(); + A_DELETE_COPY(PartyTab); + ~PartyTab(); void showHelp() override; diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index 5b7442a40..e518a290e 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -35,6 +35,8 @@ class GuildHandler : public Net::GuildHandler public: GuildHandler(); + A_DELETE_COPY(GuildHandler); + ~GuildHandler(); void requestAlliance(int guildId, int otherGuildId); diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 1da1fe4ea..193e4a7b6 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -219,7 +219,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg, if (inventory) { inventory->setItem(index, itemId, amount, - 0, identified, isEquipment); + 0, identified, isEquipment); } } else diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 15c2e0994..cd56dd31f 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -46,6 +46,8 @@ class EquipBackend : public Equipment::Backend memset(mEquipment, -1, sizeof(mEquipment)); } + A_DELETE_COPY(EquipBackend); + Item *getEquipment(int index) const { int invyIndex = mEquipment[index]; @@ -140,6 +142,8 @@ class InventoryHandler : public Net::InventoryHandler InventoryHandler(); + A_DELETE_COPY(InventoryHandler); + ~InventoryHandler(); bool canSplit(const Item *item) const; diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index d5c268d2e..c5193dda6 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -34,6 +34,8 @@ class ItemHandler public: ItemHandler(); + A_DELETE_COPY(ItemHandler); + void processItemVisible(Net::MessageIn &msg); void processItemRemove(Net::MessageIn &msg); diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index c3bd2a4e8..02789a999 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -41,6 +41,8 @@ class LoginHandler : public Net::LoginHandler public: LoginHandler(); + A_DELETE_COPY(LoginHandler); + ~LoginHandler(); int supportedOptionalActions() const diff --git a/src/net/ea/network.h b/src/net/ea/network.h index d61332fe1..ab21fab37 100644 --- a/src/net/ea/network.h +++ b/src/net/ea/network.h @@ -42,6 +42,8 @@ class Network public: Network(); + A_DELETE_COPY(Network); + ~Network(); bool connect(ServerInfo server); diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index be0465375..93978c62e 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -39,6 +39,8 @@ class NpcHandler : public Net::NpcHandler public: 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 f08930e8c..8c10bb71e 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -38,6 +38,8 @@ class PartyHandler : public Net::PartyHandler public: PartyHandler(); + A_DELETE_COPY(PartyHandler); + ~PartyHandler(); void join(int partyId); diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 3e9d14804..168bd2a89 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -35,6 +35,8 @@ class PlayerHandler : public Net::PlayerHandler public: PlayerHandler(); + A_DELETE_COPY(PlayerHandler); + void decreaseAttribute(int attr); void ignorePlayer(const std::string &player, bool ignore); diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h index c2b05399e..fefef91b8 100644 --- a/src/net/ea/specialhandler.h +++ b/src/net/ea/specialhandler.h @@ -35,6 +35,8 @@ class SpecialHandler : public Net::SpecialHandler public: SpecialHandler(); + A_DELETE_COPY(SpecialHandler); + void handleMessage(Net::MessageIn &msg); void use(int id); diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index 07e9cc23b..a97f066ec 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -35,6 +35,8 @@ class TradeHandler : public Net::TradeHandler public: TradeHandler(); + A_DELETE_COPY(TradeHandler); + void removeItem(int slotNum, int amount); void processTradeRequest(Net::MessageIn &msg); |