From 2bfb798dd9e97dfc8699dada8e7abef7bf94a2c7 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 3 Jan 2015 21:45:37 +0100
Subject: [PATCH] Minor changes

Former-commit-id: fd74c48a546663f4d4802826ee2d396b0874e2c9
---
 include/Nazara/Lua/LuaClass.inl  | 1 -
 src/Nazara/Core/File.cpp         | 2 +-
 src/Nazara/Lua/LuaInstance.cpp   | 2 +-
 src/Nazara/Renderer/Context.cpp  | 2 +-
 src/Nazara/Renderer/Renderer.cpp | 2 +-
 src/Nazara/Renderer/Shader.cpp   | 6 +++---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/Nazara/Lua/LuaClass.inl b/include/Nazara/Lua/LuaClass.inl
index a63adc081..79c8a88ce 100644
--- a/include/Nazara/Lua/LuaClass.inl
+++ b/include/Nazara/Lua/LuaClass.inl
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Error.hpp>
-#include <iostream>
 #include <Nazara/Core/MemoryHelper.hpp>
 #include <Nazara/Lua/Debug.hpp>
 
diff --git a/src/Nazara/Core/File.cpp b/src/Nazara/Core/File.cpp
index aa803a9fa..512a29144 100644
--- a/src/Nazara/Core/File.cpp
+++ b/src/Nazara/Core/File.cpp
@@ -733,7 +733,7 @@ bool NzFile::FillHash(NzAbstractHash* hash) const
 	unsigned int size;
 	while (remainingSize > 0)
 	{
-		size = (remainingSize >= NAZARA_CORE_FILE_BUFFERSIZE) ? NAZARA_CORE_FILE_BUFFERSIZE : static_cast<unsigned int>(remainingSize);
+		size = std::min(remainingSize, static_cast<nzUInt64>(NAZARA_CORE_FILE_BUFFERSIZE));
 		if (file.Read(&buffer[0], sizeof(char), size) != sizeof(char)*size)
 		{
 			NazaraError("Unable to read file");
diff --git a/src/Nazara/Lua/LuaInstance.cpp b/src/Nazara/Lua/LuaInstance.cpp
index f6436138b..c1d0c96c8 100644
--- a/src/Nazara/Lua/LuaInstance.cpp
+++ b/src/Nazara/Lua/LuaInstance.cpp
@@ -557,7 +557,7 @@ bool NzLuaInstance::IsOfType(int index, nzLuaType type) const
 			return lua_isuserdata(m_state, index) == 1;
 	}
 
-	NazaraError("Lua type unhandled (0x" + NzString::Number(type, 16) + ')');
+	NazaraError("Lua type not handled (0x" + NzString::Number(type, 16) + ')');
 	return false;
 }
 
diff --git a/src/Nazara/Renderer/Context.cpp b/src/Nazara/Renderer/Context.cpp
index 031e9b780..10654fcc3 100644
--- a/src/Nazara/Renderer/Context.cpp
+++ b/src/Nazara/Renderer/Context.cpp
@@ -38,7 +38,7 @@ namespace
 		switch (source)
 		{
 			case GL_DEBUG_SOURCE_API:
-				ss << "OpenGL";
+				ss << "OpenGL API";
 				break;
 
 			case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp
index 0552d8e38..28e0b5288 100644
--- a/src/Nazara/Renderer/Renderer.cpp
+++ b/src/Nazara/Renderer/Renderer.cpp
@@ -924,7 +924,7 @@ bool NzRenderer::IsComponentTypeSupported(nzComponentType type)
 			return false;
 	}
 
-	NazaraError("Attribute type out of enum (0x" + NzString::Number(type, 16) + ')');
+	NazaraError("Attribute type not handled (0x" + NzString::Number(type, 16) + ')');
 	return false;
 }
 
diff --git a/src/Nazara/Renderer/Shader.cpp b/src/Nazara/Renderer/Shader.cpp
index 7729c1035..8d9239da2 100644
--- a/src/Nazara/Renderer/Shader.cpp
+++ b/src/Nazara/Renderer/Shader.cpp
@@ -254,10 +254,10 @@ NzString NzShader::GetSourceCode(nzShaderStage stage) const
 	unsigned int totalLength = 0;
 	for (unsigned int shader : m_attachedShaders[stage])
 	{
-        GLint length;
-        glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &length);
+		GLint length;
+		glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &length);
 
-        totalLength += length - 1;
+		totalLength += length - 1;
 	}
 
 	totalLength += (m_attachedShaders[stage].size()-1)*(sizeof(sep)/sizeof(char));