Merge https://github.com/Forkk/MultiMC5

Conflicts:
	gui/mainwindow.ui

1 files changed, 7 insertions, 0 deletions

diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index 3e9d9e0f..e223237f 100644
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@@ -18,6 +18,8 @@
 
 #include <QDialog>
 
+class SettingsBase;
+
 namespace Ui {
 class SettingsDialog;
 }
@@ -32,6 +34,9 @@ public:
 	
 	void updateCheckboxStuff();
 	
+	void applySettings(SettingsBase* s);
+	void loadSettings(SettingsBase* s);
+	
 private slots:
 	void on_instDirBrowseBtn_clicked();
 	
@@ -43,6 +48,8 @@ private slots:
 	
 	void on_maximizedCheckBox_clicked(bool checked);
 	
+	void on_buttonBox_accepted();
+	
 private:
 	Ui::SettingsDialog *ui;
 };