diff --git a/scwx-qt/source/scwx/qt/manager/font_manager.cpp b/scwx-qt/source/scwx/qt/manager/font_manager.cpp index 84f37b03..2747fd4d 100644 --- a/scwx-qt/source/scwx/qt/manager/font_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/font_manager.cpp @@ -62,7 +62,7 @@ public: void InitializeFontconfig(); void UpdateImGuiFont(types::FontCategory fontCategory); - const std::vector& GetRawFontData(const std::string& filename); + const std::vector& GetRawFontData(const std::string& filename); static FontRecord MatchFontFile(const std::string& family, const std::vector& styles); @@ -81,8 +81,7 @@ public: imguiFonts_ {}; std::shared_mutex imguiFontsMutex_ {}; - boost::unordered_flat_map> - rawFontData_ {}; + boost::unordered_flat_map> rawFontData_ {}; std::mutex rawFontDataMutex_ {}; std::shared_ptr defaultFont_ {}; @@ -303,7 +302,7 @@ FontManager::LoadImGuiFont(const std::string& family, return imguiFont; } -const std::vector& +const std::vector& FontManager::Impl::GetRawFontData(const std::string& filename) { std::unique_lock rawFontDataLock {rawFontDataMutex_}; @@ -316,16 +315,16 @@ FontManager::Impl::GetRawFontData(const std::string& filename) } // Raw font data needs to be loaded - std::basic_ifstream ifs {filename, std::ios::binary}; + std::basic_ifstream ifs {filename, std::ios::binary}; ifs.seekg(0, std::ios_base::end); std::size_t dataSize = ifs.tellg(); ifs.seekg(0, std::ios_base::beg); // Store the font data in a buffer - std::vector buffer {}; + std::vector buffer {}; buffer.reserve(dataSize); - std::copy(std::istreambuf_iterator(ifs), - std::istreambuf_iterator(), + std::copy(std::istreambuf_iterator(ifs), + std::istreambuf_iterator(), std::back_inserter(buffer)); // Place the buffer in the cache diff --git a/scwx-qt/source/scwx/qt/types/imgui_font.cpp b/scwx-qt/source/scwx/qt/types/imgui_font.cpp index f7ba126c..e6f22ad1 100644 --- a/scwx-qt/source/scwx/qt/types/imgui_font.cpp +++ b/scwx-qt/source/scwx/qt/types/imgui_font.cpp @@ -23,9 +23,9 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_); class ImGuiFont::Impl { public: - explicit Impl(const std::string& fontName, - const std::vector& fontData, - units::font_size::pixels size) : + explicit Impl(const std::string& fontName, + const std::vector& fontData, + units::font_size::pixels size) : fontName_ {fontName}, size_ {size} { CreateImGuiFont(fontData); @@ -33,7 +33,7 @@ public: ~Impl() {} - void CreateImGuiFont(const std::vector& fontData); + void CreateImGuiFont(const std::vector& fontData); const std::string fontName_; const units::font_size::pixels size_; @@ -41,15 +41,15 @@ public: ImFont* imFont_ {nullptr}; }; -ImGuiFont::ImGuiFont(const std::string& fontName, - const std::vector& fontData, - units::font_size::pixels size) : +ImGuiFont::ImGuiFont(const std::string& fontName, + const std::vector& fontData, + units::font_size::pixels size) : p(std::make_unique(fontName, fontData, size)) { } ImGuiFont::~ImGuiFont() = default; -void ImGuiFont::Impl::CreateImGuiFont(const std::vector& fontData) +void ImGuiFont::Impl::CreateImGuiFont(const std::vector& fontData) { logger_->debug("Creating Font: {}", fontName_); diff --git a/scwx-qt/source/scwx/qt/types/imgui_font.hpp b/scwx-qt/source/scwx/qt/types/imgui_font.hpp index 9a69ac6e..ace8ba09 100644 --- a/scwx-qt/source/scwx/qt/types/imgui_font.hpp +++ b/scwx-qt/source/scwx/qt/types/imgui_font.hpp @@ -18,9 +18,9 @@ namespace types class ImGuiFont { public: - explicit ImGuiFont(const std::string& fontName, - const std::vector& fontData, - units::font_size::pixels size); + explicit ImGuiFont(const std::string& fontName, + const std::vector& fontData, + units::font_size::pixels size); ~ImGuiFont(); ImGuiFont(const ImGuiFont&) = delete;