diff options
Diffstat (limited to 'src/mumble/DeveloperConsole.cpp')
-rw-r--r-- | src/mumble/DeveloperConsole.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mumble/DeveloperConsole.cpp b/src/mumble/DeveloperConsole.cpp index 4a1ee9ed8..de8c04953 100644 --- a/src/mumble/DeveloperConsole.cpp +++ b/src/mumble/DeveloperConsole.cpp @@ -6,15 +6,12 @@ #include "DeveloperConsole.h" #include "LogEmitter.h" +#include "Global.h" #include <QtWidgets/QTextBrowser> -// 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" - DeveloperConsole::DeveloperConsole(QObject *parent) : QObject(parent) { - connect(g.le.data(), SIGNAL(newLogEntry(const QString &)), this, SLOT(addLogMessage(const QString &))); + connect(Global::get().le.data(), SIGNAL(newLogEntry(const QString &)), this, SLOT(addLogMessage(const QString &))); } DeveloperConsole::~DeveloperConsole() { @@ -31,7 +28,7 @@ void DeveloperConsole::show() { mw->setCentralWidget(tb); mw->setWindowTitle(tr("Developer Console")); - connect(g.le.data(), SIGNAL(newLogEntry(const QString &)), tb, SLOT(append(const QString &))); + connect(Global::get().le.data(), SIGNAL(newLogEntry(const QString &)), tb, SLOT(append(const QString &))); foreach (const QString &m, m_logEntries) tb->append(m); |