diff options
Diffstat (limited to 'src/mumble/LookConfig.cpp')
| -rw-r--r-- | src/mumble/LookConfig.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index c0d51a681..6c97d4b9c 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -9,15 +9,12 @@ #include "AudioInput.h" #include "AudioOutput.h" #include "MainWindow.h" +#include "Global.h" #include <QtCore/QFileSystemWatcher> #include <QtCore/QStack> #include <QtCore/QTimer> -// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name -// (like protobuf 3.7 does). As such, for now, we have to make this our last include. -#include "Global.h" - const QString LookConfig::name = QLatin1String("LookConfig"); static ConfigWidget *LookConfigNew(Settings &st) { @@ -274,7 +271,7 @@ void LookConfig::save() const { } void LookConfig::accept() const { - g.mw->setShowDockTitleBars((g.s.wlWindowLayout == Settings::LayoutCustom) && !g.s.bLockLayout); + Global::get().mw->setShowDockTitleBars((Global::get().s.wlWindowLayout == Settings::LayoutCustom) && !Global::get().s.bLockLayout); } void LookConfig::themeDirectoryChanged() { |