diff --git a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp index 0302d1dc..36665aab 100644 --- a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include @@ -32,8 +31,7 @@ static const std::vector> fontNames_ { {types::Font::din1451alt_g, ":/res/fonts/din1451alt_g.ttf"}, {types::Font::Inconsolata_Regular, ":/res/fonts/Inconsolata-Regular.ttf"}}; -static std::unordered_map fontIds_ {}; -static std::unordered_map> fonts_ {}; +static std::unordered_map fontIds_ {}; void Initialize() { @@ -55,16 +53,6 @@ int FontId(types::Font font) return -1; } -std::shared_ptr Font(types::Font font) -{ - auto it = fonts_.find(font); - if (it != fonts_.cend()) - { - return it->second; - } - return nullptr; -} - std::shared_ptr LoadImageResource(const std::string& urlString) { @@ -112,9 +100,6 @@ static void LoadFonts() fontIds_.emplace(fontName.first, fontId); fontManager.LoadApplicationFont(fontName.second); - - auto font = util::Font::Create(fontName.second); - fonts_.emplace(fontName.first, font); } fontManager.InitializeFonts(); diff --git a/scwx-qt/source/scwx/qt/manager/resource_manager.hpp b/scwx-qt/source/scwx/qt/manager/resource_manager.hpp index 7b8003c9..12e95cab 100644 --- a/scwx-qt/source/scwx/qt/manager/resource_manager.hpp +++ b/scwx-qt/source/scwx/qt/manager/resource_manager.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #include @@ -19,8 +18,7 @@ namespace ResourceManager void Initialize(); void Shutdown(); -int FontId(types::Font font); -std::shared_ptr Font(types::Font font); +int FontId(types::Font font); std::shared_ptr LoadImageResource(const std::string& urlString);