Reformat code with clang format

src/ObjCommon/Utils/DistinctMapper.h

@@ -1,12 +1,11 @@
 #pragma once
 
+#include "Utils/ClassUtils.h"
+
 #include <map>
 #include <vector>
 
-#include "Utils/ClassUtils.h"
-
-template <typename T>
-class DistinctMapper
+template<typename T> class DistinctMapper
 {
 public:
     DistinctMapper()

src/ObjCommon/Utils/FileToZlibWrapper.cpp

@@ -8,8 +8,7 @@ voidpf Wrapper_Zlib_FileOpen(voidpf opaque, const char*, int)
     return opaque;
 }
 
-template<typename T>
-uLong Wrapper_Zlib_FileRead(voidpf opaque, voidpf stream, void* buf, const uLong size)
+template<typename T> uLong Wrapper_Zlib_FileRead(voidpf opaque, voidpf stream, void* buf, const uLong size)
 {
     auto* file = static_cast<T*>(stream);
 
@@ -23,8 +22,7 @@ uLong Wrapper_Zlib_NoFileRead(voidpf opaque, voidpf stream, void* buf, const uLo
     return 0;
 }
 
-template<typename T>
-uLong Wrapper_Zlib_FileWrite(voidpf opaque, voidpf stream, const void* buf, const uLong size)
+template<typename T> uLong Wrapper_Zlib_FileWrite(voidpf opaque, voidpf stream, const void* buf, const uLong size)
 {
     auto* file = static_cast<T*>(stream);
     file->write(static_cast<const char*>(buf), size);
@@ -36,24 +34,21 @@ uLong Wrapper_Zlib_NoFileWrite(voidpf opaque, voidpf stream, const void* buf, co
     return 0;
 }
 
-template<typename T>
-long Wrapper_Zlib_FileTellRead(voidpf opaque, voidpf stream)
+template<typename T> long Wrapper_Zlib_FileTellRead(voidpf opaque, voidpf stream)
 {
     auto* file = static_cast<T*>(stream);
-    
+
     return static_cast<long>(file->tellg());
 }
 
-template<typename T>
-long Wrapper_Zlib_FileTellWrite(voidpf opaque, voidpf stream)
+template<typename T> long Wrapper_Zlib_FileTellWrite(voidpf opaque, voidpf stream)
 {
     auto* file = static_cast<T*>(stream);
-    
+
     return static_cast<long>(file->tellp());
 }
 
-template<typename T>
-long Wrapper_Zlib_FileSeekRead(voidpf opaque, voidpf stream, const uLong offset, const int origin)
+template<typename T> long Wrapper_Zlib_FileSeekRead(voidpf opaque, voidpf stream, const uLong offset, const int origin)
 {
     auto* file = static_cast<T*>(stream);
 
@@ -78,8 +73,7 @@ long Wrapper_Zlib_FileSeekRead(voidpf opaque, voidpf stream, const uLong offset,
     return 0;
 }
 
-template<typename T>
-long Wrapper_Zlib_FileSeekWrite(voidpf opaque, voidpf stream, const uLong offset, const int origin)
+template<typename T> long Wrapper_Zlib_FileSeekWrite(voidpf opaque, voidpf stream, const uLong offset, const int origin)
 {
     auto* file = static_cast<T*>(stream);
 
@@ -104,8 +98,7 @@ long Wrapper_Zlib_FileSeekWrite(voidpf opaque, voidpf stream, const uLong offset
     return 0;
 }
 
-template<typename T>
-int Wrapper_Zlib_FileClose(voidpf opaque, voidpf stream)
+template<typename T> int Wrapper_Zlib_FileClose(voidpf opaque, voidpf stream)
 {
     return 0;
     // auto* file = static_cast<T*>(stream);
@@ -126,8 +119,7 @@ int Wrapper_Zlib_FileError(voidpf opaque, voidpf stream)
 
 zlib_filefunc_def FileToZlibWrapper::CreateFunctions32ForFile(std::iostream* stream)
 {
-    return zlib_filefunc_def_s
-    {
+    return zlib_filefunc_def_s{
         Wrapper_Zlib_FileOpen,
         Wrapper_Zlib_FileRead<std::iostream>,
         Wrapper_Zlib_FileWrite<std::iostream>,
@@ -135,14 +127,13 @@ zlib_filefunc_def FileToZlibWrapper::CreateFunctions32ForFile(std::iostream* str
         Wrapper_Zlib_FileSeekRead<std::iostream>,
         Wrapper_Zlib_FileClose<std::iostream>,
         Wrapper_Zlib_FileError,
-        stream
+        stream,
     };
 }
 
 zlib_filefunc_def FileToZlibWrapper::CreateFunctions32ForFile(std::istream* stream)
 {
-    return zlib_filefunc_def_s
-    {
+    return zlib_filefunc_def_s{
         Wrapper_Zlib_FileOpen,
         Wrapper_Zlib_FileRead<std::istream>,
         Wrapper_Zlib_NoFileWrite,
@@ -150,14 +141,13 @@ zlib_filefunc_def FileToZlibWrapper::CreateFunctions32ForFile(std::istream* stre
         Wrapper_Zlib_FileSeekRead<std::istream>,
         Wrapper_Zlib_FileClose<std::istream>,
         Wrapper_Zlib_FileError,
-        stream
+        stream,
     };
 }
 
 zlib_filefunc_def FileToZlibWrapper::CreateFunctions32ForFile(std::ostream* stream)
 {
-    return zlib_filefunc_def_s
-    {
+    return zlib_filefunc_def_s{
         Wrapper_Zlib_FileOpen,
         Wrapper_Zlib_NoFileRead,
         Wrapper_Zlib_FileWrite<std::ostream>,
@@ -165,6 +155,6 @@ zlib_filefunc_def FileToZlibWrapper::CreateFunctions32ForFile(std::ostream* stre
         Wrapper_Zlib_FileSeekWrite<std::ostream>,
         Wrapper_Zlib_FileClose<std::ostream>,
         Wrapper_Zlib_FileError,
-        stream
+        stream,
     };
 }

src/ObjCommon/Utils/FileToZlibWrapper.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "ObjStream.h"
+
 #include <ioapi.h>
 #include <iostream>
 #include <istream>
 #include <ostream>
 
-#include "ObjStream.h"
-
 class FileToZlibWrapper
 {
 public:

src/ObjCommon/Utils/ObjFileStream.h

@@ -100,4 +100,4 @@
 // using fobjbuf = basic_fobjbuf<char, std::char_traits<char>>;
 // using fobjstream = basic_fobjstream<char, std::char_traits<char>>;
 // using ifobjstream = basic_ifobjstream<char, std::char_traits<char>>;
-// using ofobjstream = basic_ofobjstream<char, std::char_traits<char>>;
+// using ofobjstream = basic_ofobjstream<char, std::char_traits<char>>;

src/ObjCommon/Utils/ObjStream.h

@@ -2,23 +2,21 @@
 // ReSharper disable IdentifierTypo
 #pragma once
 
-#include <cassert>
-#include <streambuf>
-#include <iostream>
-#include <memory>
-
 #include "Utils/ClassUtils.h"
 
-template <class Elem, class Traits>
-class basic_objbuf : public std::basic_streambuf<Elem, Traits>
+#include <cassert>
+#include <iostream>
+#include <memory>
+#include <streambuf>
+
+template<class Elem, class Traits> class basic_objbuf : public std::basic_streambuf<Elem, Traits>
 {
 public:
     _NODISCARD virtual bool is_open() const = 0;
     virtual bool close() = 0;
 };
 
-template <class Elem, class Traits>
-class basic_objstream : public std::basic_iostream<Elem, Traits>
+template<class Elem, class Traits> class basic_objstream : public std::basic_iostream<Elem, Traits>
 {
 public:
     using mybase = std::basic_iostream<Elem, Traits>;
@@ -44,7 +42,7 @@ public:
 
     ~basic_objstream() override
     {
-        if(m_ob)
+        if (m_ob)
             m_ob->close();
     }
 
@@ -86,8 +84,7 @@ protected:
     std::unique_ptr<myob> m_ob;
 };
 
-template <class Elem, class Traits>
-class basic_iobjstream : public std::basic_istream<Elem, Traits>
+template<class Elem, class Traits> class basic_iobjstream : public std::basic_istream<Elem, Traits>
 {
 public:
     using mybase = std::basic_istream<Elem, Traits>;
@@ -151,8 +148,7 @@ protected:
     std::unique_ptr<myob> m_ob;
 };
 
-template <class Elem, class Traits>
-class basic_oobjstream : public std::basic_ostream<Elem, Traits>
+template<class Elem, class Traits> class basic_oobjstream : public std::basic_ostream<Elem, Traits>
 {
 public:
     using mybase = std::basic_ostream<Elem, Traits>;
@@ -192,7 +188,7 @@ public:
         swap(other);
         return *this;
     }
-    
+
     // ReSharper disable once CppHidingFunction
     _NODISCARD myob* rdbuf() const
     {