normalize includes: common

common/events/player_event_discord_formatter.cpp

@@ -1,11 +1,14 @@
 #include "player_event_discord_formatter.h"
-#include "../repositories/character_data_repository.h"
-#include "../json/json_archive_single_line.h"
+
+#include "common/json/json_archive_single_line.h"
+#include "common/repositories/character_data_repository.h"
+
+#include "cereal/archives/json.hpp"
+#include "cereal/types/vector.hpp"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
+
 #include <vector>
-#include <fmt/format.h>
-#include <fmt/ranges.h>
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
 
 std::string PlayerEventDiscordFormatter::GetCurrentTimestamp()
 {

common/events/player_event_discord_formatter.h

@@ -1,11 +1,12 @@
-#ifndef EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
-#define EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
+#pragma once
+
+#include "common/events/player_events.h"
+#include "common/repositories/base/base_player_event_logs_repository.h"
+
+#include "cereal/archives/json.hpp"
+#include "cereal/types/vector.hpp"
 
 #include <string>
-#include "player_events.h"
-#include "../repositories/base/base_player_event_logs_repository.h"
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
 
 struct DiscordField {
 	std::string name;
@@ -209,6 +210,3 @@ public:
 		std::vector<DiscordEmbed> &embeds
 	);
 };
-
-
-#endif //EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H

common/events/player_event_logs.cpp

@@ -1,14 +1,16 @@
 #include "player_event_logs.h"
-#include <cereal/archives/json.hpp>
 
-#include "../platform.h"
-#include "../rulesys.h"
-#include "player_event_discord_formatter.h"
-#include "../repositories/player_event_loot_items_repository.h"
-#include "../repositories/player_event_merchant_sell_repository.h"
-#include "../repositories/player_event_merchant_purchase_repository.h"
-#include "../repositories/player_event_npc_handin_repository.h"
-#include "../repositories/player_event_npc_handin_entries_repository.h"
+#include "common/events/player_event_discord_formatter.h"
+#include "common/platform.h"
+#include "common/repositories/player_event_loot_items_repository.h"
+#include "common/repositories/player_event_merchant_purchase_repository.h"
+#include "common/repositories/player_event_merchant_sell_repository.h"
+#include "common/repositories/player_event_npc_handin_entries_repository.h"
+#include "common/repositories/player_event_npc_handin_repository.h"
+#include "common/rulesys.h"
+
+#include "cereal/archives/json.hpp"
+#include "fmt/ranges.h"
 
 const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1 hour
 

common/events/player_event_logs.h

@@ -1,28 +1,26 @@
-#ifndef EQEMU_PLAYER_EVENT_LOGS_H
-#define EQEMU_PLAYER_EVENT_LOGS_H
+#pragma once
 
-#include <cereal/archives/json.hpp>
+#include "common/eqemu_config.h"
+#include "common/json/json_archive_single_line.h"
+#include "common/repositories/player_event_aa_purchase_repository.h"
+#include "common/repositories/player_event_killed_named_npc_repository.h"
+#include "common/repositories/player_event_killed_npc_repository.h"
+#include "common/repositories/player_event_killed_raid_npc_repository.h"
+#include "common/repositories/player_event_log_settings_repository.h"
+#include "common/repositories/player_event_logs_repository.h"
+#include "common/repositories/player_event_loot_items_repository.h"
+#include "common/repositories/player_event_merchant_purchase_repository.h"
+#include "common/repositories/player_event_merchant_sell_repository.h"
+#include "common/repositories/player_event_npc_handin_entries_repository.h"
+#include "common/repositories/player_event_npc_handin_repository.h"
+#include "common/repositories/player_event_speech_repository.h"
+#include "common/repositories/player_event_trade_entries_repository.h"
+#include "common/repositories/player_event_trade_repository.h"
+#include "common/servertalk.h"
+#include "common/timer.h"
+
+#include "cereal/archives/json.hpp"
 #include <mutex>
-#include "../json/json_archive_single_line.h"
-#include "../servertalk.h"
-#include "../timer.h"
-#include "../eqemu_config.h"
-
-#include "../repositories/player_event_log_settings_repository.h"
-#include "../repositories/player_event_logs_repository.h"
-#include "../repositories/player_event_loot_items_repository.h"
-#include "../repositories/player_event_merchant_purchase_repository.h"
-#include "../repositories/player_event_merchant_sell_repository.h"
-#include "../repositories/player_event_npc_handin_repository.h"
-#include "../repositories/player_event_npc_handin_entries_repository.h"
-#include "../repositories/player_event_trade_repository.h"
-#include "../repositories/player_event_trade_entries_repository.h"
-#include "../repositories/player_event_speech_repository.h"
-#include "../repositories/player_event_killed_npc_repository.h"
-#include "../repositories/player_event_killed_named_npc_repository.h"
-#include "../repositories/player_event_killed_raid_npc_repository.h"
-#include "../repositories/player_event_aa_purchase_repository.h"
-
 
 
 class PlayerEventLogs {
@@ -134,5 +132,3 @@ private:
 public:
 	std::map<PlayerEvent::EventType, EtlSettings> &GetEtlSettings() { return m_etl_settings;}
 };
-
-#endif //EQEMU_PLAYER_EVENT_LOGS_H

common/events/player_events.h

@@ -1,11 +1,12 @@
-#ifndef EQEMU_PLAYER_EVENTS_H
-#define EQEMU_PLAYER_EVENTS_H
+#pragma once
+
+#include "common/repositories/player_event_logs_repository.h"
+#include "common/rulesys.h"
+#include "common/types.h"
+
+#include "cereal/cereal.hpp"
 
 #include <string>
-#include <cereal/cereal.hpp>
-#include "../types.h"
-#include "../rulesys.h"
-#include "../repositories/player_event_logs_repository.h"
 
 #define CEREAL_NVP_IF_NONZERO(ar, name) \
 if ((name) != 0) ar(cereal::make_nvp(#name, name))
@@ -1753,8 +1754,6 @@ namespace PlayerEvent {
 	};
 }
 
-#endif //EQEMU_PLAYER_EVENTS_H
-
 #define RecordPlayerEventLog(event_type, event_data) do {\
     if (PlayerEventLogs::Instance()->IsEventEnabled(event_type)) {\
         if (RuleB(Logging, PlayerEventsQSProcess)) {\