diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/gui/logindialog.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/gui/logindialog.cpp')
| -rw-r--r-- | src/gui/logindialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index 136a01b37..86b3dc28b 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -83,7 +83,7 @@ public: LoginDialog::LoginDialog(LoginData *data, std::string serverName, std::string *updateHost): - Window(_("Login"), false, 0, "login.xml"), + Window(_("Login"), false, nullptr, "login.xml"), mLoginData(data), mUpdateHost(updateHost), mServerName(serverName) @@ -166,7 +166,7 @@ LoginDialog::LoginDialog(LoginData *data, std::string serverName, LoginDialog::~LoginDialog() { delete mUpdateTypeModel; - mUpdateTypeModel = 0; + mUpdateTypeModel = nullptr; } void LoginDialog::action(const gcn::ActionEvent &event) @@ -226,9 +226,9 @@ void LoginDialog::keyPressed(gcn::KeyEvent &keyEvent) gcn::Key key = keyEvent.getKey(); if (key.getValue() == Key::ESCAPE) - action(gcn::ActionEvent(NULL, mServerButton->getActionEventId())); + action(gcn::ActionEvent(nullptr, mServerButton->getActionEventId())); else if (key.getValue() == Key::ENTER) - action(gcn::ActionEvent(NULL, mLoginButton->getActionEventId())); + action(gcn::ActionEvent(nullptr, mLoginButton->getActionEventId())); else mLoginButton->setEnabled(canSubmit()); } |