Update formatting

Author: Flamefire

libs/common/include/s25util/MyTime.h

@@ -32,7 +32,8 @@ struct Time
     /// liefert die aktuellen Ticks.
     static time64_t CurrentTick();
     /// Format a time as a string
-    /// @param format Format to use  (%Y=4 year (4 digits), %m month, %D day, %H hour, %i minute, %s second (all 2 digits), %% -> %)
+    /// @param format Format to use  (%Y=4 year (4 digits), %m month, %D day, %H hour, %i minute, %s second (all 2
+    /// digits), %% -> %)
     /// @param time Pointer to time to format or nullptr to use current time
     static std::string FormatTime(const std::string& format, time64_t time);
     /// Format the current time as a string

libs/common/include/s25util/enumUtils.h

@@ -20,8 +20,15 @@
 #include <type_traits>
 
 /// Makes a strongly typed enum usable as a bitset
-#define MAKE_BITSET_STRONG(Type)                                                                                        \
-    inline auto operator&(Type lhs, Type rhs) { return Type(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs)); } \
-    inline auto operator|(Type lhs, Type rhs) { return Type(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs)); } \
-    /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                                                                    \
-    static_assert(std::is_unsigned<std::underlying_type_t<Type>>::value, #Type " must use unsigned type as the underlying type")
+#define MAKE_BITSET_STRONG(Type)                                              \
+    inline auto operator&(Type lhs, Type rhs)                                 \
+    {                                                                         \
+        return Type(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs)); \
+    }                                                                         \
+    inline auto operator|(Type lhs, Type rhs)                                 \
+    {                                                                         \
+        return Type(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs)); \
+    }                                                                         \
+    /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                          \
+    static_assert(std::is_unsigned<std::underlying_type_t<Type>>::value,      \
+                  #Type " must use unsigned type as the underlying type")

libs/common/include/s25util/warningSuppression.h

@@ -23,26 +23,26 @@
 // Macro that can be used to suppress unused warnings. Required e.g. for const std::arrays defined in headers
 // Don't use this if not absolutely necessary!
 #ifdef __GNUC__
-#define SUPPRESS_UNUSED __attribute__((unused))
+#    define SUPPRESS_UNUSED __attribute__((unused))
 #else
-#define SUPPRESS_UNUSED
+#    define SUPPRESS_UNUSED
 #endif
 
 // Use for functions which use "unfixable" undefined behavior, but which is safe
 #if defined(__clang__)
-#define RTTR_ATTRIBUTE_NO_UBSAN(what) __attribute__((no_sanitize(BOOST_PP_STRINGIZE(what))))
+#    define RTTR_ATTRIBUTE_NO_UBSAN(what) __attribute__((no_sanitize(BOOST_PP_STRINGIZE(what))))
 #elif defined(__GNUC__)
-#define RTTR_ATTRIBUTE_NO_UBSAN(what) __attribute__((no_sanitize_undefined))
+#    define RTTR_ATTRIBUTE_NO_UBSAN(what) __attribute__((no_sanitize_undefined))
 #else
-#define RTTR_ATTRIBUTE_NO_UBSAN(what)
+#    define RTTR_ATTRIBUTE_NO_UBSAN(what)
 #endif
 
 #if BOOST_COMP_CLANG
-#define RTTR_DIAGNOSTIC(what) _Pragma(BOOST_PP_STRINGIZE(clang diagnostic what))
+#    define RTTR_DIAGNOSTIC(what) _Pragma(BOOST_PP_STRINGIZE(clang diagnostic what))
 #elif BOOST_COMP_MSVC || defined(__INTELLISENSE__)
-#define RTTR_DIAGNOSTIC(what)
+#    define RTTR_DIAGNOSTIC(what)
 #else
-#define RTTR_DIAGNOSTIC(what) _Pragma(BOOST_PP_STRINGIZE(GCC diagnostic what))
+#    define RTTR_DIAGNOSTIC(what) _Pragma(BOOST_PP_STRINGIZE(GCC diagnostic what))
 #endif
 
 #define RTTR_PUSH_DIAGNOSTIC RTTR_DIAGNOSTIC(push)

libs/common/src/LocaleHelper.cpp

@@ -21,11 +21,11 @@
 #include <boost/predef/os.h>
 #include <iostream>
 #if BOOST_OS_WINDOWS
-#include <boost/locale.hpp>
+#    include <boost/locale.hpp>
 #elif !BOOST_OS_MACOS
-#include "utf8.h"
-#include <iomanip>
-#include <sstream>
+#    include "utf8.h"
+#    include <iomanip>
+#    include <sstream>
 #endif
 
 namespace bfs = boost::filesystem;
@@ -97,7 +97,8 @@ bool LocaleHelper::init()
         // Call first to correctly init static variable
         getBfsDefaultLocale();
         // Check for errors and use system locale.
-        // So don't rely on string conversions to yield identical results on all systems as locale settings can be changed!
+        // So don't rely on string conversions to yield identical results on all systems as locale settings can be
+        // changed!
         std::locale newLocale = createUtf8Locale();
         std::locale::global(newLocale);
         // Use also the encoding (mostly UTF8) for bfs paths: http://stackoverflow.com/questions/23393870
@@ -108,10 +109,11 @@ bool LocaleHelper::init()
 #if BOOST_OS_WINDOWS
         std::cerr << "Check your system language configuration!";
 #else
-#if BOOST_OS_MACOS
-        std::cerr << "OS X has known problems when using libstdc++. Try setting LC_ALL and LANG to \"C\" or compile with libc++"
-                  << std::endl;
-#endif
+#    if BOOST_OS_MACOS
+        std::cerr
+          << "OS X has known problems when using libstdc++. Try setting LC_ALL and LANG to \"C\" or compile with libc++"
+          << std::endl;
+#    endif
         std::string lcAll = System::getEnvVar("LC_ALL");
         std::string lang = System::getEnvVar("LANG");
         std::cerr << "Check your environment for invalid settings (e.g. LC_ALL";

libs/common/src/MyTime.cpp

@@ -20,9 +20,9 @@
 #include <iomanip>
 #include <iostream>
 #ifdef _WIN32
-#include <windows.h>
+#    include <windows.h>
 #else
-#include <sys/times.h>
+#    include <sys/times.h>
 #endif // _WIN32
 #include "StringConversion.h"
 
@@ -57,7 +57,8 @@ time64_t Time::CurrentTick()
 /**
  *  formatiert einen Zeitstring.
  *
- *  @param[in] format Formatstring (%Y=4 stelliges Jahr, %m 2 stelliges Monat, %D tag, %H Stunde, %i Minute, %s Sekunden)
+ *  @param[in] format Formatstring (%Y=4 stelliges Jahr, %m 2 stelliges Monat, %D tag, %H Stunde, %i Minute, %s
+ * Sekunden)
  *  @param[in] time   zu benutzender Timestamp.
  *
  *  @return Formatted string

libs/common/src/SingletonPolicies.cpp

@@ -31,9 +31,13 @@ class LifetimeTracker : public Singleton<LifetimeTracker, SingletonPolicies::Def
         const unsigned longevity_;
         DestructionFunPtr destFunc_;
 
-        LifetimeTrackerItem(unsigned longevity, DestructionFunPtr destFunc) : longevity_(longevity), destFunc_(destFunc) {}
+        LifetimeTrackerItem(unsigned longevity, DestructionFunPtr destFunc) : longevity_(longevity), destFunc_(destFunc)
+        {}
 
-        friend bool operator<(const LifetimeTrackerItem& lhs, const LifetimeTrackerItem& rhs) { return lhs.longevity_ < rhs.longevity_; }
+        friend bool operator<(const LifetimeTrackerItem& lhs, const LifetimeTrackerItem& rhs)
+        {
+            return lhs.longevity_ < rhs.longevity_;
+        }
     };
 
     // Queue that sorts items in ascending order (front() points to smallest element)
@@ -50,7 +54,8 @@ class LifetimeTracker : public Singleton<LifetimeTracker, SingletonPolicies::Def
     void add(unsigned longevity, DestructionFunPtr destFunc)
     {
         // Remove same entries first. Calling a dtor twice is not supported!
-        const auto it = std::find_if(items_.begin(), items_.end(), [destFunc](const auto& x) { return x.destFunc_ == destFunc; });
+        const auto it =
+          std::find_if(items_.begin(), items_.end(), [destFunc](const auto& x) { return x.destFunc_ == destFunc; });
         if(it != items_.end())
             items_.erase(it);
         items_.insert(LifetimeTrackerItem(longevity, destFunc));

libs/common/src/System.cpp

@@ -96,7 +96,8 @@ bool System::execute(const bfs::path& command, const std::string& arguments)
     return result == 0; // Assume 0 == OK
 }
 
-System::ScopedCurrentPathChange::ScopedCurrentPathChange(const boost::filesystem::path& newCurrentPath) : oldCurPath(bfs::current_path())
+System::ScopedCurrentPathChange::ScopedCurrentPathChange(const boost::filesystem::path& newCurrentPath)
+    : oldCurPath(bfs::current_path())
 {
     if(!newCurrentPath.empty())
         bfs::current_path(newCurrentPath);

libs/common/src/System_Win32.cpp

@@ -20,12 +20,12 @@
 #include <windows.h>
 #include <shellapi.h>
 #ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4091) // "typedef ": Ignoriert auf der linken Seite von "tagGPFIDL_FLAGS"
+#    pragma warning(push)
+#    pragma warning(disable : 4091) // "typedef ": Ignoriert auf der linken Seite von "tagGPFIDL_FLAGS"
 #endif
 #include <shlobj.h>
 #ifdef _MSC_VER
-#pragma warning(push)
+#    pragma warning(push)
 #endif
 #include <stdexcept>
 
@@ -34,20 +34,20 @@ namespace bfs = boost::filesystem;
 #if defined(__MINGW32__) && !defined(REFKNOWNFOLDERID)
 
 using KNOWNFOLDERID = GUID;
-#define REFKNOWNFOLDERID const KNOWNFOLDERID&
+#    define REFKNOWNFOLDERID const KNOWNFOLDERID&
 
-#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    EXTERN_C const GUID DECLSPEC_SELECTANY name = {l, w1, w2, {b1, b2, b3, b4, b5, b6, b7, b8}}
+#    define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        EXTERN_C const GUID DECLSPEC_SELECTANY name = {l, w1, w2, {b1, b2, b3, b4, b5, b6, b7, b8}}
 
-#define KF_FLAG_CREATE 0x00008000
+#    define KF_FLAG_CREATE 0x00008000
 
 // {4C5C32FF-BB9D-43b0-B5B4-2D72E54EAAA4}
 DEFINE_KNOWN_FOLDER(FOLDERID_SavedGames, 0x4c5c32ff, 0xbb9d, 0x43b0, 0xb5, 0xb4, 0x2d, 0x72, 0xe5, 0x4e, 0xaa, 0xa4);
 // {FDD39AD0-238F-46AF-ADB4-6C85480369C7}
 DEFINE_KNOWN_FOLDER(FOLDERID_Documents, 0xFDD39AD0, 0x238F, 0x46AF, 0xAD, 0xB4, 0x6C, 0x85, 0x48, 0x03, 0x69, 0xC7);
 
 #elif(NTDDI_VERSION < NTDDI_VISTA)
-#define KF_FLAG_CREATE 0x00008000
+#    define KF_FLAG_CREATE 0x00008000
 #endif // __MINGW32__
 
 typedef HRESULT(WINAPI* LPSHGetKnownFolderPath)(REFKNOWNFOLDERID rfid, DWORD dwFlags, HANDLE hToken, PWSTR* ppszPath);

libs/common/src/Tokenizer.cpp

@@ -18,7 +18,9 @@
 #include "Tokenizer.h"
 #include <utility>
 
-Tokenizer::Tokenizer(std::string data, std::string delimiter) : data(std::move(data)), delimiter(std::move(delimiter)), curPos(0) {}
+Tokenizer::Tokenizer(std::string data, std::string delimiter)
+    : data(std::move(data)), delimiter(std::move(delimiter)), curPos(0)
+{}
 
 Tokenizer::operator bool() const
 {

libs/common/src/fileFuncs.cpp

@@ -29,7 +29,8 @@ std::string makePortableName(const std::string& fileName)
     for(char c : fileName)
     {
         // Characters allowed by portable_posix_name. These are also allowed by windows_name
-        if((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '.' || c == '_' || c == '-')
+        if((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '.' || c == '_'
+           || c == '-')
             result += c;
         else
             result += '_';