feat: revert IDDB rename

- leave it as is for now

Author: qudix

include/REL/ID.h

@@ -2,7 +2,7 @@
 
 #include "REX/REX/FModule.h"
 
-#include "REL/FIDDB.h"
+#include "REL/IDDB.h"
 
 namespace REL
 {
@@ -34,7 +34,7 @@ namespace REL
 
 		[[nodiscard]] std::size_t offset() const
 		{
-			const auto iddb = FIDDB::GetSingleton();
+			const auto iddb = IDDB::GetSingleton();
 			return iddb->offset(m_id);
 		}
 

include/REL/FIDDB.h include/REL/IDDB.hinclude/REL/FIDDB.h renamed to include/REL/IDDB.h

@@ -7,8 +7,8 @@
 
 namespace REL
 {
-	class FIDDB :
-		public REX::TSingleton<FIDDB>
+	class IDDB :
+		public REX::TSingleton<IDDB>
 	{
 	public:
 		enum class Loader : std::uint32_t
@@ -35,7 +35,7 @@ namespace REL
 			std::uint64_t offset;
 		};
 
-		FIDDB();
+		IDDB();
 
 		std::uint64_t offset(std::uint64_t a_id) const;
 
@@ -67,6 +67,4 @@ namespace REL
 		std::span<MAPPING>       m_v0;
 		std::span<std::uint32_t> m_v5;
 	};
-
-	using IDDB [[deprecated("Renamed to 'REL::FIDDB'")]] = FIDDB;
 }

include/REL/Offset2ID.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "REL/FIDDB.h"
+#include "REL/IDDB.h"
 
 #include "REX/BASE.h"
 
@@ -10,7 +10,7 @@ namespace REL
 		public REX::TSingleton<Offset2ID>
 	{
 	public:
-		using value_type = FIDDB::MAPPING;
+		using value_type = IDDB::MAPPING;
 		using container_type = std::vector<value_type>;
 		using size_type = typename container_type::size_type;
 		using const_iterator = typename container_type::const_iterator;

include/REL/REL.h

@@ -3,9 +3,9 @@
 #include "REL/ASM.h"
 #include "REL/FHook.h"
 #include "REL/FHookStore.h"
-#include "REL/FIDDB.h"
 #include "REL/IAT.h"
 #include "REL/ID.h"
+#include "REL/IDDB.h"
 #include "REL/IHook.h"
 #include "REL/Offset.h"
 #include "REL/Offset2ID.h"

src/REL/FIDDB.cpp src/REL/IDDB.cppsrc/REL/FIDDB.cpp renamed to src/REL/IDDB.cpp

@@ -1,4 +1,4 @@
-#include "REL/FIDDB.h"
+#include "REL/IDDB.h"
 
 #include "REL/Version.h"
 
@@ -9,7 +9,7 @@
 
 namespace REL
 {
-	class FIDDB::STREAM
+	class IDDB::STREAM
 	{
 	public:
 		using stream_type = std::ifstream;
@@ -51,10 +51,10 @@ namespace REL
 		stream_type _stream;
 	};
 
-	class FIDDB::HEADER_V2
+	class IDDB::HEADER_V2
 	{
 	public:
-		HEADER_V2(FIDDB::STREAM& a_in)
+		HEADER_V2(IDDB::STREAM& a_in)
 		{
 			a_in.readin(m_gameVersion);
 
@@ -88,10 +88,10 @@ namespace REL
 		std::int32_t  m_addressCount{ 0 };
 	};
 
-	class FIDDB::HEADER_V5
+	class IDDB::HEADER_V5
 	{
 	public:
-		HEADER_V5(FIDDB::STREAM& a_in)
+		HEADER_V5(IDDB::STREAM& a_in)
 		{
 			a_in.readin(m_gameVersion);
 			a_in.readin(m_name);
@@ -124,7 +124,7 @@ namespace REL
 
 namespace REL
 {
-	FIDDB::FIDDB()
+	IDDB::IDDB()
 	{
 		std::unordered_map<Loader, std::vector<std::wstring>> g_rootMap{
 			{ Loader::SKSE, { L"versionlib", L"version" } },
@@ -191,7 +191,7 @@ namespace REL
 		}
 	}
 
-	void FIDDB::load_v0()
+	void IDDB::load_v0()
 	{
 		const auto mod = REX::FModule::GetExecutingModule();
 		const auto mapName = std::format("COMMONLIB_IDDB_OFFSETS_{}", mod.GetFileVersion().string("_"));
@@ -206,7 +206,7 @@ namespace REL
 		};
 	}
 
-	void FIDDB::load_v2(STREAM& a_stream)
+	void IDDB::load_v2(STREAM& a_stream)
 	{
 		try {
 			HEADER_V2 header(a_stream);
@@ -244,7 +244,7 @@ namespace REL
 		}
 	}
 
-	void FIDDB::load_v5(STREAM& a_stream)
+	void IDDB::load_v5(STREAM& a_stream)
 	{
 		try {
 			HEADER_V5 header(a_stream);
@@ -272,7 +272,7 @@ namespace REL
 		}
 	}
 
-	void FIDDB::unpack_file(STREAM& a_stream, const HEADER_V2& a_header)
+	void IDDB::unpack_file(STREAM& a_stream, const HEADER_V2& a_header)
 	{
 		std::uint8_t  type = 0;
 		std::uint64_t id = 0;
@@ -355,7 +355,7 @@ namespace REL
 		}
 	}
 
-	void FIDDB::validate_file()
+	void IDDB::validate_file()
 	{
 		// clang-format off
 		std::unordered_map<Loader, std::vector<std::pair<REL::Version, std::string_view>>> g_blacklistMap{
@@ -382,7 +382,7 @@ namespace REL
 		}
 	}
 
-	std::uint64_t FIDDB::offset(std::uint64_t a_id) const
+	std::uint64_t IDDB::offset(std::uint64_t a_id) const
 	{
 		const auto mod = REX::FModule::GetExecutingModule();
 		if (std::to_underlying(m_format) < 5) {

src/REL/Offset2ID.cpp

@@ -7,8 +7,8 @@ namespace REL
 {
 	void Offset2ID::load_v2()
 	{
-		const auto iddb = FIDDB::GetSingleton();
-		const auto id2offset = iddb->get_id2offset<FIDDB::MAPPING>();
+		const auto iddb = IDDB::GetSingleton();
+		const auto id2offset = iddb->get_id2offset<IDDB::MAPPING>();
 		_offset2id.reserve(id2offset.size());
 		_offset2id.insert(_offset2id.begin(), id2offset.begin(), id2offset.end());
 		std::sort(std::execution::sequenced_policy{}, _offset2id.begin(), _offset2id.end(), [](auto&& a_lhs, auto&& a_rhs) {
@@ -18,7 +18,7 @@ namespace REL
 
 	void Offset2ID::load_v5()
 	{
-		const auto iddb = FIDDB::GetSingleton();
+		const auto iddb = IDDB::GetSingleton();
 		const auto id2offset = iddb->get_id2offset<std::uint32_t>();
 		_offset2id.reserve(id2offset.size());