Drop GUIConfirmRegistration::m_address unused field

minetest · Mar 12, 2019 · e22a69d · e22a69d
1 parent 38f6e7a
commit e22a69d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/client/game.cpp b/src/client/game.cpp
@@ -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;

diff --git a/src/gui/guiConfirmRegistration.cpp b/src/gui/guiConfirmRegistration.cpp
@@ -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;

diff --git a/src/gui/guiConfirmRegistration.h b/src/gui/guiConfirmRegistration.h
@@ -32,7 +32,7 @@ class GUIConfirmRegistration : public GUIModalMenu
 	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 @@ class GUIConfirmRegistration : public GUIModalMenu
 	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"";
 };