summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-02 12:26:23 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-02 12:26:23 +0300
commit124e28787a66fc1ae882afbb5711b08620b51563 (patch)
tree5f172652494234e6caae74cf04a2cd4d0083cbf0 /src/net
parent48746ecb8cd94270f143cc7d722188d2e77c3101 (diff)
downloadmanaplus-124e28787a66fc1ae882afbb5711b08620b51563.tar.gz
manaplus-124e28787a66fc1ae882afbb5711b08620b51563.tar.bz2
manaplus-124e28787a66fc1ae882afbb5711b08620b51563.tar.xz
manaplus-124e28787a66fc1ae882afbb5711b08620b51563.zip
Remove useless virtual keywords.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/adminhandler.h10
-rw-r--r--src/net/ea/charserverhandler.h14
-rw-r--r--src/net/ea/gamehandler.h10
-rw-r--r--src/net/ea/loginhandler.h34
4 files changed, 32 insertions, 36 deletions
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index f1abbe736..acabd288a 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -46,15 +46,15 @@ class AdminHandler notfinal : public Net::AdminHandler
virtual ~AdminHandler()
{ }
- virtual void kickName(const std::string &name) const override final;
+ void kickName(const std::string &name) const override final;
- virtual void ban(const int playerId) const override final;
+ void ban(const int playerId) const override final;
- virtual void banName(const std::string &name) const override final;
+ void banName(const std::string &name) const override final;
- virtual void unban(const int playerId) const override final;
+ void unban(const int playerId) const override final;
- virtual void unbanName(const std::string &name) const override final;
+ void unbanName(const std::string &name) const override final;
void reviveName(const std::string &name) const override final;
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 305fee0ee..99fb84c35 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -41,16 +41,16 @@ class CharServerHandler notfinal : public Net::CharServerHandler
public:
A_DELETE_COPY(CharServerHandler)
- virtual void setCharSelectDialog(CharSelectDialog *const window)
- override final;
+ void setCharSelectDialog(CharSelectDialog *const window)
+ override final;
- virtual void requestCharacters() override final;
+ void requestCharacters() override final;
- virtual unsigned int baseSprite() const override final A_WARN_UNUSED;
+ unsigned int baseSprite() const override final A_WARN_UNUSED;
- virtual unsigned int hairSprite() const override final A_WARN_UNUSED;
+ unsigned int hairSprite() const override final A_WARN_UNUSED;
- virtual unsigned int maxSprite() const override final A_WARN_UNUSED;
+ unsigned int maxSprite() const override final A_WARN_UNUSED;
virtual void connect() = 0;
@@ -60,7 +60,7 @@ class CharServerHandler notfinal : public Net::CharServerHandler
static void processCharDelete(Net::MessageIn &msg);
- virtual void clear() override final;
+ void clear() override final;
protected:
CharServerHandler();
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index ee3bb9f6c..4ecc85692 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -40,14 +40,14 @@ class GameHandler notfinal : public Net::GameHandler
A_DELETE_COPY(GameHandler)
- virtual void who() const override final;
+ void who() const override final;
- virtual bool removeDeadBeings() const override final A_WARN_UNUSED
+ bool removeDeadBeings() const override final A_WARN_UNUSED
{ return true; }
virtual void setMap(const std::string &map);
- virtual bool canUseMagicBar() const override final A_WARN_UNUSED
+ bool canUseMagicBar() const override final A_WARN_UNUSED
{ return true; }
static void processWhoAnswer(Net::MessageIn &msg);
@@ -56,9 +56,9 @@ class GameHandler notfinal : public Net::GameHandler
static void processMapQuitResponse(Net::MessageIn &msg);
- virtual void clear() override final;
+ void clear() override final;
- virtual void initEngines() const override final;
+ void initEngines() const override final;
protected:
static std::string mMap;
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index b2d57574d..1dbf97b1c 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -49,41 +49,37 @@ class LoginHandler notfinal : public Net::LoginHandler
int supportedOptionalActions() const override A_WARN_UNUSED
{ return Net::RegistrationOptions::SetGenderOnRegister; }
- virtual bool isRegistrationEnabled() const
- override final A_WARN_UNUSED;
+ bool isRegistrationEnabled() const override final A_WARN_UNUSED;
- virtual void getRegistrationDetails() const override final;
+ void getRegistrationDetails() const override final;
- virtual unsigned int getMaxPasswordLength() const
- override A_WARN_UNUSED
+ unsigned int getMaxPasswordLength() const override A_WARN_UNUSED
{ return 24; }
- virtual void loginAccount(LoginData *const loginData)
- const override final;
+ void loginAccount(LoginData *const loginData) const override final;
- virtual void chooseServer(const unsigned int server,
- const bool persistentIp) const override;
+ void chooseServer(const unsigned int server,
+ const bool persistentIp) const override;
- virtual void registerAccount(const LoginData *const loginData)
- const override final;
+ void registerAccount(const LoginData *const loginData)
+ const override final;
- virtual const Worlds &getWorlds() const override final A_WARN_UNUSED;
+ const Worlds &getWorlds() const override final A_WARN_UNUSED;
- virtual void clearWorlds() override final;
+ 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 final;
+ void logout() const override final;
- virtual void changeEmail(const std::string &email)
- const override final;
+ void changeEmail(const std::string &email) const override final;
- virtual void unregisterAccount(const std::string &username,
- const std::string &password)
- const override final;
+ void unregisterAccount(const std::string &username,
+ const std::string &password)
+ const override final;
static void processUpdateHost(Net::MessageIn &msg);