Drop GUIConfirmRegistration::m_address unused field
authorLoïc Blot <loic.blot@unix-experience.fr>
Tue, 12 Mar 2019 15:53:21 +0000 (16:53 +0100)
committerLoïc Blot <loic.blot@unix-experience.fr>
Tue, 12 Mar 2019 15:53:21 +0000 (16:53 +0100)
src/client/game.cpp
src/gui/guiConfirmRegistration.cpp
src/gui/guiConfirmRegistration.h

index 37680dda38df1dd5fe9f73a8dcdbc49bc392c72f..192c899d9e2162b1adebf61bc19dc2120cf4374f 100644 (file)
@@ -1545,7 +1545,7 @@ bool Game::connectToServer(const std::string &playername,
                                } else {
                                        registration_confirmation_shown = true;
                                        (new GUIConfirmRegistration(guienv, guienv->getRootGUIElement(), -1,
-                                                  &g_menumgr, client, playername, password, *address, connection_aborted))->drop();
+                                                  &g_menumgr, client, playername, password, connection_aborted))->drop();
                                }
                        } else {
                                wait_time += dtime;
index 6e6b7ad16cd2e9bd59beadf82f5cc6f72c6b392e..65c062aa59a2aebaeecdb4e9945d34e2d75ebdf8 100644 (file)
@@ -38,10 +38,10 @@ const int ID_cancel = 265;
 GUIConfirmRegistration::GUIConfirmRegistration(gui::IGUIEnvironment *env,
                gui::IGUIElement *parent, s32 id, IMenuManager *menumgr, Client *client,
                const std::string &playername, const std::string &password,
-               const std::string &address, bool *aborted) :
+               bool *aborted) :
                GUIModalMenu(env, parent, id, menumgr),
                m_client(client), m_playername(playername), m_password(password),
-               m_address(address), m_aborted(aborted)
+               m_aborted(aborted)
 {
 #ifdef __ANDROID__
        m_touchscreen_visible = false;
index 2f2066c21b5fd7f6f1c8b1e46e7426c65045773f..42c07e4edf03f3953c60c03311fdedbd6c7284a9 100644 (file)
@@ -32,7 +32,7 @@ public:
        GUIConfirmRegistration(gui::IGUIEnvironment *env, gui::IGUIElement *parent,
                        s32 id, IMenuManager *menumgr, Client *client,
                        const std::string &playername, const std::string &password,
-                       const std::string &address, bool *aborted);
+                       bool *aborted);
        ~GUIConfirmRegistration();
 
        void removeChildren();
@@ -61,7 +61,6 @@ private:
        Client *m_client = nullptr;
        const std::string &m_playername;
        const std::string &m_password;
-       const std::string &m_address;
        bool *m_aborted = nullptr;
        std::wstring m_pass_confirm = L"";
 };