clang-modernize -use-nullptr

and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine

3 files changed, 5 insertions, 5 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
index 7a4dfdaccc..036b3fda05 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
@@ -102,7 +102,7 @@ bool ForceFeedbackDevice::InitForceFeedback(const LPDIRECTINPUTDEVICE8 device, i
 		}
 
 		LPDIRECTINPUTEFFECT pEffect;
-		if (SUCCEEDED(device->CreateEffect(f.guid, &eff, &pEffect, NULL)))
+		if (SUCCEEDED(device->CreateEffect(f.guid, &eff, &pEffect, nullptr)))
 		{
 			m_state_out.push_back(EffectState(pEffect));
 
@@ -155,7 +155,7 @@ bool ForceFeedbackDevice::UpdateOutput()
 				ok_count += SUCCEEDED(state.iface->Stop());
 			}
 
-			state.params = NULL;
+			state.params = nullptr;
 		}
 		else
 		{
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
index 9ef5873702..643ca2434b 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
@@ -29,7 +29,7 @@ class ForceFeedbackDevice : public Core::Device
 private:
 	struct EffectState
 	{
-		EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {}
+		EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(nullptr), size(0) {}
 
 		LPDIRECTINPUTEFFECT iface;
 		void*               params; // null when force hasn't changed
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
index 3ac954c9ad..c3b5cef2ef 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
@@ -72,11 +72,11 @@ public:
 
 	HRESULT QueryInterface(REFIID iid, LPVOID *ppv)
 	{
-		*ppv = NULL;
+		*ppv = nullptr;
 
 		if (CFEqual(&iid, IUnknownUUID))
 			*ppv = this;
-		if (NULL == *ppv)
+		if (nullptr == *ppv)
 			return E_NOINTERFACE;
 
 		((IUnknown*)*ppv)->AddRef();