Cleanup pass

include/Nazara/Utility/IndexIterator.hpp

@@ -26,15 +26,15 @@ namespace Nz
 
 			Reference operator*() const;
 
-			Reference operator[](unsigned int index) const;
+			Reference operator[](std::size_t index) const;
 
 			IndexIterator& operator=(const IndexIterator& iterator);
 
-			IndexIterator operator+(unsigned int indexCount) const;
-			IndexIterator operator-(unsigned int indexCount) const;
+			IndexIterator operator+(std::size_t indexCount) const;
+			IndexIterator operator-(std::size_t indexCount) const;
 
-			IndexIterator& operator+=(unsigned int indexCount);
-			IndexIterator& operator-=(unsigned int indexCount);
+			IndexIterator& operator+=(std::size_t indexCount);
+			IndexIterator& operator-=(std::size_t indexCount);
 
 			IndexIterator& operator++();
 			IndexIterator operator++(int);
@@ -50,10 +50,10 @@ namespace Nz
 			friend bool operator>=(const IndexIterator& lhs, const IndexIterator& rhs);
 
 		private:
-			IndexIterator(IndexMapper* mapper, unsigned int index);
+			IndexIterator(IndexMapper* mapper, std::size_t index);
 
 			IndexMapper* m_mapper;
-			unsigned int m_index;
+			std::size_t m_index;
 	};
 
 	class IndexIterator::Reference
@@ -70,10 +70,10 @@ namespace Nz
 			operator UInt32() const;
 
 		private:
-			Reference(IndexMapper* mapper, unsigned int index);
+			Reference(IndexMapper* mapper, std::size_t index);
 
 			IndexMapper* m_mapper;
-			unsigned int m_index;
+			std::size_t m_index;
 	};
 }
 

include/Nazara/Utility/IndexIterator.inl

@@ -20,7 +20,7 @@ namespace Nz
 	{
 	}
 
-	inline IndexIterator::IndexIterator(IndexMapper* mapper, unsigned int index) :
+	inline IndexIterator::IndexIterator(IndexMapper* mapper, std::size_t index) :
 	m_mapper(mapper),
 	m_index(index)
 	{
@@ -31,7 +31,7 @@ namespace Nz
 		return Reference(m_mapper, m_index);
 	}
 
-	inline IndexIterator::Reference IndexIterator::operator[](unsigned int index) const
+	inline IndexIterator::Reference IndexIterator::operator[](std::size_t index) const
 	{
 		return Reference(m_mapper, m_index+index);
 	}
@@ -44,24 +44,24 @@ namespace Nz
 		return *this;
 	}
 
-	inline IndexIterator IndexIterator::operator+(unsigned int indexCount) const
+	inline IndexIterator IndexIterator::operator+(std::size_t indexCount) const
 	{
 		return IndexIterator(m_mapper, m_index + indexCount);
 	}
 
-	inline IndexIterator IndexIterator::operator-(unsigned int indexCount) const
+	inline IndexIterator IndexIterator::operator-(std::size_t indexCount) const
 	{
 		return IndexIterator(m_mapper, m_index - indexCount);
 	}
 
-	inline IndexIterator& IndexIterator::operator+=(unsigned int indexCount)
+	inline IndexIterator& IndexIterator::operator+=(std::size_t indexCount)
 	{
 		m_index += indexCount;
 
 		return *this;
 	}
 
-	inline IndexIterator& IndexIterator::operator-=(unsigned int indexCount)
+	inline IndexIterator& IndexIterator::operator-=(std::size_t indexCount)
 	{
 		m_index += indexCount;
 
@@ -133,7 +133,7 @@ namespace Nz
 
 	/**************************IndexIterator::Reference*************************/
 
-	inline IndexIterator::Reference::Reference(IndexMapper* mapper, unsigned int index) :
+	inline IndexIterator::Reference::Reference(IndexMapper* mapper, std::size_t index) :
 	m_mapper(mapper),
 	m_index(index)
 	{
@@ -148,7 +148,7 @@ namespace Nz
 
 	inline IndexIterator::Reference& IndexIterator::Reference::operator=(const IndexIterator::Reference& reference)
 	{
-		m_mapper->Set(m_index, reference); // Conversion implicite en UInt32
+		m_mapper->Set(m_index, reference); // Implicit conversion to UInt32
 
 		return *this;
 	}

include/Nazara/Utility/IndexMapper.hpp

@@ -17,9 +17,6 @@ namespace Nz
 	class IndexIterator;
 	class SubMesh;
 
-	using IndexMapperGetter = UInt32 (*)(const void* buffer, unsigned int i);
-	using IndexMapperSetter = void (*)(void* buffer, unsigned int i, UInt32 value);
-
 	class NAZARA_UTILITY_API IndexMapper
 	{
 		public:
@@ -29,11 +26,11 @@ namespace Nz
 			IndexMapper(const SubMesh* subMesh, BufferAccess access = BufferAccess_ReadOnly);
 			~IndexMapper() = default;
 
-			UInt32 Get(unsigned int i) const;
+			UInt32 Get(std::size_t i) const;
 			const IndexBuffer* GetBuffer() const;
-			unsigned int GetIndexCount() const;
+			std::size_t GetIndexCount() const;
 
-			void Set(unsigned int i, UInt32 value);
+			void Set(std::size_t i, UInt32 value);
 
 			void Unmap();
 
@@ -45,10 +42,13 @@ namespace Nz
 			// Méthodes STD
 
 		private:
+			using Getter = UInt32(*)(const void* buffer, std::size_t i);
+			using Setter = void(*)(void* buffer, std::size_t i, UInt32 value);
+
 			BufferMapper<IndexBuffer> m_mapper;
-			IndexMapperGetter m_getter;
-			IndexMapperSetter m_setter;
-			unsigned int m_indexCount;
+			Getter m_getter;
+			Setter m_setter;
+			std::size_t m_indexCount;
 };
 }
 

include/Nazara/Utility/TriangleIterator.hpp

@@ -24,7 +24,7 @@ namespace Nz
 
 			bool Advance();
 
-			UInt32 operator[](unsigned int i) const;
+			UInt32 operator[](std::size_t i) const;
 
 			void Unmap();
 
@@ -32,8 +32,8 @@ namespace Nz
 			PrimitiveMode m_primitiveMode;
 			UInt32 m_triangleIndices[3];
 			IndexMapper m_indexMapper;
-			unsigned int m_currentIndex;
-			unsigned int m_indexCount;
+			std::size_t m_currentIndex;
+			std::size_t m_indexCount;
 	};
 }