Merge branch 'master' into strippedstripped1.1.11.12

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/focushandler.cpp
	src/guichan/graphics.cpp
	src/guichan/gui.cpp
	src/guichan/image.cpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/icon.cpp
	src/guichan/widgets/imagebutton.cpp
	src/guichan/widgets/listbox.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp

1 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index d3c1163dc..794fd3324 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -130,10 +130,10 @@ bool modeSorter(std::string mode1, std::string mode2)
 ModeListModel::ModeListModel()
 {
     /* Get available fullscreen/hardware modes */
-    SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
+    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")
     {