From 41f577737919403e7cdec1eeacb322a83c9633b2 Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Fri, 23 Aug 2024 17:09:14 +0200 Subject: [PATCH] Cleanup includes and improve code style. --- src/Application/Application_FileWatcher.cpp | 2 ++ src/Application/Application_Initialisation.cpp | 2 ++ src/Application/Application_MainManager.cpp | 2 ++ src/Application/Application_MassViewer.cpp | 2 ++ src/Application/Application_MassViewer_Weapons.cpp | 2 ++ src/GameObjects/Mass.h | 1 - src/Gvas/PropertySerialiser.h | 2 +- src/Managers/BackupManager.h | 4 ++-- src/Managers/MassManager.cpp | 2 ++ src/Managers/ProfileManager.cpp | 1 + src/Managers/StagedMassManager.cpp | 1 + src/Version/Version.h | 9 ++++----- 12 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/Application/Application_FileWatcher.cpp b/src/Application/Application_FileWatcher.cpp index 3348d8e..9771a24 100644 --- a/src/Application/Application_FileWatcher.cpp +++ b/src/Application/Application_FileWatcher.cpp @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include #include #include diff --git a/src/Application/Application_Initialisation.cpp b/src/Application/Application_Initialisation.cpp index c692408..90dab3f 100644 --- a/src/Application/Application_Initialisation.cpp +++ b/src/Application/Application_Initialisation.cpp @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include #include diff --git a/src/Application/Application_MainManager.cpp b/src/Application/Application_MainManager.cpp index 38e52f6..6bc1578 100644 --- a/src/Application/Application_MainManager.cpp +++ b/src/Application/Application_MainManager.cpp @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include #include diff --git a/src/Application/Application_MassViewer.cpp b/src/Application/Application_MassViewer.cpp index f1a051d..7fd1fd1 100644 --- a/src/Application/Application_MassViewer.cpp +++ b/src/Application/Application_MassViewer.cpp @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include #include diff --git a/src/Application/Application_MassViewer_Weapons.cpp b/src/Application/Application_MassViewer_Weapons.cpp index 7865a0e..6834eb8 100644 --- a/src/Application/Application_MassViewer_Weapons.cpp +++ b/src/Application/Application_MassViewer_Weapons.cpp @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include "../FontAwesome/IconsFontAwesome5.h" #include "../GameData/StyleNames.h" diff --git a/src/GameObjects/Mass.h b/src/GameObjects/Mass.h index 13edb42..6a4390b 100644 --- a/src/GameObjects/Mass.h +++ b/src/GameObjects/Mass.h @@ -17,7 +17,6 @@ // along with this program. If not, see . #include -#include #include #include #include diff --git a/src/Gvas/PropertySerialiser.h b/src/Gvas/PropertySerialiser.h index 99b3cd6..dd836e8 100644 --- a/src/Gvas/PropertySerialiser.h +++ b/src/Gvas/PropertySerialiser.h @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include +#include #include #include diff --git a/src/Managers/BackupManager.h b/src/Managers/BackupManager.h index 2f48e89..292ee26 100644 --- a/src/Managers/BackupManager.h +++ b/src/Managers/BackupManager.h @@ -21,7 +21,7 @@ #include #include -#include +//#include #include "Backup.h" #include "../GameObjects/Profile.h" @@ -46,7 +46,7 @@ class BackupManager { bool create(const GameObjects::Profile& profile); bool remove(std::size_t index); - bool remove(Containers::StringView filename); + //bool remove(Containers::StringView filename); bool restore(std::size_t index); diff --git a/src/Managers/MassManager.cpp b/src/Managers/MassManager.cpp index 37c73b6..72c8242 100644 --- a/src/Managers/MassManager.cpp +++ b/src/Managers/MassManager.cpp @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include #include diff --git a/src/Managers/ProfileManager.cpp b/src/Managers/ProfileManager.cpp index 6dc724e..df28523 100644 --- a/src/Managers/ProfileManager.cpp +++ b/src/Managers/ProfileManager.cpp @@ -16,6 +16,7 @@ #include +#include #include #include #include diff --git a/src/Managers/StagedMassManager.cpp b/src/Managers/StagedMassManager.cpp index 03ca282..b6cde8b 100644 --- a/src/Managers/StagedMassManager.cpp +++ b/src/Managers/StagedMassManager.cpp @@ -16,6 +16,7 @@ #include +#include #include #include diff --git a/src/Version/Version.h b/src/Version/Version.h index e89af93..a5468e2 100644 --- a/src/Version/Version.h +++ b/src/Version/Version.h @@ -45,19 +45,18 @@ struct Version { bool prerelease = false; long fullVersion = 0; - inline bool operator==(const Version& other) const { + bool operator==(const Version& other) const { return fullVersion == other.fullVersion && prerelease == other.prerelease; } - inline bool operator>(const Version& other) const { + bool operator>(const Version& other) const { if((fullVersion > other.fullVersion) || (fullVersion == other.fullVersion && !prerelease && other.prerelease)) { return true; } - else { - return false; - } + + return false; } explicit operator Containers::String() const {