Changeset 7625

Timestamp:

Jan 6, 2009, 2:07:55 AM (12 years ago)

Author:

livings124

Message:

warnings--; miscellaneous other cleanup

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• MessageWindowController.m (modified) (1 diff)
• PrefsController.m (modified) (3 diffs)
• Torrent.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -2066 +2066 @@
     
     [fTableView selectValues: selectedValues];
-    #warning still happens anyway?
-    //removed because it made the inspector reset (noticeable when a transfer with web seeds is selected)
-    //[self resetInfo]; //if group is already selected, but the torrents in it change
+    [self resetInfo]; //if group is already selected, but the torrents in it change
     
     [self setBottomCountText: groupRows || filterStatus || filterGroup || filterText];

trunk/macosx/MessageWindowController.m

@@ -234 +234 @@
         fAttributes = [[[[column dataCell] attributedStringValue] attributesAtIndex: 0 effectiveRange: NULL] retain];
     
-    CGFloat count = floorf([[[fMessages objectAtIndex: row] objectForKey: @"Message"] sizeWithAttributes: fAttributes].width
-                            / [column width]);
-    return [tableView rowHeight] * (count + 1.0f);
+    const CGFloat count = floorf([[[fMessages objectAtIndex: row] objectForKey: @"Message"] sizeWithAttributes: fAttributes].width
+                                / [column width]);
+    return [tableView rowHeight] * (count + 1.0);
 }
 

trunk/macosx/PrefsController.m

@@ -435 +435 @@
 - (void) setPeersGlobal: (id) sender
 {
-    int count = [sender intValue];
+    const int count = [sender intValue];
     [fDefaults setInteger: count forKey: @"PeersTotal"];
     tr_sessionSetPeerLimit(fHandle, count);
@@ -442 +442 @@
 - (void) setPeersTorrent: (id) sender
 {
-    int count = [sender intValue];
+    const int count = [sender intValue];
     [fDefaults setInteger: count forKey: @"PeersTorrent"];
 }
@@ -453 +453 @@
 - (void) setEncryptionMode: (id) sender
 {
-    tr_sessionSetEncryption(fHandle, [fDefaults boolForKey: @"EncryptionPrefer"] ? 
-        ([fDefaults boolForKey: @"EncryptionRequire"] ? TR_ENCRYPTION_REQUIRED : TR_ENCRYPTION_PREFERRED) : TR_CLEAR_PREFERRED);
+    const tr_encryption_mode mode = [fDefaults boolForKey: @"EncryptionPrefer"] ? 
+        ([fDefaults boolForKey: @"EncryptionRequire"] ? TR_ENCRYPTION_REQUIRED : TR_ENCRYPTION_PREFERRED) : TR_CLEAR_PREFERRED;
+    tr_sessionSetEncryption(fHandle, mode);
 }
 
 - (void) setBlocklistEnabled: (id) sender
 {
-    BOOL enable = [sender state] == NSOnState;
+    const BOOL enable = [sender state] == NSOnState;
     [fDefaults setBool: enable forKey: @"Blocklist"];
     tr_blocklistSetEnabled(fHandle, enable);

trunk/macosx/Torrent.m

@@ -778 +778 @@
 }
 
+//used by auto group rules
 - (NSString *) trackerList
 {
@@ -1432 +1433 @@
         have += fFileStat[index].bytesCompleted;
     
-    NSAssert([node size], @"director in torrent file has size 0");
+    NSAssert([node size], @"directory in torrent file has size 0");
     return (CGFloat)have / [node size];
 }