normalize includes: common

common/database/database_dump_service.cpp

@@ -18,27 +18,26 @@
  *
 */
 
-#include <string>
-#include <cstdio>
-#include <iterator>
 #include "database_dump_service.h"
-#include "../eqemu_logsys.h"
-#include "../strings.h"
-#include "../eqemu_config.h"
-#include "../database_schema.h"
-#include "../file.h"
-#include "../process/process.h"
-#include "../termcolor/rang.hpp"
 
+#include "common/database_schema.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/file.h"
+#include "common/process/process.h"
+#include "common/strings.h"
+#include "common/termcolor/rang.hpp"
+
+#include <cstdio>
 #include <ctime>
+#include <iterator>
+#include <string>
 
 #if _WIN32
 #include <windows.h>
 #else
-
 #include <sys/time.h>
 #include <thread>
-
 #endif
 
 #define DATABASE_DUMP_PATH "backups/"

common/database/database_dump_service.h

@@ -18,9 +18,9 @@
  *
 */
 
-#ifndef EQEMU_DATABASE_DUMP_SERVICE_H
-#define EQEMU_DATABASE_DUMP_SERVICE_H
+#pragma once
 
+#include <string>
 
 class DatabaseDumpService {
 public:
@@ -97,6 +97,3 @@ private:
 	void BuildCredentialsFile();
 	void RemoveCredentialsFile();
 };
-
-
-#endif //EQEMU_DATABASE_DUMP_SERVICE_H

common/database/database_update.cpp

@@ -1,14 +1,17 @@
-#include <filesystem>
 #include "database_update.h"
-#include "../eqemu_logsys.h"
-#include "../database.h"
-#include "../strings.h"
-#include "../rulesys.h"
-#include "../http/httplib.h"
-#include "database_dump_service.h"
-#include "database_update_manifest.h"
-#include "database_update_manifest_custom.h"
-#include "database_update_manifest_bots.h"
+
+#include "common/database.h"
+#include "common/database/database_dump_service.h"
+#include "common/database/database_update_manifest_bots.h"
+#include "common/database/database_update_manifest_custom.h"
+#include "common/database/database_update_manifest.h"
+#include "common/eqemu_logsys.h"
+#include "common/http/httplib.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+
+#include <filesystem>
+
 
 constexpr int BREAK_LENGTH = 70;
 

common/database/database_update.h

@@ -1,7 +1,6 @@
-#ifndef EQEMU_DATABASE_UPDATE_H
-#define EQEMU_DATABASE_UPDATE_H
+#pragma once
 
-#include "../database.h"
+#include "common/database.h"
 
 struct ManifestEntry {
 	int         version{};     // database version of the migration
@@ -47,7 +46,4 @@ private:
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
 	void InjectCustomVersionColumn();
-
 };
-
-#endif //EQEMU_DATABASE_UPDATE_H

common/database/database_update_manifest.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include "common/database/database_update.h"
+
+#include <vector>
+
 std::vector<ManifestEntry> manifest_entries = {
 	ManifestEntry{
 		.version = 9000,

common/database/database_update_manifest_bots.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include "common/database/database_update.h"
+
+#include <vector>
+
 std::vector<ManifestEntry> bot_manifest_entries = {
 	ManifestEntry{
 		.version = 9035,

common/database/database_update_manifest_custom.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include "common/database/database_update.h"
+
+#include <vector>
+
 std::vector<ManifestEntry> manifest_entries_custom = {
 	ManifestEntry{
 		.version = 1,