diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/gui/setup_video.cpp | |
parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
download | manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/gui/setup_video.cpp')
-rw-r--r-- | src/gui/setup_video.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index ea181ea14..794fd3324 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -133,7 +133,7 @@ ModeListModel::ModeListModel() SDL_Rect **modes = SDL_ListModes(nullptr, SDL_FULLSCREEN | SDL_HWSURFACE); /* Check which modes are available */ - if (modes == static_cast<SDL_Rect **>(0)) + if (modes == static_cast<SDL_Rect **>(nullptr)) { logger->log1("No modes available"); } @@ -310,7 +310,7 @@ Setup_Video::Setup_Video(): mParticleDetail(3 - config.getIntValue("particleEmitterSkip")), mParticleDetailSlider(new Slider(0, 3)), mParticleDetailField(new Label), - mDialog(0) + mDialog(nullptr) { setName(_("Video")); @@ -446,13 +446,13 @@ Setup_Video::Setup_Video(): Setup_Video::~Setup_Video() { delete mModeListModel; - mModeListModel = 0; + mModeListModel = nullptr; delete mModeList; - mModeList = 0; + mModeList = nullptr; delete mOpenGLListModel; - mOpenGLListModel = 0; + mOpenGLListModel = nullptr; delete mDialog; - mDialog = 0; + mDialog = nullptr; } void Setup_Video::apply() @@ -594,7 +594,7 @@ void Setup_Video::action(const gcn::ActionEvent &event) if (mDialog) { mode = mDialog->getText(); - mDialog = 0; + mDialog = nullptr; } else { @@ -632,7 +632,7 @@ void Setup_Video::action(const gcn::ActionEvent &event) } if (id == "~videomode") { - mDialog = 0; + mDialog = nullptr; } else if (id == "guialpha") { |