Merge PR #5005: FORMAT: Run clang-format 10 on all source files

10 files changed, 27 insertions, 18 deletions

diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
index a35a9d0d6..6437e5346 100644
--- a/src/mumble/AudioOutput.cpp
+++ b/src/mumble/AudioOutput.cpp
@@ -504,12 +504,14 @@ bool AudioOutput::mix(void *outbuff, unsigned int frameCount) {
 				user = speech->p;
 				volumeAdjustment *= user->getLocalVolumeAdjustments();
 
-				if (user->cChannel && Global::get().channelListenerManager->isListening(Global::get().uiSession, user->cChannel->iId)
+				if (user->cChannel
+					&& Global::get().channelListenerManager->isListening(Global::get().uiSession, user->cChannel->iId)
 					&& (speech->ucFlags & SpeechFlags::Listen)) {
 					// We are receiving this audio packet only because we are listening to the channel
 					// the speaking user is in. Thus we receive the audio via our "listener proxy".
 					// Thus we'll apply the volume adjustment for our listener proxy as well
-					volumeAdjustment *= Global::get().channelListenerManager->getListenerLocalVolumeAdjustment(user->cChannel->iId);
+					volumeAdjustment *=
+						Global::get().channelListenerManager->getListenerLocalVolumeAdjustment(user->cChannel->iId);
 				}
 
 				if (prioritySpeakerActive) {
diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp
index 2a4dfb584..dfbd8ef4f 100644
--- a/src/mumble/Global.cpp
+++ b/src/mumble/Global.cpp
@@ -124,7 +124,7 @@ Global::Global(const QString &qsConfigPath) {
 	bDebugDumpInput  = false;
 	bDebugPrintQueue = false;
 
-	channelListenerManager = std::make_unique<ChannelListenerManager>();
+	channelListenerManager = std::make_unique< ChannelListenerManager >();
 
 #if defined(Q_OS_WIN)
 	QString appdata;
diff --git a/src/mumble/Global.h b/src/mumble/Global.h
index d5769169f..773ec62de 100644
--- a/src/mumble/Global.h
+++ b/src/mumble/Global.h
@@ -10,10 +10,10 @@
 #include <boost/shared_ptr.hpp>
 
 #include "ACL.h"
+#include "ChannelListenerManager.h"
 #include "Settings.h"
 #include "Timer.h"
 #include "Version.h"
-#include "ChannelListenerManager.h"
 
 #include <memory>
 
@@ -110,7 +110,7 @@ public:
 	QString windowTitlePostfix;
 	bool bDebugDumpInput;
 	bool bDebugPrintQueue;
-	std::unique_ptr<ChannelListenerManager> channelListenerManager;
+	std::unique_ptr< ChannelListenerManager > channelListenerManager;
 
 	bool bHappyEaster;
 	static const char ccHappyEaster[];
diff --git a/src/mumble/ListenerLocalVolumeDialog.cpp b/src/mumble/ListenerLocalVolumeDialog.cpp
index 2401da8b9..41841923d 100644
--- a/src/mumble/ListenerLocalVolumeDialog.cpp
+++ b/src/mumble/ListenerLocalVolumeDialog.cpp
@@ -36,8 +36,8 @@ void ListenerLocalVolumeDialog::on_qsbUserLocalVolume_valueChanged(int value) {
 
 	// Decibel formula: +6db = *2
 	// Calculate the volume-factor for the set db-shift
-	Global::get().channelListenerManager->setListenerLocalVolumeAdjustment(m_channel->iId,
-													  static_cast< float >(pow(2.0, qsUserLocalVolume->value() / 6.0)));
+	Global::get().channelListenerManager->setListenerLocalVolumeAdjustment(
+		m_channel->iId, static_cast< float >(pow(2.0, qsUserLocalVolume->value() / 6.0)));
 }
 
 void ListenerLocalVolumeDialog::on_qbbUserLocalVolume_clicked(QAbstractButton *button) {
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index 3fdf79f80..175e6f6b3 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -331,8 +331,8 @@ void MainWindow::setupGui() {
 	QObject::connect(
 		this, &MainWindow::userRemovedChannelListener, pmModel,
 		static_cast< void (UserModel::*)(const ClientUser *, const Channel *) >(&UserModel::removeChannelListener));
-	QObject::connect(Global::get().channelListenerManager.get(), &ChannelListenerManager::localVolumeAdjustmentsChanged, pmModel,
-					 &UserModel::on_channelListenerLocalVolumeAdjustmentChanged);
+	QObject::connect(Global::get().channelListenerManager.get(), &ChannelListenerManager::localVolumeAdjustmentsChanged,
+					 pmModel, &UserModel::on_channelListenerLocalVolumeAdjustmentChanged);
 
 	// connect slots to PluginManager
 	QObject::connect(pmModel, &UserModel::userAdded, Global::get().pluginManager, &PluginManager::on_userAdded);
@@ -1696,7 +1696,8 @@ void MainWindow::qmListener_aboutToShow() {
 		qmListener->addAction(qaListenerLocalVolume);
 		if (cContextChannel) {
 			qmListener->addAction(qaChannelListen);
-			qaChannelListen->setChecked(Global::get().channelListenerManager->isListening(Global::get().uiSession, cContextChannel->iId));
+			qaChannelListen->setChecked(
+				Global::get().channelListenerManager->isListening(Global::get().uiSession, cContextChannel->iId));
 		}
 	} else {
 		qmListener->addAction(qaEmpty);
diff --git a/src/mumble/TalkingUI.cpp b/src/mumble/TalkingUI.cpp
index ab3da8aaa..90149f0a7 100644
--- a/src/mumble/TalkingUI.cpp
+++ b/src/mumble/TalkingUI.cpp
@@ -772,7 +772,8 @@ void TalkingUI::on_settingsChanged() {
 	removeAllListeners();
 	if (Global::get().s.bTalkingUI_ShowLocalListeners) {
 		if (self) {
-			const QSet< int > channels = Global::get().channelListenerManager->getListenedChannelsForUser(self->uiSession);
+			const QSet< int > channels =
+				Global::get().channelListenerManager->getListenedChannelsForUser(self->uiSession);
 
 			for (int currentChannelID : channels) {
 				const Channel *channel = Channel::get(currentChannelID);
diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp
index a39b61dfe..a6ecde490 100644
--- a/src/mumble/UserModel.cpp
+++ b/src/mumble/UserModel.cpp
@@ -1972,7 +1972,8 @@ QString UserModel::createDisplayString(const ClientUser &user, bool isChannelLis
 	if (isChannelListener) {
 		if (parentChannel && user.uiSession == Global::get().uiSession) {
 			// Only the listener of the local user can have a volume adjustment
-			volumeAdjustment = Global::get().channelListenerManager->getListenerLocalVolumeAdjustment(parentChannel->iId);
+			volumeAdjustment =
+				Global::get().channelListenerManager->getListenerLocalVolumeAdjustment(parentChannel->iId);
 		}
 	} else {
 		volumeAdjustment = user.getLocalVolumeAdjustments();
diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp
index 720d33dd8..88e8e2455 100644
--- a/src/mumble/main.cpp
+++ b/src/mumble/main.cpp
@@ -671,8 +671,8 @@ int main(int argc, char **argv) {
 					 &TalkingUI::on_channelListenerAdded);
 	QObject::connect(Global::get().mw, &MainWindow::userRemovedChannelListener, Global::get().talkingUI,
 					 &TalkingUI::on_channelListenerRemoved);
-	QObject::connect(Global::get().channelListenerManager.get(), &ChannelListenerManager::localVolumeAdjustmentsChanged, Global::get().talkingUI,
-					 &TalkingUI::on_channelListenerLocalVolumeAdjustmentChanged);
+	QObject::connect(Global::get().channelListenerManager.get(), &ChannelListenerManager::localVolumeAdjustmentsChanged,
+					 Global::get().talkingUI, &TalkingUI::on_channelListenerLocalVolumeAdjustmentChanged);
 
 	QObject::connect(Global::get().mw, &MainWindow::serverSynchronized, Global::get().talkingUI,
 					 &TalkingUI::on_serverSynchronized);
diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
index 3fd9ea74b..bc17d8769 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
@@ -707,7 +707,8 @@ void Server::msgUserState(ServerUser *uSource, MumbleProto::UserState &msg) {
 		}
 
 		if (Meta::mp.iMaxListenerProxiesPerUser >= 0
-			&& Meta::mp.iMaxListenerProxiesPerUser - m_channelListenerManager.getListenedChannelCountForUser(uSource->uiSession)
+			&& Meta::mp.iMaxListenerProxiesPerUser
+					   - m_channelListenerManager.getListenedChannelCountForUser(uSource->uiSession)
 					   - passedChannelListener - 1
 				   < 0) {
 			// A limit for the amount of listener proxies per user is set and it has been reached already
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 0222590c0..005a9ed23 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -1201,7 +1201,8 @@ void Server::processMsg(ServerUser *u, const char *data, int len) {
 					// channel (in these cases they have received the audio already).
 					foreach (unsigned int currentSession, m_channelListenerManager.getListenersForChannel(l->iId)) {
 						ServerUser *pDst = static_cast< ServerUser * >(qhUsers.value(currentSession));
-						if (pDst && pDst->cChannel != c && !m_channelListenerManager.isListening(pDst->uiSession, c->iId)) {
+						if (pDst && pDst->cChannel != c
+							&& !m_channelListenerManager.isListening(pDst->uiSession, c->iId)) {
 							listeningUsers << pDst;
 						}
 					}
@@ -1247,7 +1248,8 @@ void Server::processMsg(ServerUser *u, const char *data, int len) {
 							if (ChanACL::hasPermission(u, wc, ChanACL::Whisper, &acCache)) {
 								foreach (User *p, wc->qlUsers) { channel.insert(static_cast< ServerUser * >(p)); }
 
-								foreach (unsigned int currentSession, m_channelListenerManager.getListenersForChannel(wc->iId)) {
+								foreach (unsigned int currentSession,
+										 m_channelListenerManager.getListenersForChannel(wc->iId)) {
 									ServerUser *pDst = static_cast< ServerUser * >(qhUsers.value(currentSession));
 
 									if (pDst) {
@@ -1275,7 +1277,8 @@ void Server::processMsg(ServerUser *u, const char *data, int len) {
 										}
 									}
 
-									foreach (unsigned int currentSession, m_channelListenerManager.getListenersForChannel(tc->iId)) {
+									foreach (unsigned int currentSession,
+											 m_channelListenerManager.getListenersForChannel(tc->iId)) {
 										ServerUser *pDst = static_cast< ServerUser * >(qhUsers.value(currentSession));
 
 										if (pDst && (!group || Group::isMember(tc, tc, qsg, pDst))) {