Rename Module to ModuleBase

include/Nazara/Core/Core.hpp

@@ -8,14 +8,14 @@
 #define NAZARA_CORE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/Module.hpp>
+#include <Nazara/Core/ModuleBase.hpp>
 #include <Nazara/Core/TypeList.hpp>
 
 namespace Nz
 {
-	class NAZARA_CORE_API Core : public Module<Core>
+	class NAZARA_CORE_API Core : public ModuleBase<Core>
 	{
-		friend Module;
+		friend ModuleBase;
 
 		public:
 			using Dependencies = TypeList<>;

include/Nazara/Core/ModuleBase.hpp

@@ -13,7 +13,7 @@
 namespace Nz
 {
 	template<typename T>
-	class Module
+	class ModuleBase
 	{
 		friend class Core;
 
@@ -21,13 +21,13 @@ namespace Nz
 			static T* Instance();
 
 		protected:
-			Module(std::string moduleName, T* pointer);
-			~Module();
+			ModuleBase(std::string moduleName, T* pointer);
+			~ModuleBase();
 
 		private:
 			struct NoLog {};
 
-			Module(std::string moduleName, T* pointer, NoLog);
+			ModuleBase(std::string moduleName, T* pointer, NoLog);
 
 			void LogInit();
 
@@ -35,6 +35,6 @@ namespace Nz
 	};
 }
 
-#include <Nazara/Core/Module.inl>
+#include <Nazara/Core/ModuleBase.inl>
 
 #endif // NAZARA_MODULE_HPP

include/Nazara/Core/ModuleBase.inl

@@ -2,21 +2,21 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Core/Module.hpp>
+#include <Nazara/Core/ModuleBase.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
 	template<typename T>
-	Module<T>::Module(std::string moduleName, T* pointer) :
-	Module(std::move(moduleName), pointer, NoLog{})
+	ModuleBase<T>::ModuleBase(std::string moduleName, T* pointer) :
+	ModuleBase(std::move(moduleName), pointer, NoLog{})
 	{
 		LogInit();
 	}
 
 	template<typename T>
-	Module<T>::Module(std::string moduleName, T* pointer, NoLog) :
+	ModuleBase<T>::ModuleBase(std::string moduleName, T* pointer, NoLog) :
 	m_moduleName(std::move(moduleName))
 	{
 		NazaraAssert(T::s_instance == nullptr, "only one instance of " + m_moduleName + " must exist at a given time");
@@ -24,20 +24,20 @@ namespace Nz
 	}
 
 	template<typename T>
-	Module<T>::~Module()
+	ModuleBase<T>::~ModuleBase()
 	{
 		NazaraNotice("Uninitializing " + m_moduleName + "...");
 		T::s_instance = nullptr;
 	}
 
 	template<typename T>
-	T* Module<T>::Instance()
+	T* ModuleBase<T>::Instance()
 	{
 		return T::s_instance;
 	}
 
 	template<typename T>
-	void Module<T>::LogInit()
+	void ModuleBase<T>::LogInit()
 	{
 		NazaraNotice("Initializing " + m_moduleName + "...");
 	}