Changeset 6980

Timestamp:

Oct 29, 2008, 2:33:20 AM (12 years ago)

Author:

livings124

Message:

hardcode the max group constant; trivial changes

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• NSMenuAdditions.m (modified) (1 diff)
• PeerProgressIndicatorCell.m (modified) (3 diffs)
• TorrentGroup.m (modified) (2 diffs)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -2354 +2354 @@
 - (void) autoSpeedLimitChange: (NSNotification *) notification
 {
-    //clear timer here in case its not being reset
+    //clear timer here in case it's not being reset
     [fSpeedLimitTimer invalidate];
     fSpeedLimitTimer = nil;

trunk/macosx/NSMenuAdditions.m

@@ -29 +29 @@
 - (void) appendItemsFromMenu: (NSMenu *) menu atIndexes: (NSIndexSet *) indexes atBottom: (BOOL) bottom
 {
-    int bottomIndex = bottom ? [self numberOfItems] : 0;
+    NSInteger bottomIndex = bottom ? [self numberOfItems] : 0;
     
     NSMenuItem * item;

trunk/macosx/PeerProgressIndicatorCell.m

@@ -46 +46 @@
     {
         if (!fAttributes)
-            fAttributes = [[NSDictionary alloc] initWithObjectsAndKeys: [NSFont systemFontOfSize: 11.0], NSFontAttributeName, nil];
-        [[NSString localizedStringWithFormat: @"%.1f%%", [self floatValue] * 100.0] drawInRect: cellFrame withAttributes: fAttributes];
+            fAttributes = [[NSDictionary alloc] initWithObjectsAndKeys: [NSFont systemFontOfSize: 11.0f], NSFontAttributeName, nil];
+        [[NSString localizedStringWithFormat: @"%.1f%%", [self floatValue] * 100.0f] drawInRect: cellFrame withAttributes: fAttributes];
     }
     else
@@ -59 +59 @@
         
         [super drawWithFrame: cellFrame inView: controlView];
-        if ([self floatValue] >= 1.0)
+        if ([self floatValue] >= 1.0f)
         {
             NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck.png"];
@@ -65 +65 @@
             
             NSSize imageSize = [checkImage size];
-            NSRect rect = NSMakeRect(cellFrame.origin.x + (cellFrame.size.width - imageSize.width) * 0.5,
-                        cellFrame.origin.y + (cellFrame.size.height - imageSize.height) * 0.5, imageSize.width, imageSize.height);
-            [checkImage drawInRect: rect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
+            NSRect rect = NSMakeRect(cellFrame.origin.x + (cellFrame.size.width - imageSize.width) * 0.5f,
+                        cellFrame.origin.y + (cellFrame.size.height - imageSize.height) * 0.5f, imageSize.width, imageSize.height);
+            [checkImage drawInRect: rect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0f];
         }
     }

trunk/macosx/TorrentGroup.m

@@ -71 +71 @@
 - (CGFloat) uploadRate
 {
-    float rate = 0.0f;
+    CGFloat rate = 0.0f;
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;
@@ -82 +82 @@
 - (CGFloat) downloadRate
 {
-    float rate = 0.0f;
+    CGFloat rate = 0.0f;
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;

trunk/macosx/TorrentTableView.m

@@ -31 +31 @@
 #import "NSApplicationAdditions.h"
 
-#define MAX_GROUP (INT_MAX-10)
+#define MAX_GROUP 999999
 
 #define ACTION_MENU_GLOBAL_TAG 101