Misc

.clang-format

@@ -13,7 +13,7 @@ AllowShortFunctionsOnASingleLine: None
 BraceWrapping:
   AfterNamespace: true
   BeforeWhile: true
-# BreakAfterAttributes: Always # clang-format-16
+BreakAfterAttributes: Always
 BreakBeforeBraces: Allman
 ColumnLimit: 120
 FixNamespaceComments: true

.clang-tidy

@@ -0,0 +1,5 @@
+---
+Checks:          '*,-fuchsia-*,-google-*,-zircon-*,-abseil-*,-modernize-use-trailing-return-type,-llvm*'
+WarningsAsErrors: ''
+HeaderFilterRegex: ''
+FormatStyle:     none

src/CfbfStreamLocation.hpp

@@ -95,7 +95,8 @@ class CfbfStreamLocation
     std::vector<std::string> mStreamLocation{};
 };
 
-[[maybe_unused]] static std::string to_string(const CfbfStreamLocation& aLocation)
+[[maybe_unused]]
+static std::string to_string(const CfbfStreamLocation& aLocation)
 {
     std::string locStr{};
     for(const auto& locPart : aLocation.get_vector())
@@ -106,17 +107,20 @@ class CfbfStreamLocation
     return locStr;
 }
 
-[[maybe_unused]] static bool operator==(const CfbfStreamLocation& aLhs, const std::vector<std::string>& aRhs)
+[[maybe_unused]]
+static bool operator==(const CfbfStreamLocation& aLhs, const std::vector<std::string>& aRhs)
 {
     return aLhs.get_vector() == aRhs;
 }
 
-[[maybe_unused]] static bool operator==(const std::vector<std::string>& aLhs, const CfbfStreamLocation& aRhs)
+[[maybe_unused]]
+static bool operator==(const std::vector<std::string>& aLhs, const CfbfStreamLocation& aRhs)
 {
     return aRhs == aLhs;
 }
 
-[[maybe_unused]] static bool operator==(const CfbfStreamLocation& aLhs, const CfbfStreamLocation& aRhs)
+[[maybe_unused]]
+static bool operator==(const CfbfStreamLocation& aLhs, const CfbfStreamLocation& aRhs)
 {
     return aLhs.get_vector() == aRhs.get_vector();
 }

src/ContainerContext.cpp

@@ -21,14 +21,13 @@ namespace fs = std::filesystem;
 OOCP::ContainerContext::ContainerContext(
     const fs::path& aInputCfbfFile, const fs::path& aExtractedCfbfPath, ParserConfig aCfg, Database& aDb)
     : mDb{aDb},
+      mInputCfbfFile{aInputCfbfFile},
+      mExtractedCfbfPath{aExtractedCfbfPath},
+      mCfg{aCfg},
+      mFileFormatVersion{FileFormatVersion::C},
+      mLogLevel{spdlog::level::trace},
       mLogger{"tmp"}
 {
-    mInputCfbfFile     = aInputCfbfFile;
-    mExtractedCfbfPath = aExtractedCfbfPath;
-    mCfg               = aCfg;
-    mFileFormatVersion = FileFormatVersion::C;
-    mLogLevel          = spdlog::level::trace;
-
     const fs::path logPath = mExtractedCfbfPath / "logs" / "OpenOrCadParser.log";
     configureLogger(logPath);
 }

src/ContainerContext.hpp

@@ -35,7 +35,8 @@ struct ParserConfig
     bool mKeepTmpFiles{true}; //!< Do not delete temporary files after parser completed
 };
 
-[[maybe_unused]] static std::string to_string(const ParserConfig& aCfg)
+[[maybe_unused]]
+static std::string to_string(const ParserConfig& aCfg)
 {
     std::string str;
     str += fmt::format("mSkipUnknownPrim   = {}\n", aCfg.mSkipUnknownPrim);

src/ContainerExtractor.cpp

@@ -18,8 +18,6 @@
 
 namespace fs = std::filesystem;
 
-using namespace OOCP;
-
 OOCP::ContainerExtractor::ContainerExtractor(const fs::path& aContainer)
 {
     mContainer = aContainer;
@@ -62,7 +60,7 @@ void OOCP::ContainerExtractor::outputFileInfo() const
               << "mini fat sector: " << hdr->numMiniFATSector << std::endl;
 }
 
-void ContainerExtractor::outputEntryInfo(const CFB::COMPOUND_FILE_ENTRY* aEntry) const
+void OOCP::ContainerExtractor::outputEntryInfo(const CFB::COMPOUND_FILE_ENTRY* aEntry) const
 {
     std::clog << "entry type: "
               << (mReader->IsPropertyStream(aEntry) ? "property" : (mReader->IsStream(aEntry) ? "stream" : "directory"))

src/DataStream.cpp

@@ -1,7 +1,9 @@
 #include <algorithm>
+#include <cstdint>
 #include <fstream>
 #include <iostream>
 #include <string>
+#include <vector>
 
 #include <fmt/core.h>
 #include <spdlog/spdlog.h>
@@ -213,7 +215,7 @@ std::string OOCP::DataStream::dataToStr(const std::vector<uint8_t>& aData)
             preamble = fmt::format("0x{:08x}: ", getCurrentOffset());
         }
 
-        char c = static_cast<char>(aData[i]);
+        const char c = static_cast<char>(aData[i]);
         line_hex += fmt::format("{:02x}", aData[i]);
         line_str += std::isprint(c) ? c : '.';
 

src/Database.hpp

@@ -38,7 +38,8 @@ class Database
     std::vector<std::shared_ptr<Stream>> mStreams;
 };
 
-[[maybe_unused]] static std::string to_string(const Database& aObj)
+[[maybe_unused]]
+static std::string to_string(const Database& aObj)
 {
     std::string str;
 
@@ -52,7 +53,8 @@ class Database
     return str;
 }
 
-[[maybe_unused]] static std::ostream& operator<<(std::ostream& aOs, const Database& aVal)
+[[maybe_unused]]
+static std::ostream& operator<<(std::ostream& aOs, const Database& aVal)
 {
     aOs << to_string(aVal);
 

src/Enums/Color.hpp

@@ -65,17 +65,20 @@ enum class Color
     Default                 = 48
 };
 
-[[maybe_unused]] static constexpr Color ToColor(uint32_t aVal)
+[[maybe_unused]]
+static constexpr Color ToColor(uint32_t aVal)
 {
     return ToEnum<Color, decltype(aVal)>(aVal);
 }
 
-[[maybe_unused]] static std::string to_string(const Color& aVal)
+[[maybe_unused]]
+static std::string to_string(const Color& aVal)
 {
     return std::string{magic_enum::enum_name<decltype(aVal)>(aVal)};
 }
 
-[[maybe_unused]] static std::ostream& operator<<(std::ostream& aOs, const Color& aVal)
+[[maybe_unused]]
+static std::ostream& operator<<(std::ostream& aOs, const Color& aVal)
 {
     aOs << to_string(aVal);
     return aOs;

src/Enums/ComponentType.hpp

@@ -59,7 +59,8 @@ enum class ComponentType
     //       too often to be a realistic corruption issue but I need to confirm this.
 };
 
-[[maybe_unused]] static constexpr ComponentType ToComponentType(uint16_t aVal)
+[[maybe_unused]]
+static constexpr ComponentType ToComponentType(uint16_t aVal)
 {
     // See the explanation at HACKY_VALUE for this hack
     if(aVal > 100U)
@@ -70,12 +71,14 @@ enum class ComponentType
     return ToEnum<ComponentType, decltype(aVal)>(aVal);
 }
 
-[[maybe_unused]] static std::string to_string(const ComponentType& aVal)
+[[maybe_unused]]
+static std::string to_string(const ComponentType& aVal)
 {
     return std::string{magic_enum::enum_name<decltype(aVal)>(aVal)};
 }
 
-[[maybe_unused]] static std::ostream& operator<<(std::ostream& aOs, const ComponentType& aVal)
+[[maybe_unused]]
+static std::ostream& operator<<(std::ostream& aOs, const ComponentType& aVal)
 {
     aOs << to_string(aVal);
     return aOs;

src/Enums/DirectoryType.hpp

@@ -22,7 +22,8 @@ enum class DirectoryType
     ViewsDirectory
 };
 
-[[maybe_unused]] static std::string to_string(const DirectoryType& aVal)
+[[maybe_unused]]
+static std::string to_string(const DirectoryType& aVal)
 {
     switch(aVal)
     {
@@ -52,7 +53,8 @@ enum class DirectoryType
     }
 }
 
-[[maybe_unused]] static std::ostream& operator<<(std::ostream& aOs, const DirectoryType& aVal)
+[[maybe_unused]]
+static std::ostream& operator<<(std::ostream& aOs, const DirectoryType& aVal)
 {
     aOs << to_string(aVal);
     return aOs;

src/Enums/FillStyle.hpp

@@ -21,17 +21,20 @@ enum class FillStyle
     HatchPattern = 2 // Refer to HatchStyle
 };
 
-[[maybe_unused]] static constexpr FillStyle ToFillStyle(uint32_t aVal)
+[[maybe_unused]]
+static constexpr FillStyle ToFillStyle(uint32_t aVal)
 {
     return ToEnum<FillStyle, decltype(aVal)>(aVal);
 }
 
-[[maybe_unused]] static std::string to_string(const FillStyle& aVal)
+[[maybe_unused]]
+static std::string to_string(const FillStyle& aVal)
 {
     return std::string{magic_enum::enum_name<decltype(aVal)>(aVal)};
 }
 
-[[maybe_unused]] static std::ostream& operator<<(std::ostream& aOs, const FillStyle& aVal)
+[[maybe_unused]]
+static std::ostream& operator<<(std::ostream& aOs, const FillStyle& aVal)
 {
     aOs << to_string(aVal);
     return aOs;