Indent, changelog and submodule update1.2.0beta2

8 files changed, 24 insertions, 31 deletions

diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
index dd68d97c0..12d64a851 100644
--- a/src/mumble/AudioOutput.cpp
+++ b/src/mumble/AudioOutput.cpp
@@ -464,7 +464,7 @@ void AudioOutputSpeech::addFrameToBuffer(const QByteArray &qbaPacket, unsigned i
 		jbp.len = qbaPacket.size();
 		jbp.span = iFrameSize * frames;
 		jbp.timestamp = iFrameSize * iSeq;
-		
+
 		if (g.s.bUsage && (umtType != MessageHandler::UDPVoiceSpeex) && p && ! p->qsHash.isEmpty() && (p->qlTiming.count() < 3000)) {
 			QMutexLocker qml(& p->qmTiming);
 			ClientUser::JitterRecord jr;
diff --git a/src/mumble/ClientUser.h b/src/mumble/ClientUser.h
index 9fbca320c..ef2c9f95f 100644
--- a/src/mumble/ClientUser.h
+++ b/src/mumble/ClientUser.h
@@ -40,19 +40,19 @@ class ClientUser : public QObject, public User {
 		Q_DISABLE_COPY(ClientUser)
 	public:
 		enum TalkState { TalkingOff, Talking, TalkingWhisperChannel, TalkingWhisper };
-		
+
 		struct JitterRecord {
 			int iSequence;
 			int iFrames;
 			quint64 uiElapsed;
 		};
-		
+
 		TalkState tsState;
 		bool bLocalMute;
 
 		float fPowerMin, fPowerMax;
 		float fAverageAvailable;
-		
+
 		QMutex qmTiming;
 		Timer tTiming;
 		QList<JitterRecord> qlTiming;
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index 017d409e4..ebf7b4a37 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -443,10 +443,10 @@ void MainWindow::openUrl(const QUrl &url) {
 		return;
 	} else
 #endif
-	if ((major != 1) || (minor != 2) || (patch > 0)) {
-		g.l->log(Log::Warning, tr("This version of Mumble can't handle URLs for Mumble version %1.%2.%3").arg(major).arg(minor).arg(patch));
-		return;
-	}
+		if ((major != 1) || (minor != 2) || (patch > 0)) {
+			g.l->log(Log::Warning, tr("This version of Mumble can't handle URLs for Mumble version %1.%2.%3").arg(major).arg(minor).arg(patch));
+			return;
+		}
 
 	QString host = url.host();
 	unsigned short port = static_cast<unsigned short>(url.port(64738));
@@ -519,7 +519,7 @@ void MainWindow::findDesiredChannel() {
 		}
 		qtvUsers->setCurrentIndex(pmModel->index(chan));
 	} else if (g.uiSession) {
-			qtvUsers->setCurrentIndex(pmModel->index(ClientUser::get(g.uiSession)->cChannel));
+		qtvUsers->setCurrentIndex(pmModel->index(ClientUser::get(g.uiSession)->cChannel));
 	}
 	updateMenuPermissions();
 }
@@ -595,7 +595,7 @@ void MainWindow::setupView(bool toggle_minimize) {
 		f |= Qt::WindowStaysOnTopHint;
 
 	setWindowFlags(f);
-	
+
 	qdwLog->setVisible(showit);
 	qdwChat->setVisible(showit && g.s.bShowChatbar);
 	qtvUsers->header()->setVisible(showit);
@@ -1840,8 +1840,7 @@ void MainWindow::serverDisconnected(QAbstractSocket::SocketError err, QString re
 				break;
 			}
 		}
-	}
-	else if (err == QAbstractSocket::SslHandshakeFailedError) {
+	} else if (err == QAbstractSocket::SslHandshakeFailedError) {
 		if (QMessageBox::warning(this, tr("SSL Version mismatch"), tr("This server is using an older encryption standard. It might be an older 1.1 based Mumble server.<br />Would you like to launch the compatibility client to connect to it?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
 
 			QString host, user, pw;
diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp
index 2d80370f0..3f7b2ef66 100644
--- a/src/mumble/Messages.cpp
+++ b/src/mumble/Messages.cpp
@@ -250,11 +250,9 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
 			if (pDst == pSelf) {
 				if (msg.has_mute() && msg.has_deaf() && pDst->bMute && pDst->bDeaf) {
 					g.l->log(Log::YouMuted, tr("You were muted and deafened by %1.").arg(admin));
-				}
-				else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) {
+				} else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) {
 					g.l->log(Log::YouMuted, tr("You were unmuted and undeafened by %1.").arg(admin));
-				}
-				else {
+				} else {
 					if (msg.has_mute()) {
 						if (pDst->bMute)
 							g.l->log(Log::YouMuted, tr("You were muted by %1.").arg(admin));
@@ -279,11 +277,9 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
 			} else if (pSrc == pSelf) {
 				if (msg.has_mute() && msg.has_deaf() && pDst->bMute && pDst->bDeaf) {
 					g.l->log(Log::YouMutedOther, tr("You muted and deafened %1.").arg(vic));
-				}
-				else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) {
+				} else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) {
 					g.l->log(Log::YouMutedOther, tr("You unmuted and undeafened %1.").arg(vic));
-				}
-				else {
+				} else {
 					if (msg.has_mute()) {
 						if (pDst->bMute)
 							g.l->log(Log::YouMutedOther, tr("You muted %1.").arg(vic));
@@ -306,11 +302,9 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
 			} else {
 				if (msg.has_mute() && msg.has_deaf() && pDst->bMute && pDst->bDeaf) {
 					g.l->log(Log::OtherMutedOther, tr("%1 muted and deafened by %2.").arg(vic, admin));
-				}
-				else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) {
+				} else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) {
 					g.l->log(Log::OtherMutedOther, tr("%1 unmuted and undeafened by %2.").arg(vic, admin));
-				}
-				else {
+				} else {
 					if (msg.has_mute()) {
 						if (pDst->bMute)
 							g.l->log(Log::OtherMutedOther, tr("%1 muted by %2.").arg(vic, admin));
diff --git a/src/mumble/Usage.cpp b/src/mumble/Usage.cpp
index 516043f6d..c21f44107 100644
--- a/src/mumble/Usage.cpp
+++ b/src/mumble/Usage.cpp
@@ -42,7 +42,7 @@ Usage::Usage(QObject *p) : QObject(p) {
 	qdsReport.setDevice(&qbReport);
 	qdsReport.setVersion(QDataStream::Qt_4_5);
 	qdsReport << static_cast<unsigned int>(1);
-	
+
 	// Wait 10 minutes (so we know they're actually using this), then...
 	QTimer::singleShot(60 * 10 * 1000, this, SLOT(registerUsage()));
 	QTimer::singleShot(60 * 10 * 1000, this, SLOT(reportJitter()));
@@ -52,7 +52,7 @@ void Usage::addJitter(ClientUser *cu) {
 	QMutexLocker qml(& cu->qmTiming);
 	if (! cu->qlTiming.isEmpty()) {
 		qdsReport << cu->qsHash;
-		
+
 		qdsReport << cu->qlTiming;
 	}
 }
@@ -100,7 +100,7 @@ void Usage::registerUsage() {
 
 void Usage::reportJitter() {
 	QTimer::singleShot(60 * 10 * 1000, this, SLOT(reportJitter()));
-	
+
 	if (qbReport.size() == 0)
 		return;
 
@@ -109,7 +109,7 @@ void Usage::reportJitter() {
 
 	QNetworkReply *rep = g.nam->post(req, qCompress(qbReport.buffer(), 9));
 	connect(rep, SIGNAL(finished()), rep, SLOT(deleteLater()));
-	
+
 	qbReport.close();
 	qbReport.setData(QByteArray());
 
diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp
index 559f0c88b..a5048a68c 100644
--- a/src/mumble/UserModel.cpp
+++ b/src/mumble/UserModel.cpp
@@ -830,7 +830,7 @@ void UserModel::removeUser(ClientUser *p) {
 
 	if (g.uiSession && (c == ClientUser::get(g.uiSession)->cChannel))
 		updateOverlay();
-		
+
 	g.mw->uUsage.addJitter(p);
 
 	delete p;
diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
index 3091c2fe2..460c270f8 100644
--- a/src/murmur/ServerDB.cpp
+++ b/src/murmur/ServerDB.cpp
@@ -1056,7 +1056,7 @@ void Server::addLink(Channel *c, Channel *l) {
 }
 
 void Server::removeLink(Channel *c, Channel *l) {
-    c->unlink(l);
+	c->unlink(l);
 
 	if (c->bTemporary || l->bTemporary)
 		return;
diff --git a/src/tests/TestLink.cpp b/src/tests/TestLink.cpp
index 9b69a750b..e07a56464 100644
--- a/src/tests/TestLink.cpp
+++ b/src/tests/TestLink.cpp
@@ -71,7 +71,7 @@ void updateMumble() {
 	if (! lm)
 		return;
 
-	if(lm->uiVersion != 2) {
+	if (lm->uiVersion != 2) {
 		wcsncpy(lm->name, L"TestLink", 256);
 		wcsncpy(lm->description, L"TestLink is a test of the Link plugin.", 2048);
 		lm->uiVersion = 2;