Changeset 7017

Timestamp:

Nov 2, 2008, 1:52:45 PM (12 years ago)

Author:

livings124

Message:

more type conversions

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/Controller.h (modified) (4 diffs)
• macosx/Controller.m (modified) (55 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -2212 +2212 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
+                                ARCHS = "$(NATIVE_ARCH)";
                                 COPY_PHASE_STRIP = NO;
                                 DEBUG_INFORMATION_FORMAT = dwarf;
@@ -2220 +2221 @@
                                 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                 GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
+                                GCC_MODEL_PPC64 = NO;
                                 GCC_OPTIMIZATION_LEVEL = 0;
                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2351 +2353 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = (
-                                        ppc,
-                                        i386,
-                                );
+                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 DEBUG_INFORMATION_FORMAT = dwarf;
                                 DEPLOYMENT_POSTPROCESSING = YES;
@@ -2388 +2387 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ARCHS = (
-                                        ppc,
-                                        i386,
-                                );
+                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                 COPY_PHASE_STRIP = NO;
                                 DEBUG_INFORMATION_FORMAT = dwarf;

trunk/macosx/Controller.h

@@ -131 +131 @@
 - (void) openURLShowSheet:      (id) sender;
 
-- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo;
+- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo;
 
 - (void) createFile: (id) sender;
@@ -149 +149 @@
 - (void) removeTorrents: (NSArray *) torrents
         deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteData;
-- (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
+- (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode
                         contextInfo: (NSDictionary *) dict;
 - (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent;
@@ -159 +159 @@
 - (void) moveDataFilesSelected: (id) sender;
 - (void) moveDataFiles: (NSArray *) torrents;
-- (void) moveDataFileChoiceClosed: (NSOpenPanel *) panel returnCode: (int) code contextInfo: (NSArray *) torrents;
+- (void) moveDataFileChoiceClosed: (NSOpenPanel *) panel returnCode: (NSInteger) code contextInfo: (NSArray *) torrents;
 
 - (void) copyTorrentFiles: (id) sender;
@@ -188 +188 @@
 
 - (void) updateTorrentsInQueue;
-- (int) numToStartFromQueue: (BOOL) downloadQueue;
+- (NSInteger) numToStartFromQueue: (BOOL) downloadQueue;
 
 - (void) torrentFinishedDownloading: (NSNotification *) notification;

trunk/macosx/Controller.m

@@ -534 +534 @@
     if (!fUpdateInProgress && [fDefaults boolForKey: @"CheckQuit"])
     {
-        int active = 0, downloading = 0;
+        NSInteger active = 0, downloading = 0;
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
@@ -564 +564 @@
 }
 
-- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo
+- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
 {
     [NSApp replyToApplicationShouldTerminate: returnCode == NSAlertDefaultReturn];
@@ -891 +891 @@
 }
 
-- (void) incompleteChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (NSDictionary *) dictionary
+- (void) incompleteChoiceClosed: (NSOpenPanel *) openPanel returnCode: (NSInteger) code contextInfo: (NSDictionary *) dictionary
 {
     if (code == NSOKButton)
@@ -901 +901 @@
 }
 
-- (void) downloadChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (NSDictionary *) dictionary
+- (void) downloadChoiceClosed: (NSOpenPanel *) openPanel returnCode: (NSInteger) code contextInfo: (NSDictionary *) dictionary
 {
     if (code == NSOKButton)
@@ -940 +940 @@
 }
 
-- (void) openSheetClosed: (NSOpenPanel *) panel returnCode: (int) code contextInfo: (NSNumber *) useOptions
+- (void) openSheetClosed: (NSOpenPanel *) panel returnCode: (NSInteger) code contextInfo: (NSNumber *) useOptions
 {
     if (code == NSOKButton)
@@ -1044 +1044 @@
 }
 
-- (void) urlSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo
+- (void) urlSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
 {
     [fURLSheetTextField selectText: self];
@@ -1055 +1055 @@
         if ([urlString rangeOfString: @"."].location == NSNotFound)
         {
-            int beforeCom;
+            NSInteger beforeCom;
             if ((beforeCom = [urlString rangeOfString: @"/"].location) != NSNotFound)
                 urlString = [NSString stringWithFormat: @"http://www.%@.com/%@",
@@ -1155 +1155 @@
 {
     [torrents retain];
-    int active = 0, downloading = 0;
+    NSInteger active = 0, downloading = 0;
 
     if ([fDefaults boolForKey: @"CheckRemove"])
@@ -1178 +1178 @@
             NSString * title, * message;
             
-            int selected = [torrents count];
+            NSInteger selected = [torrents count];
             if (selected == 1)
             {
@@ -1244 +1244 @@
 }
 
-- (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (NSDictionary *) dict
+- (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (NSDictionary *) dict
 {
     NSArray * torrents = [dict objectForKey: @"Torrents"];
@@ -1267 +1267 @@
     
     //for tiger - when 10.5-only repace with NSIntegerMax
-    int lowestOrderValue = INT_MAX;
+    NSInteger lowestOrderValue = INT_MAX;
     enumerator = [torrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
@@ -1289 +1289 @@
     if (lowestOrderValue < [fTorrents count])
     {
-        for (int i = lowestOrderValue; i < [fTorrents count]; i++)
+        for (NSInteger i = lowestOrderValue; i < [fTorrents count]; i++)
             [[fTorrents objectAtIndex: i] setOrderValue: i];
     }
@@ -1333 +1333 @@
     
     torrents = [torrents retain];
-    int count = [torrents count];
+    NSInteger count = [torrents count];
     if (count == 1)
         [panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the new folder for \"%@\".",
@@ -1345 +1345 @@
 }
 
-- (void) moveDataFileChoiceClosed: (NSOpenPanel *) panel returnCode: (int) code contextInfo: (NSArray *) torrents
+- (void) moveDataFileChoiceClosed: (NSOpenPanel *) panel returnCode: (NSInteger) code contextInfo: (NSArray *) torrents
 {
     if (code == NSOKButton)
@@ -1402 +1402 @@
 }
 
-- (void) saveTorrentCopySheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (NSMutableArray *) torrents
+- (void) saveTorrentCopySheetClosed: (NSSavePanel *) panel returnCode: (NSInteger) code contextInfo: (NSMutableArray *) torrents
 {
     //copy torrent to new location with name of data file
@@ -1571 +1571 @@
     statusFrame.size.width -= 25.0;
     
-    float difference = NSMaxX(statusFrame) + 5.0 - [fTotalDLImageView frame].origin.x;
+    CGFloat difference = NSMaxX(statusFrame) + 5.0 - [fTotalDLImageView frame].origin.x;
     if (difference > 0)
         statusFrame.size.width -= difference;
@@ -1581 +1581 @@
 {
     NSString * totalTorrentsString;
-    int totalCount = [fTorrents count];
+    NSInteger totalCount = [fTorrents count];
     if (totalCount != 1)
         totalTorrentsString = [NSString stringWithFormat: NSLocalizedString(@"%d transfers", "Status bar transfer count"), totalCount];
@@ -1589 +1589 @@
     if (filtering)
     {
-        int count = [fTableView numberOfRows]; //have to factor in collapsed rows
+        NSInteger count = [fTableView numberOfRows]; //have to factor in collapsed rows
         if (count > 0 && ![[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [Torrent class]])
             count -= [fDisplayedTorrents count];
@@ -1605 +1605 @@
         seed = [fDefaults boolForKey: @"QueueSeed"];
     
-    int desiredDownloadActive = [self numToStartFromQueue: YES],
+    NSInteger desiredDownloadActive = [self numToStartFromQueue: YES],
         desiredSeedActive = [self numToStartFromQueue: NO];
     
@@ -1642 +1642 @@
 }
 
-- (int) numToStartFromQueue: (BOOL) downloadQueue
+- (NSInteger) numToStartFromQueue: (BOOL) downloadQueue
 {
     if (![fDefaults boolForKey: downloadQueue ? @"Queue" : @"QueueSeed"])
         return 0;
     
-    int desired = [fDefaults integerForKey: downloadQueue ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
+    NSInteger desired = [fDefaults integerForKey: downloadQueue ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
         
     Torrent * torrent;
@@ -1940 +1940 @@
     NSArray * selectedValues = [fTableView selectedValues];
     
-    int active = 0, downloading = 0, seeding = 0, paused = 0;
+    NSInteger active = 0, downloading = 0, seeding = 0, paused = 0;
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
     BOOL filterActive = NO, filterDownload = NO, filterSeed = NO, filterPause = NO, filterStatus = YES;
@@ -1954 +1954 @@
         filterStatus = NO;
     
-    int groupFilterValue = [fDefaults integerForKey: @"FilterGroup"];
+    NSInteger groupFilterValue = [fDefaults integerForKey: @"FilterGroup"];
     BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG;
     
@@ -1966 +1966 @@
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;
-    int index = -1;
+    NSInteger index = -1;
     while ((torrent = [enumerator nextObject]))
     {
@@ -2062 +2062 @@
         
         NSMutableArray * groupTorrents;
-        for (int i = 0, oldGroupValue = -2; i < [allTorrents count]; i++)
+        for (NSInteger i = 0, oldGroupValue = -2; i < [allTorrents count]; i++)
         {
             torrent = [allTorrents objectAtIndex: i];
-            int groupValue = [torrent groupValue];
+            NSInteger groupValue = [torrent groupValue];
             if (groupValue != oldGroupValue)
             {
@@ -2156 +2156 @@
     NSString * oldFilterType = [fDefaults stringForKey: @"FilterSearchType"];
     
-    int prevTag, currentTag = [sender tag];
+    NSInteger prevTag, currentTag = [sender tag];
     if ([oldFilterType isEqualToString: FILTER_TYPE_TRACKER])
         prevTag = FILTER_TYPE_TAG_TRACKER;
@@ -2233 +2233 @@
     if (menu == fGroupsSetMenu || menu == fGroupsSetContextMenu)
     {
-        for (int i = [menu numberOfItems]-1 - 2; i >= 0; i--)
+        for (NSInteger i = [menu numberOfItems]-1 - 2; i >= 0; i--)
             [menu removeItemAtIndex: i];
         
@@ -2242 +2242 @@
     else if (menu == fGroupFilterMenu)
     {
-        for (int i = [menu numberOfItems]-1; i >= 3; i--)
+        for (NSInteger i = [menu numberOfItems]-1; i >= 3; i--)
             [menu removeItemAtIndex: i];
         
@@ -2255 +2255 @@
             return;
         
-        const int speedLimitActionValue[] = { 5, 10, 20, 30, 40, 50, 75, 100, 150, 200, 250, 500, 750, -1 };
+        const NSInteger speedLimitActionValue[] = { 5, 10, 20, 30, 40, 50, 75, 100, 150, 200, 250, 500, 750, -1 };
         
         NSMenuItem * item;
-        for (int i = 0; speedLimitActionValue[i] != -1; i++)
+        for (NSInteger i = 0; speedLimitActionValue[i] != -1; i++)
         {
             item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: NSLocalizedString(@"%d KB/s",
@@ -2277 +2277 @@
         
         NSMenuItem * item;
-        for (int i = 0; ratioLimitActionValue[i] != -1; i++)
+        for (NSInteger i = 0; ratioLimitActionValue[i] != -1; i++)
         {
             item = [[NSMenuItem alloc] initWithTitle: [NSString localizedStringWithFormat: @"%.2f", ratioLimitActionValue[i]]
@@ -2315 +2315 @@
 - (void) updateGroupsFilterButton
 {
-    int groupIndex = [fDefaults integerForKey: @"FilterGroup"];
+    NSInteger groupIndex = [fDefaults integerForKey: @"FilterGroup"];
     
     NSImage * icon;
@@ -2373 +2373 @@
     
     //check if should be on if within range
-    int onTime = [onComponents hour] * 60 + [onComponents minute],
+    NSInteger onTime = [onComponents hour] * 60 + [onComponents minute],
         offTime = [offComponents hour] * 60 + [offComponents minute],
         nowTime = [nowComponents hour] * 60 + [nowComponents minute];
@@ -2424 +2424 @@
     
     //check if should be the next day
-    int nowTime = [nowComponents hour] * 60 + [nowComponents minute],
+    NSInteger nowTime = [nowComponents hour] * 60 + [nowComponents minute],
         timerTime = [timerComponents hour] * 60 + [timerComponents minute];
     if (timerTime < nowTime)
@@ -2545 +2545 @@
     
     NSString * file;
-    for (int i = [newNames count] - 1; i >= 0; i--)
+    for (NSInteger i = [newNames count] - 1; i >= 0; i--)
     {
         file = [newNames objectAtIndex: i];
@@ -2624 +2624 @@
         if ([ident isEqualToString: @"Group"])
         {
-            int group = [item groupIndex];
+            NSInteger group = [item groupIndex];
             return group != -1 ? [[GroupsController groups] nameForIndex: group]
                                 : NSLocalizedString(@"No Group", "Group table row");
@@ -2630 +2630 @@
         else if ([ident isEqualToString: @"Color"])
         {
-            int group = [item groupIndex];
+            NSInteger group = [item groupIndex];
             return [[GroupsController groups] imageForIndex: group];
         }
@@ -2646 +2646 @@
             else
             {
-                float rate = [ident isEqualToString: @"UL"] ? [group uploadRate] : [group downloadRate];
+                CGFloat rate = [ident isEqualToString: @"UL"] ? [group uploadRate] : [group downloadRate];
                 return [NSString stringForSpeed: rate];
             }
@@ -2733 +2733 @@
         //get the torrents to move
         NSMutableArray * movingTorrents = [NSMutableArray arrayWithCapacity: [indexes count]];
-        for (int i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
+        for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
             [movingTorrents addObject: [fTableView itemAtRow: i]];
         
@@ -2740 +2740 @@
         {
             //change groups
-            int groupValue = [item groupIndex];
+            NSInteger groupValue = [item groupIndex];
             NSEnumerator * enumerator = [movingTorrents objectEnumerator];
             Torrent * torrent;
@@ -2761 +2761 @@
             NSArray * groupTorrents = item ? [item torrents] : fDisplayedTorrents;
             Torrent * topTorrent = nil;
-            for (int i = newRow-1; i >= 0; i--)
+            for (NSInteger i = newRow-1; i >= 0; i--)
             {
                 Torrent * tempTorrent = [groupTorrents objectAtIndex: i];
@@ -2780 +2780 @@
             
             //redo order values
-            for (int i = 0; i < [fTorrents count]; i++)
+            for (NSInteger i = 0; i < [fTorrents count]; i++)
                 [[fTorrents objectAtIndex: i] setOrderValue: i];
         }
@@ -2943 +2943 @@
         {
             NSRect frame = [fWindow frame];
-            float heightChange = contentMinSize.height - contentSize.height;
+            CGFloat heightChange = contentMinSize.height - contentSize.height;
             frame.size.height += heightChange;
             frame.origin.y -= heightChange;
@@ -2976 +2976 @@
 }
 
-- (NSRect) windowFrameByAddingHeight: (float) height checkLimits: (BOOL) check
+- (NSRect) windowFrameByAddingHeight: (CGFloat) height checkLimits: (BOOL) check
 {
     NSScrollView * scrollView = [fTableView enclosingScrollView];
@@ -3027 +3027 @@
 
     NSRect frame;
-    float heightChange = [fStatusBar frame].size.height;
+    CGFloat heightChange = [fStatusBar frame].size.height;
     if (!show)
         heightChange *= -1;
@@ -3035 +3035 @@
     {
         frame = [self windowFrameByAddingHeight: heightChange checkLimits: NO];
-        float change = [[fWindow screen] visibleFrame].size.height - frame.size.height;
+        CGFloat change = [[fWindow screen] visibleFrame].size.height - frame.size.height;
         if (change < 0.0)
         {
@@ -3050 +3050 @@
     
     //set views to not autoresize
-    unsigned int statsMask = [fStatusBar autoresizingMask];
-    unsigned int filterMask = [fFilterBar autoresizingMask];
-    unsigned int scrollMask = [scrollView autoresizingMask];
+    NSUInteger statsMask = [fStatusBar autoresizingMask];
+    NSUInteger filterMask = [fFilterBar autoresizingMask];
+    NSUInteger scrollMask = [scrollView autoresizingMask];
     [fStatusBar setAutoresizingMask: NSViewNotSizable];
     [fFilterBar setAutoresizingMask: NSViewNotSizable];
@@ -3098 +3098 @@
 
     NSRect frame;
-    float heightChange = [fFilterBar frame].size.height;
+    CGFloat heightChange = [fFilterBar frame].size.height;
     if (!show)
         heightChange *= -1;
@@ -3106 +3106 @@
     {
         frame = [self windowFrameByAddingHeight: heightChange checkLimits: NO];
-        float change = [[fWindow screen] visibleFrame].size.height - frame.size.height;
+        CGFloat change = [[fWindow screen] visibleFrame].size.height - frame.size.height;
         if (change < 0.0)
         {
@@ -3119 +3119 @@
 
     //set views to not autoresize
-    unsigned int filterMask = [fFilterBar autoresizingMask];
-    unsigned int scrollMask = [scrollView autoresizingMask];
+    NSUInteger filterMask = [fFilterBar autoresizingMask];
+    NSUInteger scrollMask = [scrollView autoresizingMask];
     [fFilterBar setAutoresizingMask: NSViewNotSizable];
     [scrollView setAutoresizingMask: NSViewNotSizable];
@@ -3348 +3348 @@
 - (void) allToolbarClicked: (id) sender
 {
-    int tagValue = [sender isKindOfClass: [NSSegmentedControl class]]
+    NSInteger tagValue = [sender isKindOfClass: [NSSegmentedControl class]]
                     ? [(NSSegmentedCell *)[sender cell] tagForSegment: [sender selectedSegment]] : [sender tag];
     switch (tagValue)
@@ -3363 +3363 @@
 - (void) selectedToolbarClicked: (id) sender
 {
-    int tagValue = [sender isKindOfClass: [NSSegmentedControl class]]
+    NSInteger tagValue = [sender isKindOfClass: [NSSegmentedControl class]]
                     ? [(NSSegmentedCell *)[sender cell] tagForSegment: [sender selectedSegment]] : [sender tag];
     switch (tagValue)
@@ -3560 +3560 @@
         BOOL checked = NO;
         
-        int index = [menuItem tag];
+        NSInteger index = [menuItem tag];
         NSEnumerator * enumerator = [[fTableView selectedTorrents] objectEnumerator];
         Torrent * torrent;
@@ -3910 +3910 @@
 - (NSMenu *) applicationDockMenu: (NSApplication *) sender
 {
-    int seeding = 0, downloading = 0;
+    NSInteger seeding = 0, downloading = 0;
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;
@@ -4004 +4004 @@
 - (NSRect) sizedWindowFrame
 {
-    int groups = ([fDisplayedTorrents count] > 0 && ![[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [Torrent class]])
+    NSInteger groups = ([fDisplayedTorrents count] > 0 && ![[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [Torrent class]])
                     ? [fDisplayedTorrents count] : 0;
     
-    float heightChange = (GROUP_SEPARATOR_HEIGHT + [fTableView intercellSpacing].height) * groups
+    CGFloat heightChange = (GROUP_SEPARATOR_HEIGHT + [fTableView intercellSpacing].height) * groups
                         + ([fTableView rowHeight] + [fTableView intercellSpacing].height) * ([fTableView numberOfRows] - groups)
                         - [[fTableView enclosingScrollView] frame].size.height;
@@ -4081 +4081 @@
         
         //resize the buttons so they don't overlay
-        int difference = (NSMaxX(pauseRect) + 5.0) - searchFrame.origin.x - 1; //subtract 1, since 0 will be counted
+        NSInteger difference = (NSMaxX(pauseRect) + 5.0) - searchFrame.origin.x - 1; //subtract 1, since 0 will be counted
         
         //decrease downloading by 8, seeding by 1, paused by 1, active by 1, repeat
-        int download = (difference / 11 * 8) + MIN(difference % 11 + 1, 8); //8 for every 11
-        int seed = (difference / 11) + (difference % 11 >= 8 ? 1 : 0);
-        int paused = (difference / 11) + (difference % 11 >= 9 ? 1 : 0);
-        int active = (difference / 11) + (difference % 11 >= 10 ? 1 : 0);
+        NSInteger download = (difference / 11 * 8) + MIN(difference % 11 + 1, 8); //8 for every 11
+        NSInteger seed = (difference / 11) + (difference % 11 >= 8 ? 1 : 0);
+        NSInteger paused = (difference / 11) + (difference % 11 >= 9 ? 1 : 0);
+        NSInteger active = (difference / 11) + (difference % 11 >= 10 ? 1 : 0);
         
         activeRect.size.width -= active;
@@ -4157 +4157 @@
         NSRange visibleRows = [fTableView rowsInRect: [fTableView bounds]];
         
-        for (int row = 0; row < NSMaxRange(visibleRows); row++)
+        for (NSInteger row = 0; row < NSMaxRange(visibleRows); row++)
         {
             id item = [fTableView itemAtRow: row];