diff options
author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-10-20 02:02:02 +0400 |
---|---|---|
committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-10-20 02:02:02 +0400 |
commit | a9a1cf18275567b6f529c36b307a2d604a177cd5 (patch) | |
tree | bde9103aa2291c6fa49706050121076e270883d1 | |
parent | 59678e29e8d935aa31158e8f01410518c0b62150 (diff) |
Indent, changelog and submodule update
-rw-r--r-- | CHANGES | 16 | ||||
-rw-r--r-- | src/PacketDataStream.h | 2 | ||||
-rw-r--r-- | src/mumble/AudioInput.cpp | 2 | ||||
-rw-r--r-- | src/mumble/ConfigDialogDelegate.h | 61 | ||||
-rw-r--r-- | src/murmur/ServerDB.cpp | 2 |
5 files changed, 57 insertions, 26 deletions
@@ -1,8 +1,24 @@ 2009-10-19 + Martin Skilnand <cybknight@users.sourceforge.net> + a2426bf Test icons/muted_local.svg + + Mikkel Krautz <mikkel@krautz.dk> + 3cf23bd Properly save expert state in OSX ConfigDialog. + a484529 CELT dynload paths for OSX. + Benjamin Jemlich <pcgod@users.sourceforge.net> 5917312 Don't allow to disable the temporary checkbox Thorvald Natvig <slicer@users.sourceforge.net> + 59678e2 Delete 1.1.x shortcut from desktop on uninstall + 8a7b17e Allow serverpassword as alias for password in setConf + d97a49f Check if name is already in use before allowing a rename + d71202b Fix more compiler warnings + 12a2644 Fix a few compiler warnings + 9958660 Clean up compiler warnings on Win32 + 943f241 Moc turbo-mode + aed0eda Update Win32 installer with celt dynlibs + a122549 Reset encoder when restarting sending d655742 Default codec to 0x800000a on client 53bb306 Clientside celt codec juggling 73388f3 Force alpha-preference for bitstream 8000000a 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; |