improve loginhandler class.

2 files changed, 19 insertions, 21 deletions

diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index eb0d1914b..d0aa9b808 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -105,7 +105,7 @@ void LoginHandler::connect()
     MessageOut outMsg(CMSG_SERVER_VERSION_REQUEST);
 }
 
-bool LoginHandler::isConnected()
+bool LoginHandler::isConnected() const
 {
     if (!mNetwork)
         return false;
@@ -121,7 +121,7 @@ void LoginHandler::disconnect()
 
 void LoginHandler::changePassword(const std::string &username A_UNUSED,
                                   const std::string &oldPassword,
-                                  const std::string &newPassword)
+                                  const std::string &newPassword) const
 {
     MessageOut outMsg(CMSG_CHAR_PASSWORD_CHANGE);
     outMsg.writeStringNoLog(oldPassword, 24);
@@ -130,7 +130,7 @@ void LoginHandler::changePassword(const std::string &username A_UNUSED,
 
 void LoginHandler::sendLoginRegister(const std::string &username,
                                      const std::string &password,
-                                     const std::string &email A_UNUSED)
+                                     const std::string &email A_UNUSED) const
 {
     MessageOut outMsg(0x0064);
     outMsg.writeInt32(0); // client version
@@ -146,12 +146,12 @@ void LoginHandler::sendLoginRegister(const std::string &username,
     outMsg.writeInt8(0x03);
 }
 
-ServerInfo *LoginHandler::getCharServer()
+ServerInfo *LoginHandler::getCharServer() const
 {
     return &charServer;
 }
 
-void LoginHandler::requestUpdateHosts()
+void LoginHandler::requestUpdateHosts() const
 {
     MessageOut outMsg(CMSG_SEND_CLIENT_INFO);
     outMsg.writeInt8(CLIENT_PROTOCOL_VERSION);
@@ -174,12 +174,10 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg)
     mVersionResponse = true;
 }
 
-void LoginHandler::processUpdateHost2(Net::MessageIn &msg)
+void LoginHandler::processUpdateHost2(Net::MessageIn &msg) const
 {
-    int len;
-
-    len = msg.readInt16() - 4;
-    std::string updateHost = msg.readString(len);
+    int len = msg.readInt16() - 4;
+    const std::string updateHost = msg.readString(len);
 
     splitToStringVector(loginData.updateHosts, updateHost, '|');
     FOR_EACH (StringVectIter, it, loginData.updateHosts)
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index a1b1095ba..d542777cd 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -45,36 +45,36 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
 
         ~LoginHandler();
 
-        void handleMessage(Net::MessageIn &msg);
+        void handleMessage(Net::MessageIn &msg) override;
 
-        void connect();
+        void connect() override;
 
-        bool isConnected() A_WARN_UNUSED;
+        bool isConnected() const override A_WARN_UNUSED;
 
-        void disconnect();
+        void disconnect() override;
 
-        int supportedOptionalActions() const A_WARN_UNUSED
+        int supportedOptionalActions() const override A_WARN_UNUSED
         { return SetGenderOnRegister; }
 
-        unsigned int getMaxPasswordLength() const A_WARN_UNUSED
+        unsigned int getMaxPasswordLength() const override A_WARN_UNUSED
         { return 25; }
 
         void changePassword(const std::string &username,
                             const std::string &oldPassword,
-                            const std::string &newPassword);
+                            const std::string &newPassword) const override;
 
-        ServerInfo *getCharServer() A_WARN_UNUSED;
+        ServerInfo *getCharServer() const override A_WARN_UNUSED;
 
         void processServerVersion(Net::MessageIn &msg);
 
-        void requestUpdateHosts();
+        void requestUpdateHosts() const;
 
-        void processUpdateHost2(Net::MessageIn &msg);
+        void processUpdateHost2(Net::MessageIn &msg) const;
 
     private:
         void sendLoginRegister(const std::string &username,
                                const std::string &password,
-                               const std::string &email);
+                               const std::string &email) const override;
 };
 
 } // namespace EAthena