From e2f8892278dde6008b7aa92d2e0b82d80e96192d Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 26 Jan 2024 13:05:07 -0500 Subject: [PATCH] clang formatting --- src/Linker/Linker.cpp | 2 +- src/ObjCommon/Csv/ParsedCsv.cpp | 2 +- src/ObjCommon/Csv/ParsedCsv.h | 6 +++--- src/ObjCommon/Sound/WavTypes.h | 2 +- src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp | 2 +- src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.h | 4 ++-- src/ObjWriting/Sound/WavWriter.h | 2 +- src/Utils/Utils/StringUtils.cpp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Linker/Linker.cpp b/src/Linker/Linker.cpp index 01a094e8..e9587c11 100644 --- a/src/Linker/Linker.cpp +++ b/src/Linker/Linker.cpp @@ -421,7 +421,7 @@ class LinkerImpl final : public Linker SearchPaths& sourceSearchPaths) const { SoundBankWriter::OutputPath = fs::path(m_args.GetOutputFolderPathForProject(projectName)); - + const auto zone = CreateZoneForDefinition(targetName, zoneDefinition, &assetSearchPaths, &gdtSearchPaths, &sourceSearchPaths); auto result = zone != nullptr; if (zone) diff --git a/src/ObjCommon/Csv/ParsedCsv.cpp b/src/ObjCommon/Csv/ParsedCsv.cpp index 3ac96229..d566eac8 100644 --- a/src/ObjCommon/Csv/ParsedCsv.cpp +++ b/src/ObjCommon/Csv/ParsedCsv.cpp @@ -14,7 +14,7 @@ const std::string ParsedCsvRow::GetValue(const std::string& header, bool require std::cerr << "ERROR: Required column \"" << header << "\" was not found"; else std::cerr << "WARNING: Expected column \"" << header << "\" was not found"; - + return {}; } diff --git a/src/ObjCommon/Csv/ParsedCsv.h b/src/ObjCommon/Csv/ParsedCsv.h index 90973761..22d4e5be 100644 --- a/src/ObjCommon/Csv/ParsedCsv.h +++ b/src/ObjCommon/Csv/ParsedCsv.h @@ -12,7 +12,7 @@ public: explicit ParsedCsvRow(std::unordered_map& headers, std::vector& row); const std::string GetValue(const std::string& header, bool required = false) const; const float GetValueFloat(const std::string& header, bool required = false) const; - + template T GetValueInt(const std::string& header, bool required = false) const { const auto& value = this->GetValue(header, required); @@ -35,8 +35,8 @@ class ParsedCsv public: explicit ParsedCsv(const CsvInputStream& inputStream, bool hasHeaders = true); - + size_t Size() const; ParsedCsvRow operator[](size_t index) const; -}; \ No newline at end of file +}; diff --git a/src/ObjCommon/Sound/WavTypes.h b/src/ObjCommon/Sound/WavTypes.h index d14f34ed..1a997816 100644 --- a/src/ObjCommon/Sound/WavTypes.h +++ b/src/ObjCommon/Sound/WavTypes.h @@ -44,4 +44,4 @@ struct WavHeader WavChunkHeader chunkHeader; WavFormatChunkPcm formatChunk; WavChunkHeader subChunkHeader; -}; \ No newline at end of file +}; diff --git a/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp b/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp index b371dee9..57fc29d5 100644 --- a/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp +++ b/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.cpp @@ -19,7 +19,7 @@ std::unordered_map INDEX_FOR_FRAMERATE{ {44100, 5}, {48000, 6}, {96000, 7}, - {192000, 8}, + {192000, 8}, }; class SoundBankWriterImpl : public SoundBankWriter diff --git a/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.h b/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.h index a9f7f623..88153b77 100644 --- a/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.h +++ b/src/ObjLoading/ObjContainer/SoundBank/SoundBankWriter.h @@ -1,9 +1,9 @@ #pragma once #include "SearchPath/ISearchPath.h" +#include #include #include -#include class SoundBankWriter { @@ -22,4 +22,4 @@ public: static std::unique_ptr Create(const std::string& fileName, std::ostream& stream, ISearchPath* assetSearchPath); static std::filesystem::path OutputPath; -}; \ No newline at end of file +}; diff --git a/src/ObjWriting/Sound/WavWriter.h b/src/ObjWriting/Sound/WavWriter.h index 8ee153e5..eb0174a9 100644 --- a/src/ObjWriting/Sound/WavWriter.h +++ b/src/ObjWriting/Sound/WavWriter.h @@ -1,6 +1,6 @@ #pragma once -#include #include +#include class WavWriter { diff --git a/src/Utils/Utils/StringUtils.cpp b/src/Utils/Utils/StringUtils.cpp index 31368acd..cb5ede9c 100644 --- a/src/Utils/Utils/StringUtils.cpp +++ b/src/Utils/Utils/StringUtils.cpp @@ -1,7 +1,7 @@ #include "StringUtils.h" -#include #include +#include namespace utils { @@ -106,7 +106,7 @@ namespace utils { std::vector strings{}; std::istringstream stream(str); - + std::string s; while (std::getline(stream, s, delim)) {