Update and fix formatting

Author: Flamefire

.clang-format

@@ -20,7 +20,7 @@ AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: true
-BraceWrapping:   
+BraceWrapping:
   AfterClass:      true
   AfterControlStatement: true
   AfterEnum:       true
@@ -55,7 +55,7 @@ DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, BOOST_REVERSE_FOREACH, RTTR_FOREACH_PT ]
-IncludeCategories: 
+IncludeCategories:
   - Regex:    '[dD]efines.h'
     Priority: -1
   - Regex:    '^"world/'
@@ -70,15 +70,21 @@ IncludeCategories:
     Priority: 50
   - Regex:    '^(<|")lib.*/'
     Priority: 90
-  - Regex:    '^<boost/'
+  - Regex:    '^(<|")s25util.*/'
+    Priority: 90
+  - Regex:    '(<|")rttr/'
+    Priority: 90
+  - Regex:    '<(utf8.h|kaguya|turtle|glad|KHR)'
+    Priority: 95
+  - Regex:    '<boost/'
     Priority: 99
   - Regex:    '^<windows'
     Priority: 100
   - Regex:    '^<'
     Priority: 110
   - Regex:    '.*'
     Priority: 1
-IncludeIsMainRegex: '(Impl)?$'
+IncludeIsMainRegex: '(Impl|_Win32|_Other)?$'
 IndentCaseLabels: true
 IndentWidth: 4
 IndentWrappedFunctionNames: false
@@ -114,6 +120,6 @@ SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp03
+Standard:        Cpp11
 TabWidth:        4
-UseTab:          Never
+UseTab:          Never

examples/chTransparentIdx/CMakeLists.txt

@@ -16,5 +16,5 @@ include(EnableWarnings)
 enable_warnings(chTransparentIdx)
 
 if(ClangFormat_FOUND)
-    add_clangFormat_files(${_sources})
+    add_clangFormat_files(chTransparentIdx.cpp)
 endif()

examples/outline/CMakeLists.txt

@@ -13,5 +13,5 @@ include(EnableWarnings)
 enable_warnings(outline)
 
 if(ClangFormat_FOUND)
-    add_clangFormat_files(${_sources})
+    add_clangFormat_files(outline.cpp)
 endif()

include/libsiedler2/Archiv.h

@@ -72,7 +72,7 @@ class Archiv
     ArchivItem* operator[](size_t index) { return get(index); }
 
 private:
-    std::vector<std::unique_ptr<ArchivItem> > data; /// elements
+    std::vector<std::unique_ptr<ArchivItem>> data; /// elements
 };
 } // namespace libsiedler2
 

src/ArchivItem_Bob.cpp

@@ -113,7 +113,7 @@ int libsiedler2::ArchivItem_Bob::load(std::istream& file, const ArchivItem_Palet
     std::vector<bool> loaded(numGoodImgs, false);
 
     std::vector<uint8_t> heights(numGoodImgs);
-    std::vector<std::vector<uint16_t> > starts(numGoodImgs);
+    std::vector<std::vector<uint16_t>> starts(numGoodImgs);
     std::vector<uint8_t> ny(numGoodImgs);
 
     for(uint16_t i = 0; i < numGoodImgs; ++i)

tests/testClone.cpp

@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE(CloneFromBasePtr)
     auto f = std::make_unique<Bar>(42, 1337);
     auto* basePtr = static_cast<BarBase*>(f.get());
     auto f2 = clone(basePtr);
-    static_assert(std::is_same<decltype(f2), std::unique_ptr<BarBase> >::value, "Must be the same");
+    static_assert(std::is_same<decltype(f2), std::unique_ptr<BarBase>>::value, "Must be the same");
     BOOST_TEST((f && f2 && basePtr));
     BOOST_TEST(f->i == 42);
     BOOST_TEST(f->j == 1337);