1 files changed, 12 insertions, 12 deletions

diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp
index 5e7fa5ade..c4c342aef 100644
--- a/src/mumble/ConfigDialog.cpp
+++ b/src/mumble/ConfigDialog.cpp
@@ -32,7 +32,7 @@ ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) {
 	}
 
 
-	s = g.s;
+	s = Global::get().s;
 
 	unsigned int idx = 0;
 	ConfigWidgetNew cwn;
@@ -79,11 +79,11 @@ ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) {
 	restoreAllButton->setToolTip(tr("Restore all defaults"));
 	restoreAllButton->setWhatsThis(tr("This button will restore the defaults for all settings."));
 
-	if (!g.s.qbaConfigGeometry.isEmpty()) {
+	if (!Global::get().s.qbaConfigGeometry.isEmpty()) {
 #ifdef USE_OVERLAY
-		if (!g.ocIntercept)
+		if (!Global::get().ocIntercept)
 #endif
-			restoreGeometry(g.s.qbaConfigGeometry);
+			restoreGeometry(Global::get().s.qbaConfigGeometry);
 	}
 }
 
@@ -117,7 +117,7 @@ void ConfigDialog::addPage(ConfigWidget *cw, unsigned int idx) {
 		qswPages->addWidget(cw);
 	}
 	qmWidgets.insert(idx, cw);
-	cw->load(g.s);
+	cw->load(Global::get().s);
 }
 
 ConfigDialog::~ConfigDialog() {
@@ -152,7 +152,7 @@ void ConfigDialog::on_pageButtonBox_clicked(QAbstractButton *b) {
 			break;
 		}
 		case QDialogButtonBox::Reset: {
-			conf->load(g.s);
+			conf->load(Global::get().s);
 			break;
 		}
 		// standardButton returns NoButton for any custom buttons. The only custom button
@@ -246,16 +246,16 @@ void ConfigDialog::apply() {
 	foreach (ConfigWidget *cw, qmWidgets)
 		cw->save();
 
-	g.s = s;
+	Global::get().s = s;
 
 	foreach (ConfigWidget *cw, qmWidgets)
 		cw->accept();
 
-	if (!g.s.bAttenuateOthersOnTalk)
-		g.bAttenuateOthers = false;
+	if (!Global::get().s.bAttenuateOthersOnTalk)
+		Global::get().bAttenuateOthers = false;
 
 	// They might have changed their keys.
-	g.iPushToTalk = 0;
+	Global::get().iPushToTalk = 0;
 
 	Audio::start();
 
@@ -266,9 +266,9 @@ void ConfigDialog::accept() {
 	apply();
 
 #ifdef USE_OVERLAY
-	if (!g.ocIntercept)
+	if (!Global::get().ocIntercept)
 #endif
-		g.s.qbaConfigGeometry = saveGeometry();
+		Global::get().s.qbaConfigGeometry = saveGeometry();
 
 	QDialog::accept();
 }