From 505a165d235d7ad0e9c21352d36b78c121092252 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Sun, 22 Mar 2020 01:45:04 +0200 Subject: [PATCH] Use pragma once instead of macro guards. --- module/Base/AABB.hpp | 5 +---- module/Base/Buffer.hpp | 5 +---- module/Base/Circle.hpp | 5 +---- module/Base/Color3.hpp | 5 +---- module/Base/Color4.hpp | 5 +---- module/Base/DynArg.hpp | 5 +---- module/Base/Quaternion.hpp | 5 +---- module/Base/ScriptSrc.hpp | 5 +---- module/Base/Shared.hpp | 5 +---- module/Base/Sphere.hpp | 5 +---- module/Base/Vector2.hpp | 5 +---- module/Base/Vector2i.hpp | 5 +---- module/Base/Vector3.hpp | 5 +---- module/Base/Vector4.hpp | 5 +---- module/Core.hpp | 6 ++---- module/Entity/Blip.hpp | 5 +---- module/Entity/Checkpoint.hpp | 5 +---- module/Entity/Keybind.hpp | 5 +---- module/Entity/Object.hpp | 5 +---- module/Entity/Pickup.hpp | 5 +---- module/Entity/Player.hpp | 5 +---- module/Entity/Vehicle.hpp | 5 +---- module/Library/Chrono.hpp | 5 +---- module/Library/Chrono/Date.hpp | 5 +---- module/Library/Chrono/Datetime.hpp | 5 +---- module/Library/Chrono/Time.hpp | 5 +---- module/Library/Chrono/Timer.hpp | 5 +---- module/Library/Chrono/Timestamp.hpp | 5 +---- module/Library/Crypt.hpp | 5 +---- module/Library/Crypt/AES.hpp | 5 +---- module/Library/Crypt/Hash.hpp | 5 +---- module/Library/IO.hpp | 5 +---- module/Library/IO/INI.hpp | 5 +---- module/Library/Numeric.hpp | 5 +---- module/Library/Numeric/LongInt.hpp | 5 +---- module/Library/Numeric/Math.hpp | 5 +---- module/Library/Numeric/Random.hpp | 5 +---- module/Library/SQLite.hpp | 5 +---- module/Library/String.hpp | 5 +---- module/Library/System.hpp | 5 +---- module/Library/System/Dir.hpp | 7 +------ module/Library/System/Environment.hpp | 5 +---- module/Library/System/Path.hpp | 5 +---- module/Library/Utils.hpp | 5 +---- module/Library/Utils/Buffer.hpp | 5 +---- module/Logger.hpp | 5 +---- module/Misc/Algo.hpp | 5 +---- module/Misc/Areas.hpp | 5 +---- module/Misc/Command.hpp | 5 +---- module/Misc/Functions.hpp | 6 +----- module/Misc/Model.hpp | 5 +---- module/Misc/Player.hpp | 5 +---- module/Misc/Routine.hpp | 5 +---- module/Misc/Signal.hpp | 5 +---- module/Misc/Tasks.hpp | 5 +---- module/Misc/Vehicle.hpp | 5 +---- module/Misc/Weapon.hpp | 5 +---- module/SqBase.hpp | 5 +---- 58 files changed, 59 insertions(+), 235 deletions(-) diff --git a/module/Base/AABB.hpp b/module/Base/AABB.hpp index 786ddde9..a9fb7649 100644 --- a/module/Base/AABB.hpp +++ b/module/Base/AABB.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_AABB_HPP_ -#define _BASE_AABB_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Vector3.hpp" @@ -479,5 +478,3 @@ struct AABB }; } // Namespace:: SqMod - -#endif // _BASE_AABB_HPP_ diff --git a/module/Base/Buffer.hpp b/module/Base/Buffer.hpp index dd0946a8..b42467dd 100644 --- a/module/Base/Buffer.hpp +++ b/module/Base/Buffer.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_BUFFER_HPP_ -#define _BASE_BUFFER_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include @@ -1022,5 +1021,3 @@ private: }; } // Namespace:: SqMod - -#endif // _BASE_BUFFER_HPP_ diff --git a/module/Base/Circle.hpp b/module/Base/Circle.hpp index ce9c5d0f..477d0df6 100644 --- a/module/Base/Circle.hpp +++ b/module/Base/Circle.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_CIRCLE_HPP_ -#define _BASE_CIRCLE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -424,5 +423,3 @@ struct Circle }; } // Namespace:: SqMod - -#endif // _BASE_CIRCLE_HPP_ diff --git a/module/Base/Color3.hpp b/module/Base/Color3.hpp index c3b982e4..c3798d10 100644 --- a/module/Base/Color3.hpp +++ b/module/Base/Color3.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_COLOR3_HPP_ -#define _BASE_COLOR3_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -511,5 +510,3 @@ struct Color3 }; } // Namespace:: SqMod - -#endif // _BASE_COLOR3_HPP_ diff --git a/module/Base/Color4.hpp b/module/Base/Color4.hpp index 3d54ad91..a2824412 100644 --- a/module/Base/Color4.hpp +++ b/module/Base/Color4.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_COLOR4_HPP_ -#define _BASE_COLOR4_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -511,5 +510,3 @@ struct Color4 }; } // Namespace:: SqMod - -#endif // _BASE_COLOR4_HPP_ diff --git a/module/Base/DynArg.hpp b/module/Base/DynArg.hpp index 538987b6..78825634 100644 --- a/module/Base/DynArg.hpp +++ b/module/Base/DynArg.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_DYNARG_HPP_ -#define _BASE_DYNARG_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ namespace SqMod { @@ -805,5 +804,3 @@ template < typename T > struct SqDynArgModFn }; } // Namespace:: SqMod - -#endif // _BASE_DYNARG_HPP_ diff --git a/module/Base/Quaternion.hpp b/module/Base/Quaternion.hpp index 437a6ddc..48c02289 100644 --- a/module/Base/Quaternion.hpp +++ b/module/Base/Quaternion.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_QUATERNION_HPP_ -#define _BASE_QUATERNION_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -452,5 +451,3 @@ struct Quaternion }; } // Namespace:: SqMod - -#endif // _BASE_QUATERNION_HPP_ diff --git a/module/Base/ScriptSrc.hpp b/module/Base/ScriptSrc.hpp index 5e50e717..4b78ef49 100644 --- a/module/Base/ScriptSrc.hpp +++ b/module/Base/ScriptSrc.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_SCRIPTSRC_HPP_ -#define _BASE_SCRIPTSRC_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Utility.hpp" @@ -79,5 +78,3 @@ public: } // Namespace:: SqMod - -#endif // _BASE_SCRIPTSRC_HPP_ diff --git a/module/Base/Shared.hpp b/module/Base/Shared.hpp index 0bcbe473..8abb2e1b 100644 --- a/module/Base/Shared.hpp +++ b/module/Base/Shared.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_SHARED_HPP_ -#define _BASE_SHARED_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Utility.hpp" @@ -255,5 +254,3 @@ template < typename T > inline void SqSetDelimiter(SQInteger c) } } // Namespace:: SqMod - -#endif // _BASE_SHARED_HPP_ diff --git a/module/Base/Sphere.hpp b/module/Base/Sphere.hpp index cec3ae95..ebc46868 100644 --- a/module/Base/Sphere.hpp +++ b/module/Base/Sphere.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_SPHERE_HPP_ -#define _BASE_SPHERE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -423,5 +422,3 @@ struct Sphere }; } // Namespace:: SqMod - -#endif // _BASE_SPHERE_HPP_ \ No newline at end of file diff --git a/module/Base/Vector2.hpp b/module/Base/Vector2.hpp index bcf1c049..bcbc3ca1 100644 --- a/module/Base/Vector2.hpp +++ b/module/Base/Vector2.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_VECTOR2_HPP_ -#define _BASE_VECTOR2_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -356,5 +355,3 @@ struct Vector2 }; } // Namespace:: SqMod - -#endif // _BASE_VECTOR2_HPP_ diff --git a/module/Base/Vector2i.hpp b/module/Base/Vector2i.hpp index 179832f1..0b5b4224 100644 --- a/module/Base/Vector2i.hpp +++ b/module/Base/Vector2i.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_VECTOR2I_HPP_ -#define _BASE_VECTOR2I_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -457,5 +456,3 @@ struct Vector2i }; } // Namespace:: SqMod - -#endif // _BASE_VECTOR2I_HPP_ diff --git a/module/Base/Vector3.hpp b/module/Base/Vector3.hpp index 18a763b1..487c2f35 100644 --- a/module/Base/Vector3.hpp +++ b/module/Base/Vector3.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_VECTOR3_HPP_ -#define _BASE_VECTOR3_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -503,5 +502,3 @@ struct Vector3 }; } // Namespace:: SqMod - -#endif // _BASE_VECTOR3_HPP_ diff --git a/module/Base/Vector4.hpp b/module/Base/Vector4.hpp index dd2729da..7c1b0bd2 100644 --- a/module/Base/Vector4.hpp +++ b/module/Base/Vector4.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_VECTOR4_HPP_ -#define _BASE_VECTOR4_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -377,5 +376,3 @@ struct Vector4 }; } // Namespace:: SqMod - -#endif // _BASE_VECTOR4_HPP_ diff --git a/module/Core.hpp b/module/Core.hpp index 38219417..961983a9 100644 --- a/module/Core.hpp +++ b/module/Core.hpp @@ -1,5 +1,5 @@ -#ifndef _CORE_HPP_ -#define _CORE_HPP_ +#pragma once + // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -1519,5 +1519,3 @@ protected: }; } // Namespace:: SqMod - -#endif // _CORE_HPP_ diff --git a/module/Entity/Blip.hpp b/module/Entity/Blip.hpp index 6270b863..e7ecc483 100644 --- a/module/Entity/Blip.hpp +++ b/module/Entity/Blip.hpp @@ -1,5 +1,4 @@ -#ifndef _ENTITY_BLIP_HPP_ -#define _ENTITY_BLIP_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -229,5 +228,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ENTITY_BLIP_HPP_ \ No newline at end of file diff --git a/module/Entity/Checkpoint.hpp b/module/Entity/Checkpoint.hpp index be4368ae..a795d3f0 100644 --- a/module/Entity/Checkpoint.hpp +++ b/module/Entity/Checkpoint.hpp @@ -1,5 +1,4 @@ -#ifndef _ENTITY_CHECKPOINT_HPP_ -#define _ENTITY_CHECKPOINT_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -328,5 +327,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ENTITY_CHECKPOINT_HPP_ \ No newline at end of file diff --git a/module/Entity/Keybind.hpp b/module/Entity/Keybind.hpp index 4b20365c..fc1eb1af 100644 --- a/module/Entity/Keybind.hpp +++ b/module/Entity/Keybind.hpp @@ -1,5 +1,4 @@ -#ifndef _ENTITY_KEYBIND_HPP_ -#define _ENTITY_KEYBIND_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -189,5 +188,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ENTITY_KEYBIND_HPP_ \ No newline at end of file diff --git a/module/Entity/Object.hpp b/module/Entity/Object.hpp index c8d99cb6..57699f48 100644 --- a/module/Entity/Object.hpp +++ b/module/Entity/Object.hpp @@ -1,5 +1,4 @@ -#ifndef _ENTITY_OBJECT_HPP_ -#define _ENTITY_OBJECT_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -507,5 +506,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ENTITY_OBJECT_HPP_ diff --git a/module/Entity/Pickup.hpp b/module/Entity/Pickup.hpp index 261cf9d0..6b5c4165 100644 --- a/module/Entity/Pickup.hpp +++ b/module/Entity/Pickup.hpp @@ -1,5 +1,4 @@ -#ifndef _ENTITY_PICKUP_HPP_ -#define _ENTITY_PICKUP_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -306,5 +305,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ENTITY_PICKUP_HPP_ \ No newline at end of file diff --git a/module/Entity/Player.hpp b/module/Entity/Player.hpp index dfa152fa..78397fa5 100644 --- a/module/Entity/Player.hpp +++ b/module/Entity/Player.hpp @@ -1,5 +1,4 @@ -#ifndef _ENTITY_PLAYER_HPP_ -#define _ENTITY_PLAYER_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -1088,5 +1087,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ENTITY_PLAYER_HPP_ diff --git a/module/Entity/Vehicle.hpp b/module/Entity/Vehicle.hpp index 5434fcd2..e29b8268 100644 --- a/module/Entity/Vehicle.hpp +++ b/module/Entity/Vehicle.hpp @@ -1,5 +1,4 @@ -#ifndef _ENTITY_VEHICLE_HPP_ -#define _ENTITY_VEHICLE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -924,5 +923,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ENTITY_VEHICLE_HPP_ \ No newline at end of file diff --git a/module/Library/Chrono.hpp b/module/Library/Chrono.hpp index a60c28ee..45153f04 100644 --- a/module/Library/Chrono.hpp +++ b/module/Library/Chrono.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CHRONO_HPP_ -#define _LIBRARY_CHRONO_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -112,5 +111,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CHRONO_HPP_ \ No newline at end of file diff --git a/module/Library/Chrono/Date.hpp b/module/Library/Chrono/Date.hpp index a34b3ca1..981bfeb7 100644 --- a/module/Library/Chrono/Date.hpp +++ b/module/Library/Chrono/Date.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CHRONO_DATE_HPP_ -#define _LIBRARY_CHRONO_DATE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Library/Chrono.hpp" @@ -353,5 +352,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CHRONO_DATE_HPP_ diff --git a/module/Library/Chrono/Datetime.hpp b/module/Library/Chrono/Datetime.hpp index 76d08056..fd874b22 100644 --- a/module/Library/Chrono/Datetime.hpp +++ b/module/Library/Chrono/Datetime.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CHRONO_DATETIME_HPP_ -#define _LIBRARY_CHRONO_DATETIME_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Library/Chrono.hpp" @@ -576,5 +575,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CHRONO_DATETIME_HPP_ diff --git a/module/Library/Chrono/Time.hpp b/module/Library/Chrono/Time.hpp index aef49f9b..ec9394ab 100644 --- a/module/Library/Chrono/Time.hpp +++ b/module/Library/Chrono/Time.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CHRONO_TIME_HPP_ -#define _LIBRARY_CHRONO_TIME_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Library/Chrono.hpp" @@ -358,5 +357,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CHRONO_TIME_HPP_ \ No newline at end of file diff --git a/module/Library/Chrono/Timer.hpp b/module/Library/Chrono/Timer.hpp index 75690be5..a5924d6f 100644 --- a/module/Library/Chrono/Timer.hpp +++ b/module/Library/Chrono/Timer.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CHRONO_TIMER_HPP_ -#define _LIBRARY_CHRONO_TIMER_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Library/Chrono.hpp" @@ -96,5 +95,3 @@ private: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CHRONO_TIMER_HPP_ diff --git a/module/Library/Chrono/Timestamp.hpp b/module/Library/Chrono/Timestamp.hpp index 88ee0dd2..0996dfd0 100644 --- a/module/Library/Chrono/Timestamp.hpp +++ b/module/Library/Chrono/Timestamp.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CHRONO_TIMESTAMP_HPP_ -#define _LIBRARY_CHRONO_TIMESTAMP_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Library/Chrono.hpp" @@ -343,5 +342,3 @@ private: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CHRONO_TIMESTAMP_HPP_ diff --git a/module/Library/Crypt.hpp b/module/Library/Crypt.hpp index 7a0dc71d..92dcd2eb 100644 --- a/module/Library/Crypt.hpp +++ b/module/Library/Crypt.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CRYPT_HPP_ -#define _LIBRARY_CRYPT_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -10,5 +9,3 @@ namespace SqMod { } // Namespace:: SqMod - -#endif // _LIBRARY_CRYPT_HPP_ diff --git a/module/Library/Crypt/AES.hpp b/module/Library/Crypt/AES.hpp index 5b683e60..9c883205 100644 --- a/module/Library/Crypt/AES.hpp +++ b/module/Library/Crypt/AES.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CRYPT_AES_HPP_ -#define _LIBRARY_CRYPT_AES_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -101,5 +100,3 @@ private: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CRYPT_AES_HPP_ diff --git a/module/Library/Crypt/Hash.hpp b/module/Library/Crypt/Hash.hpp index 5eb4e009..48a1a80f 100644 --- a/module/Library/Crypt/Hash.hpp +++ b/module/Library/Crypt/Hash.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_CRYPT_HASH_HPP_ -#define _LIBRARY_CRYPT_HASH_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -98,5 +97,3 @@ private: }; } // Namespace:: SqMod - -#endif // _LIBRARY_CRYPT_HASH_HPP_ diff --git a/module/Library/IO.hpp b/module/Library/IO.hpp index c91f3a94..09f68b1f 100644 --- a/module/Library/IO.hpp +++ b/module/Library/IO.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_IO_HPP_ -#define _LIBRARY_IO_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -10,5 +9,3 @@ namespace SqMod { } // Namespace:: SqMod - -#endif // _LIBRARY_IO_HPP_ \ No newline at end of file diff --git a/module/Library/IO/INI.hpp b/module/Library/IO/INI.hpp index b67f275e..061c218b 100644 --- a/module/Library/IO/INI.hpp +++ b/module/Library/IO/INI.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_IO_INI_HPP_ -#define _LIBRARY_IO_INI_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -977,5 +976,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_IO_INI_HPP_ diff --git a/module/Library/Numeric.hpp b/module/Library/Numeric.hpp index 6e80eafb..92dcd2eb 100644 --- a/module/Library/Numeric.hpp +++ b/module/Library/Numeric.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_NUMERIC_HPP_ -#define _LIBRARY_NUMERIC_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -10,5 +9,3 @@ namespace SqMod { } // Namespace:: SqMod - -#endif // _LIBRARY_NUMERIC_HPP_ diff --git a/module/Library/Numeric/LongInt.hpp b/module/Library/Numeric/LongInt.hpp index c79660de..42a0ecca 100644 --- a/module/Library/Numeric/LongInt.hpp +++ b/module/Library/Numeric/LongInt.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_NUMERIC_LONGINT_HPP_ -#define _LIBRARY_NUMERIC_LONGINT_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -1286,5 +1285,3 @@ Int64 PopStackSLong(HSQUIRRELVM vm, SQInteger idx); Uint64 PopStackULong(HSQUIRRELVM vm, SQInteger idx); } // Namespace:: SqMod - -#endif // _LIBRARY_NUMERIC_LONGINT_HPP_ diff --git a/module/Library/Numeric/Math.hpp b/module/Library/Numeric/Math.hpp index 59e64c23..92dcd2eb 100644 --- a/module/Library/Numeric/Math.hpp +++ b/module/Library/Numeric/Math.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_NUMERIC_MATH_HPP_ -#define _LIBRARY_NUMERIC_MATH_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -10,5 +9,3 @@ namespace SqMod { } // Namespace:: SqMod - -#endif // _LIBRARY_NUMERIC_MATH_HPP_ diff --git a/module/Library/Numeric/Random.hpp b/module/Library/Numeric/Random.hpp index b03221ab..c535a772 100644 --- a/module/Library/Numeric/Random.hpp +++ b/module/Library/Numeric/Random.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_NUMERIC_RANDOM_HPP_ -#define _LIBRARY_NUMERIC_RANDOM_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -160,5 +159,3 @@ template <> struct RandomVal< bool > }; } // Namespace:: SqMod - -#endif // _LIBRARY_NUMERIC_RANDOM_HPP_ diff --git a/module/Library/SQLite.hpp b/module/Library/SQLite.hpp index 8c354f2d..09f68b1f 100644 --- a/module/Library/SQLite.hpp +++ b/module/Library/SQLite.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_SQLITE_HPP_ -#define _LIBRARY_SQLITE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -10,5 +9,3 @@ namespace SqMod { } // Namespace:: SqMod - -#endif // _LIBRARY_SQLITE_HPP_ \ No newline at end of file diff --git a/module/Library/String.hpp b/module/Library/String.hpp index 16a254ec..e96ec3f0 100644 --- a/module/Library/String.hpp +++ b/module/Library/String.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_STRING_HPP_ -#define _LIBRARY_STRING_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -26,5 +25,3 @@ CSStr StrToUppercase(CSStr str); Buffer StrToUppercaseB(CSStr str); } // Namespace:: SqMod - -#endif // _LIBRARY_STRING_HPP_ diff --git a/module/Library/System.hpp b/module/Library/System.hpp index 34225f41..09f68b1f 100644 --- a/module/Library/System.hpp +++ b/module/Library/System.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_SYSTEM_HPP_ -#define _LIBRARY_SYSTEM_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -10,5 +9,3 @@ namespace SqMod { } // Namespace:: SqMod - -#endif // _LIBRARY_SYSTEM_HPP_ \ No newline at end of file diff --git a/module/Library/System/Dir.hpp b/module/Library/System/Dir.hpp index ae5d156d..9e1a6177 100644 --- a/module/Library/System/Dir.hpp +++ b/module/Library/System/Dir.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_SYSDIR_HPP_ -#define _LIBRARY_SYSDIR_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -580,8 +579,4 @@ public: } }; - - } // Namespace:: SqMod - -#endif // _LIBRARY_SYSDIR_HPP_ diff --git a/module/Library/System/Environment.hpp b/module/Library/System/Environment.hpp index 37edaf87..d7478208 100644 --- a/module/Library/System/Environment.hpp +++ b/module/Library/System/Environment.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_SYSENV_HPP_ -#define _LIBRARY_SYSENV_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -312,5 +311,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_SYSENV_HPP_ diff --git a/module/Library/System/Path.hpp b/module/Library/System/Path.hpp index 276a95fd..1e521a20 100644 --- a/module/Library/System/Path.hpp +++ b/module/Library/System/Path.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_SYSPATH_HPP_ -#define _LIBRARY_SYSPATH_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -759,5 +758,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_SYSPATH_HPP_ diff --git a/module/Library/Utils.hpp b/module/Library/Utils.hpp index 94f047a3..09f68b1f 100644 --- a/module/Library/Utils.hpp +++ b/module/Library/Utils.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_UTILS_HPP_ -#define _LIBRARY_UTILS_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -10,5 +9,3 @@ namespace SqMod { } // Namespace:: SqMod - -#endif // _LIBRARY_UTILS_HPP_ \ No newline at end of file diff --git a/module/Library/Utils/Buffer.hpp b/module/Library/Utils/Buffer.hpp index 508d9abb..a8f2d67e 100644 --- a/module/Library/Utils/Buffer.hpp +++ b/module/Library/Utils/Buffer.hpp @@ -1,5 +1,4 @@ -#ifndef _LIBRARY_UTILS_BUFFER_HPP_ -#define _LIBRARY_UTILS_BUFFER_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -833,5 +832,3 @@ public: }; } // Namespace:: SqMod - -#endif // _LIBRARY_UTILS_BUFFER_HPP_ diff --git a/module/Logger.hpp b/module/Logger.hpp index 5f798808..4cf0118c 100644 --- a/module/Logger.hpp +++ b/module/Logger.hpp @@ -1,5 +1,4 @@ -#ifndef _LOGGER_HPP_ -#define _LOGGER_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -340,5 +339,3 @@ void OutputMessage(CCStr msg, ...); void OutputError(CCStr msg, ...); } // Namespace:: SqMod - -#endif // _LOGGER_HPP_ diff --git a/module/Misc/Algo.hpp b/module/Misc/Algo.hpp index a5dc1f52..d417ae74 100644 --- a/module/Misc/Algo.hpp +++ b/module/Misc/Algo.hpp @@ -1,5 +1,4 @@ -#ifndef _BASE_ALGO_HPP_ -#define _BASE_ALGO_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Core.hpp" @@ -1645,5 +1644,3 @@ public: } // Namespace:: Algo } // Namespace:: SqMod - -#endif // _BASE_ALGO_HPP_ diff --git a/module/Misc/Areas.hpp b/module/Misc/Areas.hpp index 2d87fd03..72415f1b 100644 --- a/module/Misc/Areas.hpp +++ b/module/Misc/Areas.hpp @@ -1,5 +1,4 @@ -#ifndef _AREAS_HPP_ -#define _AREAS_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -712,5 +711,3 @@ public: }; } // Namespace:: SqMod - -#endif // _AREAS_HPP_ diff --git a/module/Misc/Command.hpp b/module/Misc/Command.hpp index 42b4467a..2b89cc00 100644 --- a/module/Misc/Command.hpp +++ b/module/Misc/Command.hpp @@ -1,5 +1,4 @@ -#ifndef _COMMAND_HPP_ -#define _COMMAND_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -2039,5 +2038,3 @@ private: } // Namespace:: Cmd } // Namespace:: SqMod - -#endif // _COMMAND_HPP_ diff --git a/module/Misc/Functions.hpp b/module/Misc/Functions.hpp index 381950ef..d7fa17d7 100644 --- a/module/Misc/Functions.hpp +++ b/module/Misc/Functions.hpp @@ -1,5 +1,4 @@ -#ifndef _MISC_FUNCTIONS_HPP_ -#define _MISC_FUNCTIONS_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -490,7 +489,4 @@ SQFloat GetNetworkStatisticsF(Int32 option_id); SQInteger GetNetworkStatisticsI(Int32 option_id); #endif - } // Namespace:: SqMod - -#endif // _MISC_FUNCTIONS_HPP_ diff --git a/module/Misc/Model.hpp b/module/Misc/Model.hpp index 7d893aab..50a32233 100644 --- a/module/Misc/Model.hpp +++ b/module/Misc/Model.hpp @@ -1,5 +1,4 @@ -#ifndef _MISC_MODEL_HPP_ -#define _MISC_MODEL_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -28,5 +27,3 @@ bool IsModelWeapon(Int32 id); bool IsModelActuallyWeapon(Int32 id); } // Namespace:: SqMod - -#endif // _MISC_MODEL_HPP_ diff --git a/module/Misc/Player.hpp b/module/Misc/Player.hpp index 2b4226aa..068324a0 100644 --- a/module/Misc/Player.hpp +++ b/module/Misc/Player.hpp @@ -1,5 +1,4 @@ -#ifndef _MISC_PLAYER_HPP_ -#define _MISC_PLAYER_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -28,5 +27,3 @@ Int32 GetSkinID(StackStrF & name); bool IsSkinValid(Int32 id); } // Namespace:: SqMod - -#endif // _MISC_PLAYER_HPP_ diff --git a/module/Misc/Routine.hpp b/module/Misc/Routine.hpp index 0c14e54e..1d3fdf0d 100644 --- a/module/Misc/Routine.hpp +++ b/module/Misc/Routine.hpp @@ -1,5 +1,4 @@ -#ifndef _ROUTINE_HPP_ -#define _ROUTINE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -640,5 +639,3 @@ public: }; } // Namespace:: SqMod - -#endif // _ROUTINE_HPP_ diff --git a/module/Misc/Signal.hpp b/module/Misc/Signal.hpp index f2c95d5c..190ea668 100644 --- a/module/Misc/Signal.hpp +++ b/module/Misc/Signal.hpp @@ -1,5 +1,4 @@ -#ifndef _SIGNAL_HPP_ -#define _SIGNAL_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -763,5 +762,3 @@ public: }; } // Namespace:: SqMod - -#endif // _SIGNAL_HPP_ diff --git a/module/Misc/Tasks.hpp b/module/Misc/Tasks.hpp index 9eb7348e..ea5e0a31 100644 --- a/module/Misc/Tasks.hpp +++ b/module/Misc/Tasks.hpp @@ -1,5 +1,4 @@ -#ifndef _TASKS_HPP_ -#define _TASKS_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "Base/Shared.hpp" @@ -523,5 +522,3 @@ public: }; } // Namespace:: SqMod - -#endif // _TASKS_HPP_ diff --git a/module/Misc/Vehicle.hpp b/module/Misc/Vehicle.hpp index 2d88b31d..05c71fd0 100644 --- a/module/Misc/Vehicle.hpp +++ b/module/Misc/Vehicle.hpp @@ -1,5 +1,4 @@ -#ifndef _MISC_VEHICLE_HPP_ -#define _MISC_VEHICLE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -28,5 +27,3 @@ Int32 GetAutomobileID(StackStrF & name); bool IsAutomobileValid(Int32 id); } // Namespace:: SqMod - -#endif // _MISC_VEHICLE_HPP_ diff --git a/module/Misc/Weapon.hpp b/module/Misc/Weapon.hpp index 450414a8..8e9dd531 100644 --- a/module/Misc/Weapon.hpp +++ b/module/Misc/Weapon.hpp @@ -1,5 +1,4 @@ -#ifndef _MISC_WEAPON_HPP_ -#define _MISC_WEAPON_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include "SqBase.hpp" @@ -58,5 +57,3 @@ Int32 WeaponToModel(Int32 id); bool IsWeaponNatural(Int32 id); } // Namespace:: SqMod - -#endif // _MISC_WEAPON_HPP_ diff --git a/module/SqBase.hpp b/module/SqBase.hpp index 616e298d..9ab4c61d 100644 --- a/module/SqBase.hpp +++ b/module/SqBase.hpp @@ -1,5 +1,4 @@ -#ifndef _SQBASE_HPP_ -#define _SQBASE_HPP_ +#pragma once // ------------------------------------------------------------------------------------------------ #include @@ -1432,5 +1431,3 @@ enum EntityType #define SQMOD_ASCII_TILDE 126 #define SQMOD_ASCII_UNDEFINED 127 #define SQMOD_ASCII_MAX 127 - -#endif // _SQBASE_HPP_