chatterino2
Code Issues

refactor: Un-singletonize Paths & Updates (#5092)

Browse Source
This commit is contained in:
pajlada
2024-01-16 21:56:43 +01:00
committed by GitHub
parent 7f935665f9
commit 718696db53
60 changed files with 237 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/Theme.cpp
+4 -4
View File
@@ -219,7 +219,7 @@ bool Theme::isLightTheme() const
return this->isLight_;
}
void Theme::initialize(Settings &settings, Paths &paths)
void Theme::initialize(Settings &settings, const Paths &paths)
{
this->themeName.connect(
[this](auto themeName) {
@@ -228,7 +228,7 @@ void Theme::initialize(Settings &settings, Paths &paths)
},
false);
this->loadAvailableThemes();
this->loadAvailableThemes(paths);
this->update();
}
@@ -328,11 +328,11 @@ std::vector<std::pair<QString, QVariant>> Theme::availableThemes() const
return packagedThemes;
}
void Theme::loadAvailableThemes()
void Theme::loadAvailableThemes(const Paths &paths)
{
this->availableThemes_ = Theme::builtInThemes;
auto dir = QDir(getPaths()->themesDirectory);
auto dir = QDir(paths.themesDirectory);
for (const auto &info :
dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::Name))
{