summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-24 12:17:35 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-24 12:17:35 +0300
commit1814650ad896a0f9684d279fa5843771e767748a (patch)
tree5387bdca11a76198c7be67b7009cacd9fc31b0fb /src/net/ea
parentd6fbc25d16e3f96a20c492904a0dab16f8b4d8fb (diff)
downloadmv-1814650ad896a0f9684d279fa5843771e767748a.tar.gz
mv-1814650ad896a0f9684d279fa5843771e767748a.tar.bz2
mv-1814650ad896a0f9684d279fa5843771e767748a.tar.xz
mv-1814650ad896a0f9684d279fa5843771e767748a.zip
add final keyword to net files.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/adminhandler.h22
-rw-r--r--src/net/ea/buysellhandler.h10
-rw-r--r--src/net/ea/charserverhandler.h14
-rw-r--r--src/net/ea/chathandler.h2
-rw-r--r--src/net/ea/gamehandler.h10
-rw-r--r--src/net/ea/gui/guildtab.h14
-rw-r--r--src/net/ea/gui/partytab.h14
-rw-r--r--src/net/ea/guildhandler.h10
-rw-r--r--src/net/ea/inventoryhandler.h15
-rw-r--r--src/net/ea/loginhandler.h22
-rw-r--r--src/net/ea/npchandler.h6
-rw-r--r--src/net/ea/partyhandler.h10
-rw-r--r--src/net/ea/playerhandler.h16
-rw-r--r--src/net/ea/tradehandler.h3
14 files changed, 87 insertions, 81 deletions
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 8a2697584..fc49b0a2c 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -41,32 +41,32 @@ class AdminHandler : public Net::AdminHandler
virtual ~AdminHandler()
{ }
- virtual void kickName(const std::string &name) const override;
+ virtual void kickName(const std::string &name) const override final;
- virtual void ban(const int playerId) const override;
+ virtual void ban(const int playerId) const override final;
- virtual void banName(const std::string &name) const override;
+ virtual void banName(const std::string &name) const override final;
- virtual void unban(const int playerId) const override;
+ virtual void unban(const int playerId) const override final;
- virtual void unbanName(const std::string &name) const override;
+ virtual void unbanName(const std::string &name) const override final;
virtual void mute(const int playerId, const int type,
- const int limit) const override;
+ const int limit) const override final;
virtual void warp(const std::string &map,
- const int x, const int y) const override;
+ const int x, const int y) const override final;
void gotoName(const std::string &name) const;
- void recallName(const std::string &name) const override;
+ void recallName(const std::string &name) const override final;
- void reviveName(const std::string &name) const override;
+ void reviveName(const std::string &name) const override final;
- void ipcheckName(const std::string &name) const override;
+ void ipcheckName(const std::string &name) const override final;
void createItems(const int id, const int color,
- const int amount) const override;
+ const int amount) const override final;
};
} // namespace Ea
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index 87bed3d83..7635f4f2c 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -37,17 +37,19 @@ class BuySellHandler : public Net::BuySellHandler
A_DELETE_COPY(BuySellHandler)
- virtual void requestSellList(const std::string &nick) const override;
+ virtual void requestSellList(const std::string &nick)
+ const override final;
- virtual void requestBuyList(const std::string &nick) const override;
+ virtual void requestBuyList(const std::string &nick)
+ const override final;
virtual void sendBuyRequest(const std::string &nick,
const ShopItem *const item,
- const int amount) const override;
+ const int amount) const override final;
virtual void sendSellRequest(const std::string &nick,
const ShopItem *const item,
- const int amount) const override;
+ const int amount) const override final;
virtual void processNpcBuySellChoice(Net::MessageIn &msg);
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 01012353f..004dde8c4 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -41,7 +41,7 @@ class CharServerHandler : public Net::CharServerHandler
A_DELETE_COPY(CharServerHandler)
virtual void setCharSelectDialog(CharSelectDialog *const window)
- override;
+ override final;
/**
* Sets the character create dialog. The handler will clean up this
@@ -49,15 +49,15 @@ class CharServerHandler : public Net::CharServerHandler
* the dialog when a new character failed to be created.
*/
virtual void setCharCreateDialog(CharCreateDialog *const window)
- override;
+ override final;
- virtual void requestCharacters() override;
+ virtual void requestCharacters() override final;
- virtual unsigned int baseSprite() const override A_WARN_UNUSED;
+ virtual unsigned int baseSprite() const override final A_WARN_UNUSED;
- virtual unsigned int hairSprite() const override A_WARN_UNUSED;
+ virtual unsigned int hairSprite() const override final A_WARN_UNUSED;
- virtual unsigned int maxSprite() const override A_WARN_UNUSED;
+ virtual unsigned int maxSprite() const override final A_WARN_UNUSED;
virtual void connect() = 0;
@@ -80,7 +80,7 @@ class CharServerHandler : public Net::CharServerHandler
Network *const network,
ServerInfo &mapServer) const;
- virtual void clear() override;
+ virtual void clear() override final;
protected:
CharServerHandler();
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index cde416762..124cc41fb 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -39,7 +39,7 @@ class ChatHandler : public Net::ChatHandler
A_DELETE_COPY(ChatHandler)
void me(const std::string &text,
- const std::string &channel) const override;
+ const std::string &channel) const override final;
virtual void processWhisperResponse(Net::MessageIn &msg);
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 559a9a860..d9ed8cc63 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -36,14 +36,14 @@ class GameHandler : public Net::GameHandler
A_DELETE_COPY(GameHandler)
- virtual void who() const override;
+ virtual void who() const override final;
- virtual bool removeDeadBeings() const override A_WARN_UNUSED
+ virtual bool removeDeadBeings() const override final A_WARN_UNUSED
{ return true; }
virtual void setMap(const std::string &map);
- virtual bool canUseMagicBar() const override A_WARN_UNUSED
+ virtual bool canUseMagicBar() const override final A_WARN_UNUSED
{ return true; }
virtual void processMapLogin(Net::MessageIn &msg) const;
@@ -54,9 +54,9 @@ class GameHandler : public Net::GameHandler
virtual void processMapQuitResponse(Net::MessageIn &msg) const;
- virtual void clear() override;
+ virtual void clear() override final;
- virtual void initEngines() const override;
+ virtual void initEngines() const override final;
protected:
std::string mMap;
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index 5be5c62e0..edc8ca973 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -41,23 +41,23 @@ class GuildTab : public ChatTab, public ConfigListener
virtual ~GuildTab();
bool handleCommand(const std::string &type,
- const std::string &args) override;
+ const std::string &args) override final;
void showHelp() override;
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
- int getType() const override A_WARN_UNUSED
+ int getType() const override final A_WARN_UNUSED
{ return ChatTab::TAB_GUILD; }
- void playNewMessageSound() const override;
+ void playNewMessageSound() const override final;
- void optionChanged(const std::string &value) override;
+ void optionChanged(const std::string &value) override final;
protected:
- void handleInput(const std::string &msg) override;
+ void handleInput(const std::string &msg) override final;
- void getAutoCompleteList(StringVect &names) const override;
+ void getAutoCompleteList(StringVect &names) const override final;
};
} // namespace Ea
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index 07ffaa919..1ab50a1b7 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -40,24 +40,24 @@ class PartyTab : public ChatTab, public ConfigListener
virtual ~PartyTab();
- void showHelp() override;
+ void showHelp() override final;
bool handleCommand(const std::string &type,
- const std::string &args) override;
+ const std::string &args) override final;
- int getType() const override A_WARN_UNUSED
+ int getType() const override final A_WARN_UNUSED
{ return ChatTab::TAB_PARTY; }
- void saveToLogFile(const std::string &msg) const override;
+ void saveToLogFile(const std::string &msg) const override final;
- void playNewMessageSound() const override;
+ void playNewMessageSound() const override final;
void optionChanged(const std::string &value);
protected:
- void handleInput(const std::string &msg) override;
+ void handleInput(const std::string &msg) override final;
- virtual void getAutoCompleteList(StringVect&) const override;
+ virtual void getAutoCompleteList(StringVect&) const override final;
};
extern PartyTab *partyTab;
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index 40d6bc8ae..c3f51b81e 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -40,13 +40,13 @@ class GuildHandler : public Net::GuildHandler
virtual ~GuildHandler();
void requestAlliance(const int guildId,
- const int otherGuildId) const override;
+ const int otherGuildId) const override final;
void requestAllianceResponse(const int guildId, const int otherGuildId,
- const bool response) const override;
+ const bool response) const override final;
void endAlliance(const int guildId,
- const int otherGuildId) const override;
+ const int otherGuildId) const override final;
virtual void processGuildCreateResponse(Net::MessageIn &msg) const;
@@ -100,9 +100,9 @@ class GuildHandler : public Net::GuildHandler
virtual void processGuildBroken(Net::MessageIn &msg) const;
- void clear() const override;
+ void clear() const override final;
- ChatTab *getTab() const override;
+ ChatTab *getTab() const override final;
protected:
bool showBasicInfo;
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 9f55a3603..d2b579301 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -51,7 +51,7 @@ class EquipBackend : public Equipment::Backend
A_DELETE_COPY(EquipBackend)
- Item *getEquipment(const int index) const override A_WARN_UNUSED
+ Item *getEquipment(const int index) const override final A_WARN_UNUSED
{
int invyIndex = mEquipment[index];
if (invyIndex == -1)
@@ -152,19 +152,20 @@ class InventoryHandler : public Net::InventoryHandler
void clear();
- bool canSplit(const Item *const item) const override A_WARN_UNUSED;
+ bool canSplit(const Item *const item) const override final A_WARN_UNUSED;
void splitItem(const Item *const item,
- const int amount) const override;
+ const int amount) const override final;
- void moveItem(const int oldIndex, const int newIndex) const override;
+ void moveItem(const int oldIndex,
+ const int newIndex) const override final;
- void openStorage(const int type) const override;
+ void openStorage(const int type) const override final;
- size_t getSize(const int type) const override A_WARN_UNUSED;
+ size_t getSize(const int type) const override final A_WARN_UNUSED;
int convertFromServerSlot(const int serverSlot)
- const override A_WARN_UNUSED;
+ const override final A_WARN_UNUSED;
void pushPickup(const int floorId)
{ mSentPickups.push(floorId); }
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index d1994f73d..a0d6ad288 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -45,37 +45,39 @@ class LoginHandler : public Net::LoginHandler
int supportedOptionalActions() const override A_WARN_UNUSED
{ return SetGenderOnRegister; }
- virtual bool isRegistrationEnabled() const override A_WARN_UNUSED;
+ virtual bool isRegistrationEnabled() const override final A_WARN_UNUSED;
- virtual void getRegistrationDetails() const override;
+ virtual void getRegistrationDetails() const override final;
virtual unsigned int getMaxPasswordLength() const
- override A_WARN_UNUSED
+ override A_WARN_UNUSED
{ return 24; }
- virtual void loginAccount(LoginData *const loginData) const override;
+ virtual void loginAccount(LoginData *const loginData)
+ const override final;
virtual void chooseServer(const unsigned int server) const override;
virtual void registerAccount(LoginData *const loginData)
- const override;
+ const override final;
- virtual const Worlds &getWorlds() const override A_WARN_UNUSED;
+ virtual const Worlds &getWorlds() const override final A_WARN_UNUSED;
- virtual void clearWorlds() override;
+ virtual void clearWorlds() override final;
virtual ServerInfo *getCharServer() const A_WARN_UNUSED = 0;
const Token &getToken() const A_WARN_UNUSED
{ return mToken; }
- virtual void logout() const override;
+ virtual void logout() const override final;
- virtual void changeEmail(const std::string &email) const override;
+ virtual void changeEmail(const std::string &email)
+ const override final;
virtual void unregisterAccount(const std::string &username,
const std::string &password)
- const override;
+ const override final;
virtual void procecessCharPasswordResponse(Net::MessageIn &msg) const;
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index f67e9b3f3..4eeaac7c0 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -37,11 +37,11 @@ class NpcHandler : public Net::NpcHandler
A_DELETE_COPY(NpcHandler)
void sendLetter(const int npcId, const std::string &recipient,
- const std::string &text) const override;
+ const std::string &text) const override final;
- void startShopping(const int beingId) const override;
+ void startShopping(const int beingId) const override final;
- void endShopping(const int beingId) const override;
+ void endShopping(const int beingId) const override final;
virtual int getNpc(Net::MessageIn &msg,
bool haveLength) A_WARN_UNUSED = 0;
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 160080215..59efa77b7 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -41,19 +41,19 @@ class PartyHandler : public Net::PartyHandler
virtual ~PartyHandler();
- void join(const int partyId) const override;
+ void join(const int partyId) const override final;
- PartyShare getShareExperience() const override A_WARN_UNUSED
+ PartyShare getShareExperience() const override final A_WARN_UNUSED
{ return mShareExp; }
- PartyShare getShareItems() const override A_WARN_UNUSED
+ PartyShare getShareItems() const override final A_WARN_UNUSED
{ return mShareItems; }
void reload() const;
- void clear() const override;
+ void clear() const override final;
- ChatTab *getTab() const override;
+ ChatTab *getTab() const override final;
virtual void processPartyCreate(Net::MessageIn &msg) const;
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 219ea17f2..3e97994ce 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -36,22 +36,22 @@ class PlayerHandler : public Net::PlayerHandler
A_DELETE_COPY(PlayerHandler)
- void decreaseAttribute(const int attr) const override;
+ void decreaseAttribute(const int attr) const override final;
void ignorePlayer(const std::string &player,
- const bool ignore) const override;
+ const bool ignore) const override final;
- void ignoreAll(const bool ignore) const override;
+ void ignoreAll(const bool ignore) const override final;
- bool canUseMagic() const override;
+ bool canUseMagic() const override final;
- bool canCorrectAttributes() const override;
+ bool canCorrectAttributes() const override final;
- Vector getDefaultWalkSpeed() const override A_WARN_UNUSED;
+ Vector getDefaultWalkSpeed() const override final A_WARN_UNUSED;
- int getJobLocation() const override A_WARN_UNUSED;
+ int getJobLocation() const override final A_WARN_UNUSED;
- int getAttackLocation() const override A_WARN_UNUSED;
+ int getAttackLocation() const override final A_WARN_UNUSED;
void processWalkResponse(Net::MessageIn &msg) const;
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 31d0c2c76..2d37ed0c8 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -36,7 +36,8 @@ class TradeHandler : public Net::TradeHandler
A_DELETE_COPY(TradeHandler)
- void removeItem(const int slotNum, const int amount) const override;
+ void removeItem(const int slotNum,
+ const int amount) const override final;
void processTradeRequest(Net::MessageIn &msg) const;