diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-17 22:46:48 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-17 22:46:48 +0200 |
| commit | aaec4d115cd0048bbc4bed3d8b1d33492b2a51fa (patch) | |
| tree | 93ff1f00ebe244f222cd367f115e3f5f8fe04149 /src/gui | |
| parent | 9b4d924d74587f489ac8141134b1c504e54a0684 (diff) | |
| parent | 7b2b5dabb44ce1448f3af99fcba96eefe6d9147d (diff) | |
| download | mana-aaec4d115cd0048bbc4bed3d8b1d33492b2a51fa.tar.gz mana-aaec4d115cd0048bbc4bed3d8b1d33492b2a51fa.tar.bz2 mana-aaec4d115cd0048bbc4bed3d8b1d33492b2a51fa.tar.xz mana-aaec4d115cd0048bbc4bed3d8b1d33492b2a51fa.zip | |
Merge branch '0.0.29'
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/serverselectdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/serverselectdialog.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/serverselectdialog.cpp b/src/gui/serverselectdialog.cpp index ccdf2bb6..f492ebc7 100644 --- a/src/gui/serverselectdialog.cpp +++ b/src/gui/serverselectdialog.cpp @@ -55,7 +55,7 @@ class ServerListModel : public gcn::ListModel } }; -ServerSelectDialog::ServerSelectDialog(LoginData *loginData, int nextState): +ServerSelectDialog::ServerSelectDialog(LoginData *loginData, State nextState): Window(_("Select Server")), mLoginData(loginData), mNextState(nextState) diff --git a/src/gui/serverselectdialog.h b/src/gui/serverselectdialog.h index b80ad286..fd1484af 100644 --- a/src/gui/serverselectdialog.h +++ b/src/gui/serverselectdialog.h @@ -24,6 +24,8 @@ #include "gui/widgets/window.h" +#include "main.h" + #include <guichan/actionlistener.hpp> #include <guichan/listmodel.hpp> @@ -42,7 +44,7 @@ class ServerSelectDialog : public Window, public gcn::ActionListener { * * @see Window::Window */ - ServerSelectDialog(LoginData *loginData, int nextState); + ServerSelectDialog(LoginData *loginData, State nextState); /** * Destructor. @@ -59,7 +61,7 @@ class ServerSelectDialog : public Window, public gcn::ActionListener { ServerListModel *mServerListModel; gcn::ListBox *mServerList; gcn::Button *mOkButton; - int mNextState; + State mNextState; }; #endif |