Normalize include guards to FS_<FILENAME>_H (otland#3993)

EPuncker · May 22, 2023 · 34e0eee · 34e0eee
1 parent 5c77b63
commit 34e0eee
Show file tree

Hide file tree

Showing 86 changed files with 260 additions and 257 deletions.
diff --git a/src/account.h b/src/account.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_ACCOUNT_H_34817537BA2B4CB7B71AA562AFBB118F
-#define FS_ACCOUNT_H_34817537BA2B4CB7B71AA562AFBB118F
+#ifndef FS_ACCOUNT_H
+#define FS_ACCOUNT_H
 
 #include "enums.h"
 
@@ -17,4 +17,4 @@ struct Account {
 	Account() = default;
 };
 
-#endif
+#endif // FS_ACCOUNT_H
diff --git a/src/actions.h b/src/actions.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_ACTIONS_H_87F60C5F587E4B84948F304A6451E6E6
-#define FS_ACTIONS_H_87F60C5F587E4B84948F304A6451E6E6
+#ifndef FS_ACTIONS_H
+#define FS_ACTIONS_H
 
 #include "baseevents.h"
 #include "enums.h"
@@ -133,4 +133,4 @@ class Actions final : public BaseEvents
 		LuaScriptInterface scriptInterface;
 };
 
-#endif
+#endif // FS_ACTIONS_H
diff --git a/src/ban.h b/src/ban.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_BAN_H_CADB975222D745F0BDA12D982F1006E3
-#define FS_BAN_H_CADB975222D745F0BDA12D982F1006E3
+#ifndef FS_BAN_H
+#define FS_BAN_H
 
 struct BanInfo {
 	std::string bannedBy;
@@ -39,4 +39,4 @@ class IOBan
 		static bool isPlayerNamelocked(uint32_t playerId);
 };
 
-#endif
+#endif // FS_BAN_H
diff --git a/src/baseevents.h b/src/baseevents.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_BASEEVENTS_H_9994E32C91CE4D95912A5FDD1F41884A
-#define FS_BASEEVENTS_H_9994E32C91CE4D95912A5FDD1F41884A
+#ifndef FS_BASEEVENTS_H
+#define FS_BASEEVENTS_H
 
 #include "luascript.h"
 
@@ -80,4 +80,4 @@ class CallBack
 		bool loaded = false;
 };
 
-#endif
+#endif // FS_BASEEVENTS_H
diff --git a/src/bed.h b/src/bed.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_BED_H_84DE19758D424C6C9789189231946BFF
-#define FS_BED_H_84DE19758D424C6C9789189231946BFF
+#ifndef FS_BED_H
+#define FS_BED_H
 
 #include "item.h"
 
@@ -58,4 +58,4 @@ class BedItem final : public Item
 		uint32_t sleeperGUID;
 };
 
-#endif
+#endif // FS_BED_H
diff --git a/src/chat.h b/src/chat.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CHAT_H_F1574642D0384ABFAB52B7ED906E5628
-#define FS_CHAT_H_F1574642D0384ABFAB52B7ED906E5628
+#ifndef FS_CHAT_H
+#define FS_CHAT_H
 
 #include "const.h"
 #include "luascript.h"
@@ -145,4 +145,4 @@ class Chat
 		PrivateChatChannel dummyPrivate;
 };
 
-#endif
+#endif // FS_CHAT_H
diff --git a/src/combat.h b/src/combat.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_COMBAT_H_B02CE79230FC43708699EE91FCC8F7CC
-#define FS_COMBAT_H_B02CE79230FC43708699EE91FCC8F7CC
+#ifndef FS_COMBAT_H
+#define FS_COMBAT_H
 
 #include "thing.h"
 #include "condition.h"
@@ -218,4 +218,4 @@ class MagicField final : public Item
 		int64_t createTime;
 };
 
-#endif
+#endif // FS_COMBAT_H
diff --git a/src/condition.h b/src/condition.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CONDITION_H_F92FF8BDDD5B4EA59E2B1BB5C9C0A086
-#define FS_CONDITION_H_F92FF8BDDD5B4EA59E2B1BB5C9C0A086
+#ifndef FS_CONDITION_H
+#define FS_CONDITION_H
 
 #include "fileloader.h"
 #include "enums.h"
@@ -446,4 +446,4 @@ class ConditionDrunk final : public Condition
 		bool updateCondition(const Condition* addCondition) override;
 };
 
-#endif
+#endif // FS_CONDITION_H
diff --git a/src/configmanager.h b/src/configmanager.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39
-#define FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39
+#ifndef FS_CONFIGMANAGER_H
+#define FS_CONFIGMANAGER_H
 
 #include <utility>
 #include <vector>
@@ -144,4 +144,4 @@ class ConfigManager
 		bool loaded = false;
 };
 
-#endif
+#endif // FS_CONFIGMANAGER_H
diff --git a/src/connection.h b/src/connection.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CONNECTION_H_FC8E1B4392D24D27A2F129D8B93A6348
-#define FS_CONNECTION_H_FC8E1B4392D24D27A2F129D8B93A6348
+#ifndef FS_CONNECTION_H
+#define FS_CONNECTION_H
 
 #include <unordered_set>
 
@@ -109,4 +109,4 @@ class Connection : public std::enable_shared_from_this<Connection>
 		bool receivedFirst = false;
 };
 
-#endif
+#endif // FS_CONNECTION_H
diff --git a/src/const.h b/src/const.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CONST_H_0A49B5996F074465BF44B90F4F780E8B
-#define FS_CONST_H_0A49B5996F074465BF44B90F4F780E8B
+#ifndef FS_CONST_H
+#define FS_CONST_H
 
 static constexpr int32_t NETWORKMESSAGE_MAXSIZE = 24590;
 
@@ -572,4 +572,4 @@ static constexpr int32_t PSTRG_MOUNTS_CURRENTMOUNT = (PSTRG_MOUNTS_RANGE_START +
 
 #define IS_IN_KEYRANGE(key, range) (key >= PSTRG_##range##_START && ((key - PSTRG_##range##_START) <= PSTRG_##range##_SIZE))
 
-#endif
+#endif // FS_CONST_H
diff --git a/src/container.h b/src/container.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CONTAINER_H_5590165FD8A2451B98D71F13CD3ED8DC
-#define FS_CONTAINER_H_5590165FD8A2451B98D71F13CD3ED8DC
+#ifndef FS_CONTAINER_H
+#define FS_CONTAINER_H
 
 #include <queue>
 
@@ -169,4 +169,4 @@ class Container : public Item, public Cylinder
 		friend class IOMapSerialize;
 };
 
-#endif
+#endif // FS_CONTAINER_H
diff --git a/src/creature.h b/src/creature.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CREATURE_H_5363C04015254E298F84E6D59A139508
-#define FS_CREATURE_H_5363C04015254E298F84E6D59A139508
+#ifndef FS_CREATURE_H
+#define FS_CREATURE_H
 
 #include "map.h"
 #include "position.h"
@@ -565,4 +565,4 @@ class Creature : virtual public Thing
 		friend class LuaScriptInterface;
 };
 
-#endif
+#endif // FS_CREATURE_H
diff --git a/src/creatureevent.h b/src/creatureevent.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CREATUREEVENT_H_73FCAF4608CB41399D53C919316646A9
-#define FS_CREATUREEVENT_H_73FCAF4608CB41399D53C919316646A9
+#ifndef FS_CREATUREEVENT_H
+#define FS_CREATUREEVENT_H
 
 #include "luascript.h"
 #include "baseevents.h"
@@ -113,4 +113,4 @@ class CreatureEvents final : public BaseEvents
 		LuaScriptInterface scriptInterface;
 };
 
-#endif
+#endif // FS_CREATUREEVENT_H
diff --git a/src/cylinder.h b/src/cylinder.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_CYLINDER_H_54BBCEB2A5B7415DAD837E4D58115150
-#define FS_CYLINDER_H_54BBCEB2A5B7415DAD837E4D58115150
+#ifndef FS_CYLINDER_H
+#define FS_CYLINDER_H
 
 #include "enums.h"
 #include "thing.h"
@@ -230,4 +230,4 @@ class VirtualCylinder final : public Cylinder
 		}
 };
 
-#endif
+#endif // FS_CYLINDER_H
diff --git a/src/database.h b/src/database.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_DATABASE_H_A484B0CDFDE542838F506DCE3D40C693
-#define FS_DATABASE_H_A484B0CDFDE542838F506DCE3D40C693
+#ifndef FS_DATABASE_H
+#define FS_DATABASE_H
 
 #include <boost/lexical_cast.hpp>
 
@@ -223,4 +223,4 @@ class DBTransaction
 		TransactionStates_t state = STATE_NO_START;
 };
 
-#endif
+#endif // FS_DATABASE_H
diff --git a/src/databasemanager.h b/src/databasemanager.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_DATABASEMANAGER_H_2B75821C555E4D1D83E32B20D683217C
-#define FS_DATABASEMANAGER_H_2B75821C555E4D1D83E32B20D683217C
+#ifndef FS_DATABASEMANAGER_H
+#define FS_DATABASEMANAGER_H
 #include "database.h"
 
 class DatabaseManager
@@ -19,4 +19,5 @@ class DatabaseManager
 		static bool getDatabaseConfig(const std::string& config, int32_t& value);
 		static void registerDatabaseConfig(const std::string& config, int32_t value);
 };
-#endif
+
+#endif // FS_DATABASEMANAGER_H
diff --git a/src/databasetasks.h b/src/databasetasks.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_DATABASETASKS_H_9CBA08E9F5FEBA7275CCEE6560059576
-#define FS_DATABASETASKS_H_9CBA08E9F5FEBA7275CCEE6560059576
+#ifndef FS_DATABASETASKS_H
+#define FS_DATABASETASKS_H
 
 #include <condition_variable>
 #include "thread_holder_base.h"
@@ -41,4 +41,4 @@ class DatabaseTasks : public ThreadHolder<DatabaseTasks>
 
 extern DatabaseTasks g_databaseTasks;
 
-#endif
+#endif // FS_DATABASETASKS_H
diff --git a/src/definitions.h b/src/definitions.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_DEFINITIONS_H_877452FEC245450C9F96B8FD268D8963
-#define FS_DEFINITIONS_H_877452FEC245450C9F96B8FD268D8963
+#ifndef FS_DEFINITIONS_H
+#define FS_DEFINITIONS_H
 
 static constexpr auto STATUS_SERVER_NAME = "The Forgotten Server";
 static constexpr auto STATUS_SERVER_VERSION = "1.4.2";
@@ -60,4 +60,4 @@ static constexpr auto AUTHENTICATOR_PERIOD = 30U;
 #endif
 #endif
 
-#endif
+#endif // FS_DEFINITIONS_H
diff --git a/src/depotchest.h b/src/depotchest.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_DEPOTCHEST_H_6538526014684E3DBC92CC12815B6766
-#define FS_DEPOTCHEST_H_6538526014684E3DBC92CC12815B6766
+#ifndef FS_DEPOTCHEST_H
+#define FS_DEPOTCHEST_H
 
 #include "container.h"
 
@@ -37,5 +37,4 @@ class DepotChest final : public Container
 		uint32_t maxDepotItems;
 };
 
-#endif
-
+#endif // FS_DEPOTCHEST_H
diff --git a/src/depotlocker.h b/src/depotlocker.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_DEPOTLOCKER_H_53AD8E0606A34070B87F792611F4F3F8
-#define FS_DEPOTLOCKER_H_53AD8E0606A34070B87F792611F4F3F8
+#ifndef FS_DEPOTLOCKER_H
+#define FS_DEPOTLOCKER_H
 
 #include "container.h"
 #include "inbox.h"
@@ -48,5 +48,4 @@ class DepotLocker final : public Container
 		uint16_t depotId;
 };
 
-#endif
-
+#endif // FS_DEPOTLOCKER_H
diff --git a/src/enums.h b/src/enums.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_ENUMS_H_003445999FEE4A67BCECBE918B0124CE
-#define FS_ENUMS_H_003445999FEE4A67BCECBE918B0124CE
+#ifndef FS_ENUMS_H
+#define FS_ENUMS_H
 
 enum RuleViolationType_t : uint8_t {
 	REPORT_TYPE_NAME = 0,
@@ -602,4 +602,4 @@ enum MonstersEvent_t : uint8_t {
 	MONSTERS_EVENT_SAY = 5,
 };
 
-#endif
+#endif // FS_ENUMS_H
diff --git a/src/events.h b/src/events.h
@@ -1,8 +1,8 @@
 // Copyright 2022 The Forgotten Server Authors. All rights reserved.
 // Use of this source code is governed by the GPL-2.0 License that can be found in the LICENSE file.
 
-#ifndef FS_EVENTS_H_BD444CC0EE167E5777E4C90C766B36DC
-#define FS_EVENTS_H_BD444CC0EE167E5777E4C90C766B36DC
+#ifndef FS_EVENTS_H
+#define FS_EVENTS_H
 
 #include "luascript.h"
 #include "const.h"
@@ -111,4 +111,4 @@ class Events
 		EventsInfo info;
 };
 
-#endif
+#endif // FS_EVENTS_H