From 1c0172cca4f1e90679321912e20436a7f42f122d Mon Sep 17 00:00:00 2001
From: Goraf <22941576+Goraf@users.noreply.github.com>
Date: Sat, 24 Feb 2018 15:32:06 +0100
Subject: more nullptr

---
 plugins/Boltun/src/Engine/PerContactData.h | 8 ++++----
 plugins/Boltun/src/Engine/ValueChooser.h   | 2 +-
 plugins/Boltun/src/config.h                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Boltun/src')

diff --git a/plugins/Boltun/src/Engine/PerContactData.h b/plugins/Boltun/src/Engine/PerContactData.h
index 71dcec126d..f573423bd3 100644
--- a/plugins/Boltun/src/Engine/PerContactData.h
+++ b/plugins/Boltun/src/Engine/PerContactData.h
@@ -40,7 +40,7 @@ class PerContactData
 		}
 
 		inline InternalData()
-			: data(NULL)
+			: data(nullptr)
 		{
 			assert(false);
 		}
@@ -78,7 +78,7 @@ PerContactData<Source, Data, ContactHandle>::~PerContactData()
 	mir_cslock mlck(mapLock);
 	if (timerID)
 	{
-		KillTimer(NULL, timerID);
+		KillTimer(nullptr, timerID);
 		perContactDataObjects.erase(timerID);
 	}
 	while (!datas.empty())
@@ -106,7 +106,7 @@ void PerContactData<Source, Data, ContactHandle>::PutData(ContactHandle Contact)
 	::time(&(datas[Contact]->time));
 	if (!timerID)
 	{
-		timerID = SetTimer(NULL, 0, 30000, RunTimerProc<Source, Data, ContactHandle>);
+		timerID = SetTimer(nullptr, 0, 30000, RunTimerProc<Source, Data, ContactHandle>);
 		assert(timerID);
 		perContactDataObjects[timerID] = this;
 	}
@@ -138,7 +138,7 @@ void PerContactData<Source, Data, ContactHandle>::CleanupData()
 	}
 	if (timerID && datas.empty()) //timerID may become NULL before locking, so should check
 	{
-		KillTimer(NULL, timerID);
+		KillTimer(nullptr, timerID);
 		perContactDataObjects.erase(timerID);
 	}
 }
diff --git a/plugins/Boltun/src/Engine/ValueChooser.h b/plugins/Boltun/src/Engine/ValueChooser.h
index acd63dfd8f..e442f14530 100644
--- a/plugins/Boltun/src/Engine/ValueChooser.h
+++ b/plugins/Boltun/src/Engine/ValueChooser.h
@@ -37,7 +37,7 @@ public:
 		:data(vec), notifyOnReset(NotifyOnReset)
 	{
 		//randomize();
-		numbers = NULL;
+		numbers = nullptr;
 		UpdateLength();
 	}
 
diff --git a/plugins/Boltun/src/config.h b/plugins/Boltun/src/config.h
index 46fea99ffa..eeb697d4b0 100644
--- a/plugins/Boltun/src/config.h
+++ b/plugins/Boltun/src/config.h
@@ -84,7 +84,7 @@ private:
 
 public:
 	PtrProperty(Getter g, Setter s)
-		:getter(g), setter(s), cacheValid(false), cached(NULL)
+		:getter(g), setter(s), cacheValid(false), cached(nullptr)
 	{
 	}
 
-- 
cgit v1.2.3