summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-01 17:01:33 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-01 17:01:33 +0300
commit69d405520c933b2f4c659ea6af00eb4bb7a4512f (patch)
tree16039af91e3b6c2060cf8fd743f1e69de19e660a
parent1c9de0aa5375af4f37308dea014aebacbc3daba5 (diff)
downloadmv-69d405520c933b2f4c659ea6af00eb4bb7a4512f.tar.gz
mv-69d405520c933b2f4c659ea6af00eb4bb7a4512f.tar.bz2
mv-69d405520c933b2f4c659ea6af00eb4bb7a4512f.tar.xz
mv-69d405520c933b2f4c659ea6af00eb4bb7a4512f.zip
Fix compilation warnings after previous commits.
-rw-r--r--src/client.cpp2
-rw-r--r--src/gui/editserverdialog.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 835bbc965..634fa1e80 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -251,7 +251,7 @@ Client::Client(const Options &options):
mServerConfigDir(""),
mUsersDir(""),
mNpcsDir(""),
- mGame(0),
+ mGame(nullptr),
mCurrentDialog(nullptr),
mQuitDialog(nullptr),
mDesktop(nullptr),
diff --git a/src/gui/editserverdialog.cpp b/src/gui/editserverdialog.cpp
index 43457456e..c22446933 100644
--- a/src/gui/editserverdialog.cpp
+++ b/src/gui/editserverdialog.cpp
@@ -234,6 +234,6 @@ void EditServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
}
else if (key.getValue() == Key::ENTER)
{
- action(gcn::ActionEvent(NULL, mOkButton->getActionEventId()));
+ action(gcn::ActionEvent(nullptr, mOkButton->getActionEventId()));
}
}