X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=source%2Finput%2Fwindows%2Fgamecontroller.cpp;fp=source%2Finput%2Fwindows%2Fgamecontroller.cpp;h=46536b39d37acba729c300c02a748a7a825bd18f;hp=df29666cc73904d9dd83d437e50d58d94a6aa97d;hb=507fa60f32bd3f64840a2cdd1be5d68478432b55;hpb=cea95778acfd6e172639cafd7ad249cc13ceb2a6

diff --git a/source/input/windows/gamecontroller.cpp b/source/input/windows/gamecontroller.cpp
index df29666..46536b3 100644
--- a/source/input/windows/gamecontroller.cpp
+++ b/source/input/windows/gamecontroller.cpp
@@ -34,7 +34,7 @@ GameController::GameController(unsigned index):
 
 GameController::~GameController()
 {
-	use_event_dispatcher(0);
+	use_event_dispatcher(nullptr);
 
 	delete priv;
 }
@@ -75,9 +75,9 @@ void GameController::use_event_dispatcher(IO::EventDispatcher *ed)
 	else if(priv->event_pipe)
 	{
 		GameControllerTimerThread::remove_slot(*priv->timer_slot);
-		priv->timer_slot = 0;
+		priv->timer_slot = nullptr;
 		delete priv->event_pipe;
-		priv->event_pipe = 0;
+		priv->event_pipe = nullptr;
 	}
 }
 
@@ -134,7 +134,7 @@ void GameController::Private::update_state(GameController &ctrl, const XINPUT_ST
 }
 
 
-GameControllerTimerThread *GameControllerTimerThread::thread = 0;
+GameControllerTimerThread *GameControllerTimerThread::thread = nullptr;
 
 GameControllerTimerThread::GameControllerTimerThread():
 	Thread("GameController")
@@ -163,7 +163,7 @@ void GameControllerTimerThread::remove_slot(Time::Timer::Slot &slot)
 	{
 		thread->timer.add(Time::zero);
 		delete thread;
-		thread = 0;
+		thread = nullptr;
 	}
 }