From 725569f6c2f6c4360783701ed5d4036a968d7d89 Mon Sep 17 00:00:00 2001
From: Robert Adam <dev@robert-adam.de>
Date: Thu, 4 Mar 2021 11:32:06 +0100
Subject: REFAC(client): Avoid name clash for "registrar"

When performing a unity build the usage of the variable name "registrar"
in a bunch of places for a static variable, can cause name clashes. Thus
the different variables where renamed.
---
 src/mumble/AudioConfigDialog.cpp   | 4 ++--
 src/mumble/G15LCDEngine_helper.cpp | 2 +-
 src/mumble/G15LCDEngine_lglcd.cpp  | 2 +-
 src/mumble/G15LCDEngine_unix.cpp   | 2 +-
 src/mumble/GlobalShortcut.cpp      | 2 +-
 src/mumble/Log.cpp                 | 2 +-
 src/mumble/NetworkConfig.cpp       | 2 +-
 src/mumble/OverlayConfig.cpp       | 2 +-
 src/mumble/Plugins.cpp             | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mumble/AudioConfigDialog.cpp b/src/mumble/AudioConfigDialog.cpp
index 8891842a6..b2e74787a 100644
--- a/src/mumble/AudioConfigDialog.cpp
+++ b/src/mumble/AudioConfigDialog.cpp
@@ -55,8 +55,8 @@ static ConfigWidget *AudioOutputDialogNew(Settings &st) {
 	return new AudioOutputDialog(st);
 }
 
-static ConfigRegistrar iregistrar(1000, AudioInputDialogNew);
-static ConfigRegistrar oregistrar(1010, AudioOutputDialogNew);
+static ConfigRegistrar registrarAudioInputDialog(1000, AudioInputDialogNew);
+static ConfigRegistrar registrarAudioOutputDialog(1010, AudioOutputDialogNew);
 
 void AudioInputDialog::hideEvent(QHideEvent *) {
 	qtTick->stop();
diff --git a/src/mumble/G15LCDEngine_helper.cpp b/src/mumble/G15LCDEngine_helper.cpp
index b2cb862c4..9e0595d83 100644
--- a/src/mumble/G15LCDEngine_helper.cpp
+++ b/src/mumble/G15LCDEngine_helper.cpp
@@ -11,7 +11,7 @@ static LCDEngine *G15LCDEngineNew() {
 	return new G15LCDEngineHelper();
 }
 
-static LCDEngineRegistrar registrar(G15LCDEngineNew);
+static LCDEngineRegistrar registrarLCDEngine(G15LCDEngineNew);
 
 G15LCDEngineHelper::G15LCDEngineHelper() : LCDEngine() {
 	bRunning     = false;
diff --git a/src/mumble/G15LCDEngine_lglcd.cpp b/src/mumble/G15LCDEngine_lglcd.cpp
index 640564afa..7f2c8e80c 100644
--- a/src/mumble/G15LCDEngine_lglcd.cpp
+++ b/src/mumble/G15LCDEngine_lglcd.cpp
@@ -21,7 +21,7 @@ static LCDEngine *G15LCDEngineNew() {
 	return new G15LCDEngineLGLCD();
 }
 
-static LCDEngineRegistrar registrar(G15LCDEngineNew);
+static LCDEngineRegistrar registrarG15LCD_lglcd(G15LCDEngineNew);
 
 G15LCDEngineLGLCD::G15LCDEngineLGLCD() : LCDEngine() {
 	DWORD dwErr;
diff --git a/src/mumble/G15LCDEngine_unix.cpp b/src/mumble/G15LCDEngine_unix.cpp
index 5520eeb71..eb87b3d30 100644
--- a/src/mumble/G15LCDEngine_unix.cpp
+++ b/src/mumble/G15LCDEngine_unix.cpp
@@ -9,7 +9,7 @@ static LCDEngine *G15LCDEngineNew() {
 	return new G15LCDEngineUnix();
 }
 
-static LCDEngineRegistrar registrar(G15LCDEngineNew);
+static LCDEngineRegistrar registrarLCDEngine_unix(G15LCDEngineNew);
 
 G15LCDEngineUnix::G15LCDEngineUnix() {
 	sock = new_g15_screen(G15_PIXELBUF);
diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp
index 67dc1bf74..720a61a01 100644
--- a/src/mumble/GlobalShortcut.cpp
+++ b/src/mumble/GlobalShortcut.cpp
@@ -35,7 +35,7 @@ static ConfigWidget *GlobalShortcutConfigDialogNew(Settings &st) {
 	return new GlobalShortcutConfig(st);
 }
 
-static ConfigRegistrar registrar(1200, GlobalShortcutConfigDialogNew);
+static ConfigRegistrar registrarGlobalShortcut(1200, GlobalShortcutConfigDialogNew);
 
 static const QString UPARROW = QString::fromUtf8("\xE2\x86\x91 ");
 
diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp
index 5ddf4a23d..20cddf99c 100644
--- a/src/mumble/Log.cpp
+++ b/src/mumble/Log.cpp
@@ -34,7 +34,7 @@ static ConfigWidget *LogConfigDialogNew(Settings &st) {
 	return new LogConfig(st);
 }
 
-static ConfigRegistrar registrar(4000, LogConfigDialogNew);
+static ConfigRegistrar registrarLog(4000, LogConfigDialogNew);
 
 LogConfig::LogConfig(Settings &st) : ConfigWidget(st) {
 	setupUi(this);
diff --git a/src/mumble/NetworkConfig.cpp b/src/mumble/NetworkConfig.cpp
index 59b8fbf9a..82cd5c9f4 100644
--- a/src/mumble/NetworkConfig.cpp
+++ b/src/mumble/NetworkConfig.cpp
@@ -24,7 +24,7 @@ static ConfigWidget *NetworkConfigNew(Settings &st) {
 	return new NetworkConfig(st);
 }
 
-static ConfigRegistrar registrar(1300, NetworkConfigNew);
+static ConfigRegistrar registrarNetworkConfig(1300, NetworkConfigNew);
 
 NetworkConfig::NetworkConfig(Settings &st) : ConfigWidget(st) {
 	setupUi(this);
diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp
index 13f9b1dab..b3e7c59cc 100644
--- a/src/mumble/OverlayConfig.cpp
+++ b/src/mumble/OverlayConfig.cpp
@@ -45,7 +45,7 @@ static ConfigWidget *OverlayConfigDialogNew(Settings &st) {
 	return new OverlayConfig(st);
 }
 
-static ConfigRegistrar registrar(6000, OverlayConfigDialogNew);
+static ConfigRegistrar registrarOverlayConfig(6000, OverlayConfigDialogNew);
 #endif
 
 void OverlayConfig::initDisplayFps() {
diff --git a/src/mumble/Plugins.cpp b/src/mumble/Plugins.cpp
index 43e848734..26d078b7c 100644
--- a/src/mumble/Plugins.cpp
+++ b/src/mumble/Plugins.cpp
@@ -39,7 +39,7 @@ static ConfigWidget *PluginConfigDialogNew(Settings &st) {
 	return new PluginConfig(st);
 }
 
-static ConfigRegistrar registrar(5000, PluginConfigDialogNew);
+static ConfigRegistrar registrarPlugins(5000, PluginConfigDialogNew);
 
 struct PluginInfo {
 	bool locked;
-- 
cgit v1.2.3