Perform initial refactoring work

Things that were once singletons are no longer singletons, but are
instead stored in the "Application" singleton

Some singletons still remain, and some renaming/renamespacing is left
This commit is contained in:
Rasmus Karlsson
2018-04-27 22:11:19 +02:00
parent 32b6417a55
commit ae26b835b6
78 changed files with 850 additions and 773 deletions
+4 -4
View File
@@ -1,4 +1,6 @@
#include "widgets/settingsdialog.hpp"
#include "application.hpp"
#include "util/layoutcreator.hpp"
#include "widgets/helper/settingsdialogtab.hpp"
#include "widgets/settingspages/aboutpage.hpp"
@@ -150,7 +152,7 @@ void SettingsDialog::refresh()
{
// this->ui.accountSwitchWidget->refresh();
singletons::SettingManager::getInstance().saveSnapshot();
getApp()->settings->saveSnapshot();
}
void SettingsDialog::scaleChangedEvent(float newDpi)
@@ -209,13 +211,11 @@ void SettingsDialog::okButtonClicked()
void SettingsDialog::cancelButtonClicked()
{
auto &settings = singletons::SettingManager::getInstance();
for (auto &tab : this->tabs) {
tab->getSettingsPage()->cancel();
}
settings.recallSnapshot();
getApp()->settings->recallSnapshot();
this->close();
}