Indent

3 files changed, 43 insertions, 38 deletions

diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp
index 1b3daaa21..37eab7ace 100644
--- a/src/mumble/Log.cpp
+++ b/src/mumble/Log.cpp
@@ -143,8 +143,7 @@ void LogConfig::on_qtwMessages_itemSelectionChanged() {
 		qlePath->setEnabled(false);
 		qpbBrowse->setEnabled(false);
 		qpbPlay->setEnabled(false);
-	}
-	else {
+	} else {
 		QTreeWidgetItem *i = qlSelected[0];
 
 		qcbConsole->setEnabled(true);
@@ -158,8 +157,8 @@ void LogConfig::on_qtwMessages_itemSelectionChanged() {
 
 		qcbConsole->setChecked(i->checkState(ColConsole));
 		qcbNotification->setChecked(i->checkState(ColNotification));
-		if(i->checkState(ColTTS)) qrbTTS->setChecked(true);
-		else if(i->checkState(ColStaticSound)) qrbSoundfile->setChecked(true);
+		if (i->checkState(ColTTS)) qrbTTS->setChecked(true);
+		else if (i->checkState(ColStaticSound)) qrbSoundfile->setChecked(true);
 		else qrbOff->setChecked(true);
 		qlePath->setText(i->text(ColStaticSoundPath));
 	}
@@ -168,26 +167,32 @@ void LogConfig::on_qtwMessages_itemSelectionChanged() {
 void LogConfig::on_qtwMessages_itemChanged(QTreeWidgetItem* i, int column) {
 	if (! i->isSelected()) return;
 	switch (column) {
-		case ColConsole: qcbConsole->setChecked(i->checkState(column)); break;
-		case ColNotification: qcbNotification->setChecked(i->checkState(column)); break;
+		case ColConsole:
+			qcbConsole->setChecked(i->checkState(column));
+			break;
+		case ColNotification:
+			qcbNotification->setChecked(i->checkState(column));
+			break;
 		case ColTTS:
-			if(i->checkState(ColTTS)) {
+			if (i->checkState(ColTTS)) {
 				i->setCheckState(ColStaticSound, Qt::Unchecked);
 				qrbTTS->setChecked(true);
-			}
-			else if (i->checkState(ColStaticSound) == Qt::Unchecked)
+			} else if (i->checkState(ColStaticSound) == Qt::Unchecked)
 				qrbOff->setChecked(true);
 			break;
 		case ColStaticSound:
-			if(i->checkState(ColStaticSound)) {
+			if (i->checkState(ColStaticSound)) {
 				i->setCheckState(ColTTS, Qt::Unchecked);
 				qrbSoundfile->setChecked(true);
 				if (i->text(ColStaticSoundPath).isEmpty()) qpbBrowse->click();
-			}else if (i->checkState(ColTTS) == Qt::Unchecked)
+			} else if (i->checkState(ColTTS) == Qt::Unchecked)
 				qrbOff->setChecked(true);
 			break;
-		case ColStaticSoundPath: qlePath->setText(i->text(ColStaticSoundPath)); break;
-		default:break;
+		case ColStaticSoundPath:
+			qlePath->setText(i->text(ColStaticSoundPath));
+			break;
+		default:
+			break;
 	}
 }
 
@@ -256,19 +261,19 @@ Log::Log(QObject *p) : QObject(p) {
 	}
 	QString qsGrowlEvents = QString("{%1}").arg(qslAllEvents.join(","));
 	QString qsScript = QString(
-		"tell application \"System Events\"\n"
-		"	set isRunning to count of (every process whose name is \"GrowlHelperApp\") > 0\n"
-		"end tell\n"
-		"if isRunning then\n"
-		"	tell application \"GrowlHelperApp\"\n"
-		"		set the allNotificationsList to %1\n"
-		"		set the enabledNotificationsList to %1\n"
-		"		register as application \"Mumble\""
-		"			all notifications allNotificationsList"
-		"			default notifications enabledNotificationsList"
-		"			icon of application \"Mumble\"\n"
-		"	end tell\n"
-		"end if\n").arg(qsGrowlEvents);
+	                       "tell application \"System Events\"\n"
+	                       "	set isRunning to count of (every process whose name is \"GrowlHelperApp\") > 0\n"
+	                       "end tell\n"
+	                       "if isRunning then\n"
+	                       "	tell application \"GrowlHelperApp\"\n"
+	                       "		set the allNotificationsList to %1\n"
+	                       "		set the enabledNotificationsList to %1\n"
+	                       "		register as application \"Mumble\""
+	                       "			all notifications allNotificationsList"
+	                       "			default notifications enabledNotificationsList"
+	                       "			icon of application \"Mumble\"\n"
+	                       "	end tell\n"
+	                       "end if\n").arg(qsGrowlEvents);
 	qt_mac_execute_apple_script(qsScript, NULL);
 #endif
 }
@@ -412,16 +417,16 @@ void Log::log(MsgType mt, const QString &console, const QString &terse) {
 			}
 		}
 #ifdef Q_OS_MAC
-	QString qsScript = QString(
-		"tell application \"System Events\"\n"
-		"	set isRunning to count of (every process whose name is \"GrowlHelperApp\") > 0\n"
-		"end tell\n"
-		"if isRunning then\n"
-		"	tell application \"GrowlHelperApp\"\n"
-		"		notify with name \"%1\" title \"%1\" description \"%2\" application name \"Mumble\"\n"
-		"	end tell\n"
-		"end if\n").arg(msgName(mt)).arg(console);
-	qt_mac_execute_apple_script(qsScript, NULL);
+		QString qsScript = QString(
+		                       "tell application \"System Events\"\n"
+		                       "	set isRunning to count of (every process whose name is \"GrowlHelperApp\") > 0\n"
+		                       "end tell\n"
+		                       "if isRunning then\n"
+		                       "	tell application \"GrowlHelperApp\"\n"
+		                       "		notify with name \"%1\" title \"%1\" description \"%2\" application name \"Mumble\"\n"
+		                       "	end tell\n"
+		                       "end if\n").arg(msgName(mt)).arg(console);
+		qt_mac_execute_apple_script(qsScript, NULL);
 #endif
 	}
 
diff --git a/src/mumble/Log.h b/src/mumble/Log.h
index 082acf77b..cf8fe0b1a 100644
--- a/src/mumble/Log.h
+++ b/src/mumble/Log.h
@@ -43,7 +43,7 @@ class LogConfig : public ConfigWidget, public Ui::LogConfig {
 		Q_OBJECT
 		Q_DISABLE_COPY(LogConfig)
 	public:
-		enum Column{ ColMessage, ColConsole, ColNotification, ColTTS, ColStaticSound, ColStaticSoundPath };
+		enum Column { ColMessage, ColConsole, ColNotification, ColTTS, ColStaticSound, ColStaticSoundPath };
 		LogConfig(Settings &st);
 		virtual QString title() const;
 		virtual QIcon icon() const;
diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp
index fc337d1a8..f76d83e0d 100644
--- a/src/murmur/UnixMurmur.cpp
+++ b/src/murmur/UnixMurmur.cpp
@@ -221,7 +221,7 @@ void UnixMurmur::setuid() {
 		uid_t uid = getuid(), euid = geteuid();
 		gid_t gid = getgid(), egid = getegid();
 		if (uid == Meta::mp.uiUid && euid == Meta::mp.uiUid
-		     && gid == Meta::mp.uiGid && egid == Meta::mp.uiGid) {
+		        && gid == Meta::mp.uiGid && egid == Meta::mp.uiGid) {
 			qCritical("Successfully switched to uid %d", Meta::mp.uiUid);
 		} else
 			qFatal("Couldn't switch uid/gid.");