From d530ca22e067260441a6fb862e300205bbccdcd8 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Mon, 17 Oct 2016 16:14:35 +0200
Subject: [PATCH] Final pass of Clang warning fixes

---
 SDK/src/NDK/Systems/RenderSystem.cpp          |  2 +-
 include/Nazara/Graphics/TextSprite.hpp        |  1 -
 plugins/Assimp/Plugin.cpp                     |  8 ++--
 src/Nazara/Network/Linux/SocketPollerImpl.cpp |  2 +-
 src/Nazara/Noise/Worley.cpp                   | 14 +------
 src/Nazara/Utility/Formats/MD5AnimLoader.cpp  |  2 +-
 src/Nazara/Utility/SoftwareBuffer.cpp         | 40 ++++---------------
 src/Nazara/Utility/SoftwareBuffer.hpp         |  1 -
 .../Utility/EventHandler/EventState.cpp       |  4 +-
 .../Utility/EventHandler/FocusState.cpp       |  4 +-
 .../Engine/Utility/EventHandler/KeyState.cpp  |  4 +-
 .../Engine/Utility/EventHandler/MenuState.cpp |  6 +--
 .../Utility/EventHandler/MouseClickState.cpp  |  4 +-
 .../Utility/EventHandler/MouseEnterState.cpp  |  4 +-
 .../Utility/EventHandler/MouseMoveState.cpp   |  4 +-
 .../Utility/EventHandler/TextEnterState.cpp   |  4 +-
 .../EventHandler/WindowModificationState.cpp  |  4 +-
 17 files changed, 35 insertions(+), 73 deletions(-)

diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NDK/Systems/RenderSystem.cpp
index e251d9cf5..fbc2d3e08 100644
--- a/SDK/src/NDK/Systems/RenderSystem.cpp
+++ b/SDK/src/NDK/Systems/RenderSystem.cpp
@@ -185,7 +185,7 @@ namespace Ndk
 	* \param viewer Viewer of the scene
 	*/
 
-	void RenderSystem::UpdateDirectionalShadowMaps(const Nz::AbstractViewer& viewer)
+	void RenderSystem::UpdateDirectionalShadowMaps(const Nz::AbstractViewer& /*viewer*/)
 	{
 		if (!m_shadowRT.IsValid())
 			m_shadowRT.Create();
diff --git a/include/Nazara/Graphics/TextSprite.hpp b/include/Nazara/Graphics/TextSprite.hpp
index 8e0afa93e..3e05c2795 100644
--- a/include/Nazara/Graphics/TextSprite.hpp
+++ b/include/Nazara/Graphics/TextSprite.hpp
@@ -78,7 +78,6 @@ namespace Nz
 			Color m_color;
 			MaterialRef m_material;
 			Recti m_localBounds;
-			mutable bool m_verticesUpdated;
 			float m_scale;
 
 			static TextSpriteLibrary::LibraryMap s_library;
diff --git a/plugins/Assimp/Plugin.cpp b/plugins/Assimp/Plugin.cpp
index d1d0ace26..a668ec634 100644
--- a/plugins/Assimp/Plugin.cpp
+++ b/plugins/Assimp/Plugin.cpp
@@ -72,11 +72,11 @@ bool IsSupported(const String& extension)
 	return (aiIsExtensionSupported(dotExt.GetConstBuffer()) == AI_TRUE);
 }
 
-Ternary Check(Stream& stream, const MeshParams& parameters)
+Ternary Check(Stream& /*stream*/, const MeshParams& parameters)
 {
-    bool skip;
-    if (parameters.custom.GetBooleanParameter("SkipAssimpLoader", &skip) && skip)
-        return Ternary_False;
+	bool skip;
+	if (parameters.custom.GetBooleanParameter("SkipAssimpLoader", &skip) && skip)
+		return Ternary_False;
 
 	return Ternary_Unknown;
 }
diff --git a/src/Nazara/Network/Linux/SocketPollerImpl.cpp b/src/Nazara/Network/Linux/SocketPollerImpl.cpp
index ec6b8235e..c839d7352 100644
--- a/src/Nazara/Network/Linux/SocketPollerImpl.cpp
+++ b/src/Nazara/Network/Linux/SocketPollerImpl.cpp
@@ -85,7 +85,7 @@ namespace Nz
 		}
 
 		m_activeSockets.clear();
-		if (activeSockets > 0U)
+		if (activeSockets > 0)
 		{
 			int socketCount = activeSockets;
 			for (int i = 0; i < socketCount; ++i)
diff --git a/src/Nazara/Noise/Worley.cpp b/src/Nazara/Noise/Worley.cpp
index d544097e3..4f2aa90f7 100644
--- a/src/Nazara/Noise/Worley.cpp
+++ b/src/Nazara/Noise/Worley.cpp
@@ -110,23 +110,13 @@ namespace Nz
 		return it->first * m_functionScales[functionIndex];
 	}
 
-	float Worley::Get(float x, float y, float z, float scale) const
+	float Worley::Get(float /*x*/, float /*y*/, float /*z*/, float /*scale*/) const
 	{
-		NazaraUnused(x);
-		NazaraUnused(y);
-		NazaraUnused(z);
-		NazaraUnused(scale);
-
 		throw std::runtime_error("Worley 3D not available yet.");
 	}
 
-	float Worley::Get(float x, float y, float z, float w, float scale) const
+	float Worley::Get(float /*x*/, float /*y*/, float /*z*/, float /*w*/, float /*scale*/) const
 	{
-		NazaraUnused(x);
-		NazaraUnused(y);
-		NazaraUnused(z);
-		NazaraUnused(scale);
-
 		throw std::runtime_error("Worley 4D not available yet.");
 	}
 
diff --git a/src/Nazara/Utility/Formats/MD5AnimLoader.cpp b/src/Nazara/Utility/Formats/MD5AnimLoader.cpp
index 942b54f8e..e263ceef3 100644
--- a/src/Nazara/Utility/Formats/MD5AnimLoader.cpp
+++ b/src/Nazara/Utility/Formats/MD5AnimLoader.cpp
@@ -25,7 +25,7 @@ namespace Nz
 			return parser.Check();
 		}
 
-		bool Load(Animation* animation, Stream& stream, const AnimationParams& parameters)
+		bool Load(Animation* animation, Stream& stream, const AnimationParams& /*parameters*/)
 		{
 			///TODO: Utiliser les paramètres
 			MD5AnimParser parser(stream);
diff --git a/src/Nazara/Utility/SoftwareBuffer.cpp b/src/Nazara/Utility/SoftwareBuffer.cpp
index e9193c8dd..081f0fda3 100644
--- a/src/Nazara/Utility/SoftwareBuffer.cpp
+++ b/src/Nazara/Utility/SoftwareBuffer.cpp
@@ -11,10 +11,8 @@
 
 namespace Nz
 {
-	SoftwareBuffer::SoftwareBuffer(Buffer* parent, BufferType type) :
-	m_type(type)
+	SoftwareBuffer::SoftwareBuffer(Buffer* /*parent*/, BufferType type)
 	{
-		NazaraUnused(parent);
 	}
 
 	SoftwareBuffer::~SoftwareBuffer()
@@ -25,7 +23,7 @@ namespace Nz
 	{
 		NazaraUnused(usage);
 
-		// Cette allocation est protégée car sa taille dépend directement de paramètres utilisateurs
+		// Protect the allocation to prevent a memory exception to escape the function
 		try
 		{
 			m_buffer = new UInt8[size];
@@ -46,20 +44,11 @@ namespace Nz
 		delete[] m_buffer;
 	}
 
-	bool SoftwareBuffer::Fill(const void* data, unsigned int offset, unsigned int size, bool forceDiscard)
+	bool SoftwareBuffer::Fill(const void* data, unsigned int offset, unsigned int size, bool /*forceDiscard*/)
 	{
-		NazaraUnused(forceDiscard);
-
-		#if NAZARA_UTILITY_SAFE
-		if (m_mapped)
-		{
-			NazaraError("Buffer already mapped");
-			return false;
-		}
-		#endif
+		NazaraAssert(!m_mapped, "Buffer is already mapped");
 
 		std::memcpy(&m_buffer[offset], data, size);
-
 		return true;
 	}
 
@@ -68,18 +57,9 @@ namespace Nz
 		return false;
 	}
 
-	void* SoftwareBuffer::Map(BufferAccess access, unsigned int offset, unsigned int size)
+	void* SoftwareBuffer::Map(BufferAccess /*access*/, unsigned int offset, unsigned int /*size*/)
 	{
-		NazaraUnused(access);
-		NazaraUnused(size);
-
-		#if NAZARA_UTILITY_SAFE
-		if (m_mapped)
-		{
-			NazaraError("Buffer already mapped");
-			return nullptr;
-		}
-		#endif
+		NazaraAssert(!m_mapped, "Buffer is already mapped");
 
 		m_mapped = true;
 
@@ -88,13 +68,7 @@ namespace Nz
 
 	bool SoftwareBuffer::Unmap()
 	{
-		#if NAZARA_UTILITY_SAFE
-		if (!m_mapped)
-		{
-			NazaraError("Buffer not mapped");
-			return true;
-		}
-		#endif
+		NazaraAssert(m_mapped, "Buffer is not mapped");
 
 		m_mapped = false;
 
diff --git a/src/Nazara/Utility/SoftwareBuffer.hpp b/src/Nazara/Utility/SoftwareBuffer.hpp
index ab84b1899..1e074257a 100644
--- a/src/Nazara/Utility/SoftwareBuffer.hpp
+++ b/src/Nazara/Utility/SoftwareBuffer.hpp
@@ -29,7 +29,6 @@ namespace Nz
 			bool Unmap();
 
 		private:
-			BufferType m_type;
 			UInt8* m_buffer;
 			bool m_mapped;
 	};
diff --git a/tests/Engine/Utility/EventHandler/EventState.cpp b/tests/Engine/Utility/EventHandler/EventState.cpp
index d9ba49906..4f74e3000 100644
--- a/tests/Engine/Utility/EventHandler/EventState.cpp
+++ b/tests/Engine/Utility/EventHandler/EventState.cpp
@@ -35,12 +35,12 @@ void EventState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void EventState::Leave(Ndk::StateMachine& fsm)
+void EventState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool EventState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool EventState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }
diff --git a/tests/Engine/Utility/EventHandler/FocusState.cpp b/tests/Engine/Utility/EventHandler/FocusState.cpp
index 520bcbbef..bc9c77ab5 100644
--- a/tests/Engine/Utility/EventHandler/FocusState.cpp
+++ b/tests/Engine/Utility/EventHandler/FocusState.cpp
@@ -38,12 +38,12 @@ void FocusState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void FocusState::Leave(Ndk::StateMachine& fsm)
+void FocusState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool FocusState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool FocusState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }
diff --git a/tests/Engine/Utility/EventHandler/KeyState.cpp b/tests/Engine/Utility/EventHandler/KeyState.cpp
index 76f4e7657..043dc5837 100644
--- a/tests/Engine/Utility/EventHandler/KeyState.cpp
+++ b/tests/Engine/Utility/EventHandler/KeyState.cpp
@@ -31,12 +31,12 @@ void KeyState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void KeyState::Leave(Ndk::StateMachine& fsm)
+void KeyState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool KeyState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool KeyState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }
diff --git a/tests/Engine/Utility/EventHandler/MenuState.cpp b/tests/Engine/Utility/EventHandler/MenuState.cpp
index 7838275a9..b659f51b2 100644
--- a/tests/Engine/Utility/EventHandler/MenuState.cpp
+++ b/tests/Engine/Utility/EventHandler/MenuState.cpp
@@ -14,7 +14,7 @@ m_selectedNextState(-1)
 {
 }
 
-void MenuState::Enter(Ndk::StateMachine& fsm)
+void MenuState::Enter(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(true);
 	DrawMenu();
@@ -29,13 +29,13 @@ void MenuState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void MenuState::Leave(Ndk::StateMachine& fsm)
+void MenuState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 	m_selectedNextState = -1;
 }
 
-bool MenuState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool MenuState::Update(Ndk::StateMachine& fsm, float /*elapsedTime*/)
 {
 	if (m_selectedNextState != -1) {
 		fsm.ChangeState(StateFactory::Get(m_selectedNextState + 1));
diff --git a/tests/Engine/Utility/EventHandler/MouseClickState.cpp b/tests/Engine/Utility/EventHandler/MouseClickState.cpp
index d373d68a2..1de923bd4 100644
--- a/tests/Engine/Utility/EventHandler/MouseClickState.cpp
+++ b/tests/Engine/Utility/EventHandler/MouseClickState.cpp
@@ -43,12 +43,12 @@ void MouseClickState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void MouseClickState::Leave(Ndk::StateMachine& fsm)
+void MouseClickState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool MouseClickState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool MouseClickState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }
diff --git a/tests/Engine/Utility/EventHandler/MouseEnterState.cpp b/tests/Engine/Utility/EventHandler/MouseEnterState.cpp
index 9e770806f..2a13f1c1e 100644
--- a/tests/Engine/Utility/EventHandler/MouseEnterState.cpp
+++ b/tests/Engine/Utility/EventHandler/MouseEnterState.cpp
@@ -38,12 +38,12 @@ void MouseEnterState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void MouseEnterState::Leave(Ndk::StateMachine& fsm)
+void MouseEnterState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool MouseEnterState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool MouseEnterState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }
diff --git a/tests/Engine/Utility/EventHandler/MouseMoveState.cpp b/tests/Engine/Utility/EventHandler/MouseMoveState.cpp
index a01ab163e..6a2cbd947 100644
--- a/tests/Engine/Utility/EventHandler/MouseMoveState.cpp
+++ b/tests/Engine/Utility/EventHandler/MouseMoveState.cpp
@@ -38,12 +38,12 @@ void MouseMoveState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void MouseMoveState::Leave(Ndk::StateMachine& fsm)
+void MouseMoveState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool MouseMoveState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool MouseMoveState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }
diff --git a/tests/Engine/Utility/EventHandler/TextEnterState.cpp b/tests/Engine/Utility/EventHandler/TextEnterState.cpp
index 8f3ae154c..1a0516f29 100644
--- a/tests/Engine/Utility/EventHandler/TextEnterState.cpp
+++ b/tests/Engine/Utility/EventHandler/TextEnterState.cpp
@@ -36,12 +36,12 @@ void TextEnterState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void TextEnterState::Leave(Ndk::StateMachine& fsm)
+void TextEnterState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool TextEnterState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool TextEnterState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }
diff --git a/tests/Engine/Utility/EventHandler/WindowModificationState.cpp b/tests/Engine/Utility/EventHandler/WindowModificationState.cpp
index 3f0bf7fc1..e50d94f51 100644
--- a/tests/Engine/Utility/EventHandler/WindowModificationState.cpp
+++ b/tests/Engine/Utility/EventHandler/WindowModificationState.cpp
@@ -38,12 +38,12 @@ void WindowModificationState::Enter(Ndk::StateMachine& fsm)
 	});
 }
 
-void WindowModificationState::Leave(Ndk::StateMachine& fsm)
+void WindowModificationState::Leave(Ndk::StateMachine& /*fsm*/)
 {
 	m_text.SetVisible(false);
 }
 
-bool WindowModificationState::Update(Ndk::StateMachine& fsm, float elapsedTime)
+bool WindowModificationState::Update(Ndk::StateMachine& /*fsm*/, float /*elapsedTime*/)
 {
 	return true;
 }