Indent, changelog and submodule update

4 files changed, 41 insertions, 26 deletions

diff --git a/src/PacketDataStream.h b/src/PacketDataStream.h
index 5c74c7a22..db5bcb7fd 100644
--- a/src/PacketDataStream.h
+++ b/src/PacketDataStream.h
@@ -105,7 +105,7 @@ class PacketDataStream {
 				return 0;
 			}
 		};
-		
+
 		quint8 next8() {
 			if (offset < maxsize)
 				return data[offset++];
diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
index e308926ac..4832cbbd9 100644
--- a/src/mumble/AudioInput.cpp
+++ b/src/mumble/AudioInput.cpp
@@ -814,7 +814,7 @@ void AudioInput::encodeAudioFrame() {
 			vbr = iAudioQuality;
 			speex_encoder_ctl(esSpeex, SPEEX_SET_VBR_MAX_BITRATE, &vbr);
 		}
-		
+
 		if (! bPreviousVoice)
 			speex_encoder_ctl(esSpeex, SPEEX_RESET_STATE, NULL);
 
diff --git a/src/mumble/ConfigDialogDelegate.h b/src/mumble/ConfigDialogDelegate.h
index 42223b2f5..054a7032b 100644
--- a/src/mumble/ConfigDialogDelegate.h
+++ b/src/mumble/ConfigDialogDelegate.h
@@ -38,32 +38,47 @@
 @class NSToolbarItem;
 
 @interface ConfigDialogDelegate : NSObject {
-	ConfigDialog *configDialog;
-	QMap<unsigned int, ConfigWidget *> *widgetMap;
+    ConfigDialog *configDialog;
+    QMap<unsigned int, ConfigWidget *> *widgetMap;
 
-	BOOL inExpertMode;
-	NSMutableDictionary *nameWidgetMapping;
-	NSMutableArray *identifiers;
-	NSToolbar *toolbarCache;
+    BOOL inExpertMode;
+    NSMutableDictionary *nameWidgetMapping;
+    NSMutableArray *identifiers;
+    NSToolbar *toolbarCache;
 }
 
-- (id) initWithConfigDialog:(ConfigDialog *)dialog andWidgetMap:(QMap<unsigned int, ConfigWidget *> *) map inExpertMode:(BOOL)flag;
-
-- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar;
-- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar;
-- (NSArray *) toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar;
-
-- (void) toolbarWillAddItem:(NSNotification*)notification;
-- (void) toolbarDidRemoveItem:(NSNotification *)notification;
-
-- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)identifier willBeInsertedIntoToolbar:(BOOL)flag;
-
-- (BOOL) validateToolbarItem:(NSToolbarItem *)toolbarItem;
-
-- (void) selectItem:(ConfigWidget *)cw;
-- (void) itemSelected:(NSToolbarItem *)toolbarItem;
-
-- (void) expertSelected: (NSButton *)button;
+- (id) initWithConfigDialog:
+(ConfigDialog *)dialog andWidgetMap:
+(QMap<unsigned int, ConfigWidget *> *) map inExpertMode:
+(BOOL)flag;
+
+- (NSArray *) toolbarAllowedItemIdentifiers:
+(NSToolbar *)toolbar;
+- (NSArray *) toolbarDefaultItemIdentifiers:
+(NSToolbar *)toolbar;
+- (NSArray *) toolbarSelectableItemIdentifiers:
+(NSToolbar *)toolbar;
+
+- (void) toolbarWillAddItem:
+(NSNotification*)notification;
+- (void) toolbarDidRemoveItem:
+(NSNotification *)notification;
+
+- (NSToolbarItem *) toolbar:
+(NSToolbar *)toolbar itemForItemIdentifier:
+(NSString *)identifier willBeInsertedIntoToolbar:
+(BOOL)flag;
+
+- (BOOL) validateToolbarItem:
+(NSToolbarItem *)toolbarItem;
+
+- (void) selectItem:
+(ConfigWidget *)cw;
+- (void) itemSelected:
+(NSToolbarItem *)toolbarItem;
+
+- (void) expertSelected:
+(NSButton *)button;
 - (BOOL) expertMode;
 
 - (void) dealloc;
diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
index 30e72b82e..5e85d8c57 100644
--- a/src/murmur/ServerDB.cpp
+++ b/src/murmur/ServerDB.cpp
@@ -1542,7 +1542,7 @@ QList<QPair<unsigned int, QString> > ServerDB::getLog(int server_id, unsigned in
 
 void ServerDB::setConf(int server_id, const QString &k, const QVariant &value) {
 	TransactionHolder th;
-	
+
 	const QString &key = (k == "serverpassword") ? "password" : k;
 
 	QSqlQuery &query = *th.qsqQuery;