diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-07 04:00:58 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-07 04:00:58 +0200 |
| commit | 6892c11e9f287dcfb1e698f8f46233a01fb7abb6 (patch) | |
| tree | ee94607e92bcf39faef7f35842499fafbb2e270f /gui/settingsdialog.cpp | |
| parent | 3f30055afe757637ae865b2adc7cf021edd9b8b5 (diff) | |
| download | MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.gz MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.lz MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.xz MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.zip | |
Move a good chunk of the singleton objects into a new QApplication subclass.
Diffstat (limited to 'gui/settingsdialog.cpp')
| -rw-r--r-- | gui/settingsdialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index 52093039..a1fbb8e7 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -16,8 +16,8 @@ #include "settingsdialog.h" #include "ui_settingsdialog.h" -#include "AppSettings.h" - +#include <MultiMC.h> +#include <settingsobject.h> #include <QFileDialog> #include <QMessageBox> @@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : { ui->setupUi(this); - loadSettings(globalSettings); + loadSettings(MMC->settings()); updateCheckboxStuff(); } @@ -85,7 +85,7 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked) void SettingsDialog::on_buttonBox_accepted() { - applySettings(globalSettings); + applySettings(MMC->settings()); } void SettingsDialog::applySettings(SettingsObject *s) |