From 6892c11e9f287dcfb1e698f8f46233a01fb7abb6 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sat, 7 Sep 2013 04:00:58 +0200
Subject: Move a good chunk of the singleton objects into a new QApplication
 subclass.

---
 gui/settingsdialog.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gui/settingsdialog.cpp')

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)
-- 
cgit