Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

[oweals/minetest.git] / src / guiPasswordChange.h

diff --git a/src/guiPasswordChange.h b/src/guiPasswordChange.h
index 3104840c5b356e1eba4de598408682603d3b9dfd..9680ef13da25d7fe08d6c83e22c41c78e4575ca8 100644 (file)
--- a/src/guiPasswordChange.h
+++ b/src/guiPasswordChange.h
@@ -1,7 +1,7 @@
 /*
-Part of Minetest-c55
-Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
+Part of Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 Ciaran Gultnieks <ciaran@ciarang.com>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -19,7 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef GUIPASSWORDCHANGE_HEADER
 #define GUIPASSWORDCHANGE_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include "client.h"
 #include <string>
@@ -27,12 +27,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 class GUIPasswordChange : public GUIModalMenu
 {
 public:
-       GUIPasswordChange(gui::IGUIEnvironment* env,
-                       gui::IGUIElement* parent, s32 id,
-                       IMenuManager *menumgr,
-                       Client* client);
+       GUIPasswordChange(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
+                       IMenuManager *menumgr, Client *client);
        ~GUIPasswordChange();
-       
+
        void removeChildren();
        /*
                Remove and re-add (or reposition) stuff
@@ -41,14 +39,17 @@ public:
 
        void drawMenu();
 
-       bool acceptInput();
+       void acceptInput();
 
-       bool OnEvent(const SEvent& event);
-       
-private:
-       Client* m_client;
+       bool processInput();
+
+       bool OnEvent(const SEvent &event);
 
+private:
+       Client *m_client;
+       std::wstring m_oldpass;
+       std::wstring m_newpass;
+       std::wstring m_newpass_confirm;
 };
 
 #endif
-