diff options
Diffstat (limited to 'src/mumble/Cert.cpp')
| -rw-r--r-- | src/mumble/Cert.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp index 76c96b0b9..929c2fc22 100644 --- a/src/mumble/Cert.cpp +++ b/src/mumble/Cert.cpp @@ -15,6 +15,7 @@ #include "SelfSignedCertificate.h" #include "Utils.h" +#include "Global.h" #include <QtCore/QUrl> #include <QtGui/QDesktopServices> @@ -25,10 +26,6 @@ #include <openssl/pkcs12.h> #include <openssl/x509.h> -// 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" - #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data() CertView::CertView(QWidget *p) : QGroupBox(p) { @@ -179,7 +176,7 @@ int CertWizard::nextId() const { void CertWizard::initializePage(int id) { if (id == 0) { - kpCurrent = kpNew = g.s.kpCertificate; + kpCurrent = kpNew = Global::get().s.kpCertificate; if (validateCert(kpCurrent)) { qrbQuick->setEnabled(false); @@ -278,7 +275,7 @@ bool CertWizard::validateCurrentPage() { kpNew = imp; } if (currentPage() == qwpFinish) { - g.s.kpCertificate = kpNew; + Global::get().s.kpCertificate = kpNew; } return QWizard::validateCurrentPage(); } |