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, 8 deletions

diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 2b3f15afa..766f4085e 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -29,7 +29,7 @@
 #include "debug.h"
 
 MumbleManager::MumbleManager() :
-    mLinkedMem(0)
+    mLinkedMem(nullptr)
 {
     mMapBase[0] = mMapBase[1] = mMapBase[2] = 0.;
     init();
@@ -45,7 +45,7 @@ MumbleManager::~MumbleManager()
 #else
         munmap(mLinkedMem, sizeof(struct LinkedMem));
 #endif
-        mLinkedMem = 0;
+        mLinkedMem = nullptr;
     }
 }
 
@@ -86,7 +86,7 @@ void MumbleManager::init()
 #ifdef WIN32
     HANDLE hMapObject = OpenFileMappingW(FILE_MAP_ALL_ACCESS,
                                          FALSE, L"MumbleLink");
-    if (hMapObject == NULL)
+    if (!hMapObject)
     {
         logger->log1("MumbleManager::init can't open MumbleLink");
         return;
@@ -95,10 +95,10 @@ void MumbleManager::init()
     mLinkedMem = (LinkedMem *) MapViewOfFile(hMapObject,
         FILE_MAP_ALL_ACCESS, 0, 0, sizeof(LinkedMem));
 
-    if (mLinkedMem == NULL)
+    if (!mLinkedMem)
     {
         CloseHandle(hMapObject);
-        hMapObject = NULL;
+        hMapObject = nullptr;
         logger->log1("MumbleManager::init can't map MumbleLink");
         return;
     }
@@ -116,12 +116,13 @@ void MumbleManager::init()
         return;
     }
 
-    mLinkedMem = static_cast<LinkedMem *>(mmap(NULL, sizeof(struct LinkedMem),
-        PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0));
+    mLinkedMem = static_cast<LinkedMem *>(mmap(nullptr,
+        sizeof(struct LinkedMem), PROT_READ | PROT_WRITE,
+        MAP_SHARED, shmfd, 0));
 
     if (mLinkedMem == reinterpret_cast<void *>(-1))
     {
-        mLinkedMem = NULL;
+        mLinkedMem = nullptr;
         logger->log1("MumbleManager::init can't map MumbleLink");
         return;
     }