Fixed a lot of MSVC problems

2013-02-25 14:44:36 -06:00
parent b56b819c35
commit 4ca35a760d
14 changed files with 651 additions and 599 deletions
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 {
 	ui->setupUi(this);
 	
-	loadSettings(settings);
+	loadSettings(globalSettings);
 	updateCheckboxStuff();
 }

@@ -84,7 +84,7 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked)

 void SettingsDialog::on_buttonBox_accepted()
 {
-	applySettings(settings);
+	applySettings(globalSettings);
 }

 void SettingsDialog::applySettings(SettingsObject *s)