diff options
Diffstat (limited to 'src/mumble/OverlayUser.cpp')
| -rw-r--r-- | src/mumble/OverlayUser.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mumble/OverlayUser.cpp b/src/mumble/OverlayUser.cpp index 01660405f..59f210f14 100644 --- a/src/mumble/OverlayUser.cpp +++ b/src/mumble/OverlayUser.cpp @@ -16,13 +16,10 @@ #include "User.h" #include "Utils.h" #include "GlobalShortcut.h" +#include "Global.h" #include <QtGui/QImageReader> -// 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" - OverlayUser::OverlayUser(ClientUser *cu, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), os(osptr), uiSize(height), cuUser(cu), tsColor(Settings::Passive) { setup(); @@ -194,7 +191,7 @@ void OverlayUser::updateUser() { QImage img; if (!qbaAvatar.isNull() && cuUser->qbaTexture.isEmpty()) { - g.o->requestTexture(cuUser); + Global::get().o->requestTexture(cuUser); } else if (qbaAvatar.isNull()) { QImageReader qir(QLatin1String("skin:default_avatar.svg")); QSize sz = qir.size(); @@ -220,7 +217,7 @@ void OverlayUser::updateUser() { qgpiAvatar->setVisible(os->bAvatar); if (cuUser) { - ClientUser *self = ClientUser::get(g.uiSession); + ClientUser *self = ClientUser::get(Global::get().uiSession); if (os->bMutedDeafened) { if (cuUser->bDeaf || cuUser->bSelfDeaf) { |