this commit is too big

This commit is contained in:
fourtf
2018-08-02 14:23:27 +02:00
parent 3b3c5d8d75
commit c2e2dfb577
186 changed files with 3626 additions and 2656 deletions
+9 -16
View File
@@ -10,32 +10,25 @@ namespace chatterino {
std::vector<std::weak_ptr<pajlada::Settings::ISettingData>> _settings;
Settings *Settings::instance = nullptr;
void _actuallyRegisterSetting(std::weak_ptr<pajlada::Settings::ISettingData> setting)
{
_settings.push_back(setting);
}
Settings::Settings()
Settings::Settings(Paths &paths)
{
qDebug() << "init SettingManager";
instance = this;
QString settingsPath = paths.settingsDirectory + "/settings.json";
pajlada::Settings::SettingManager::gLoad(qPrintable(settingsPath));
}
Settings &Settings::getInstance()
{
static Settings instance;
return instance;
}
void Settings::initialize()
{
}
void Settings::load()
{
QString settingsPath = getPaths()->settingsDirectory + "/settings.json";
pajlada::Settings::SettingManager::gLoad(qPrintable(settingsPath));
return *instance;
}
void Settings::saveSnapshot()