Changeset 7016

Timestamp:

Nov 2, 2008, 1:07:01 AM (12 years ago)

Author:

livings124

Message:

more type changes

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• InfoWindowController.h (modified) (2 diffs)
• InfoWindowController.m (modified) (35 diffs)
• Torrent.h (modified) (9 diffs)
• Torrent.m (modified) (41 diffs)

trunk/macosx/Controller.m

@@ -1266 +1266 @@
     [fTorrents removeObjectsInArray: torrents];
     
+    //for tiger - when 10.5-only repace with NSIntegerMax
     int lowestOrderValue = INT_MAX;
     enumerator = [torrents objectEnumerator];

trunk/macosx/InfoWindowController.h

@@ -37 +37 @@
     
     IBOutlet NSView * fInfoView, * fActivityView, * fTrackerView, * fPeersView, * fFilesView, * fOptionsView;
-    int fCurrentTabTag;
+    NSInteger fCurrentTabTag;
     IBOutlet NSMatrix * fTabMatrix;
 
@@ -65 +65 @@
     IBOutlet PiecesView * fPiecesView;
     IBOutlet NSSegmentedControl * fPiecesControl;
-    float fWebSeedTableHeight, fSpaceBetweenWebSeedAndPeer;
+    CGFloat fWebSeedTableHeight, fSpaceBetweenWebSeedAndPeer;
     NSViewAnimation * fWebSeedTableAnimation;
     

trunk/macosx/InfoWindowController.m

@@ -75 +75 @@
 - (void) updateInfoFiles;
 
-- (NSView *) tabViewForTag: (int) tag;
+- (NSView *) tabViewForTag: (NSInteger) tag;
 - (void) setWebSeedTableHidden: (BOOL) hide animate: (BOOL) animate;
 - (NSArray *) peerSortDescriptors;
@@ -98 +98 @@
     NSPanel * window = (NSPanel *)[self window];
     
-    float windowHeight = [window frame].size.height;
+    CGFloat windowHeight = [window frame].size.height;
     
     [window setFrameAutosaveName: @"InspectorWindow"];
@@ -121 +121 @@
     fCurrentTabTag = INVALID;
     NSString * identifier = [[NSUserDefaults standardUserDefaults] stringForKey: @"InspectorSelected"];
-    int tag;
+    NSInteger tag;
     if ([identifier isEqualToString: TAB_INFO_IDENT])
         tag = TAB_INFO_TAG;
@@ -243 +243 @@
     fTorrents = [torrents retain];
 
-    int numberSelected = [fTorrents count];
+    NSUInteger numberSelected = [fTorrents count];
     if (numberSelected != 1)
     {
@@ -255 +255 @@
         
             uint64_t size = 0;
-            int fileCount = 0;
+            NSInteger fileCount = 0;
             NSEnumerator * enumerator = [torrents objectEnumerator];
             Torrent * torrent;
@@ -414 +414 @@
         {
             NSString * fileString;
-            int fileCount = [torrent fileCount];
+            NSInteger fileCount = [torrent fileCount];
             if (fileCount == 1)
                 fileString = NSLocalizedString(@"1 file", "Inspector -> selected torrents");
@@ -534 +534 @@
     Torrent * torrent = [enumerator nextObject]; //first torrent
     
-    int uploadSpeedMode = [torrent speedMode: YES],
-        uploadSpeedLimit = [torrent speedLimit: YES],
-        downloadSpeedMode = [torrent speedMode: NO],
-        downloadSpeedLimit = [torrent speedLimit: NO];
+    NSInteger uploadSpeedMode = [torrent speedMode: YES],
+                uploadSpeedLimit = [torrent speedLimit: YES],
+                downloadSpeedMode = [torrent speedMode: NO],
+                downloadSpeedLimit = [torrent speedLimit: NO];
     
     while ((torrent = [enumerator nextObject])
@@ -557 +557 @@
     
     //set upload view
-    int index;
+    NSInteger index;
     if (uploadSpeedMode == TR_SPEEDLIMIT_SINGLE)
         index = OPTION_POPUP_LIMIT;
@@ -599 +599 @@
     torrent = [enumerator nextObject]; //first torrent
     
-    int checkRatio = [torrent ratioSetting];
-    float ratioLimit = [torrent ratioLimit];
+    NSInteger checkRatio = [torrent ratioSetting];
+    CGFloat ratioLimit = [torrent ratioLimit];
     
     while ((torrent = [enumerator nextObject]) && (checkRatio != INVALID || checkRatio != INVALID))
@@ -633 +633 @@
     torrent = [enumerator nextObject]; //first torrent
     
-    int maxPeers = [torrent maxPeerConnect];
+    NSInteger maxPeers = [torrent maxPeerConnect];
     
     while ((torrent = [enumerator nextObject]))
@@ -684 +684 @@
 - (void) setTab: (id) sender
 {
-    int oldTabTag = fCurrentTabTag;
+    NSInteger oldTabTag = fCurrentTabTag;
     fCurrentTabTag = [fTabMatrix selectedTag];
     if (fCurrentTabTag == oldTabTag)
@@ -692 +692 @@
     
     //take care of old view
-    float oldHeight = 0;
+    CGFloat oldHeight = 0;
     NSString * oldResizeSaveKey = nil;
     if (oldTabTag != INVALID)
@@ -790 +790 @@
     if (resizeSaveKey)
     {
-        float height = [[NSUserDefaults standardUserDefaults] floatForKey: resizeSaveKey];
-        if (height != 0)
+        CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: resizeSaveKey];
+        if (height != 0.0)
             viewRect.size.height = MAX(height, TAB_MIN_HEIGHT);
     }
     
-    float difference = (viewRect.size.height - oldHeight) * [window userSpaceScaleFactor];
+    CGFloat difference = (viewRect.size.height - oldHeight) * [window userSpaceScaleFactor];
     windowRect.origin.y -= difference;
     windowRect.size.height += difference;
@@ -826 +826 @@
 - (void) setNextTab
 {
-    int tag = [fTabMatrix selectedTag]+1;
+    NSInteger tag = [fTabMatrix selectedTag]+1;
     if (tag >= [fTabMatrix numberOfColumns])
         tag = 0;
@@ -836 +836 @@
 - (void) setPreviousTab
 {
-    int tag = [fTabMatrix selectedTag]-1;
+    NSInteger tag = [fTabMatrix selectedTag]-1;
     if (tag < 0)
         tag = [fTabMatrix numberOfColumns]-1;
@@ -844 +844 @@
 }
 
-- (int) numberOfRowsInTableView: (NSTableView *) tableView
+- (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView
 {
     if (tableView == fPeerTable)
@@ -855 +855 @@
 }
 
-- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (int) row
+- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (NSInteger) row
 {
     if (tableView == fPeerTable)
@@ -899 +899 @@
         if ([item isKindOfClass: [NSNumber class]])
         {
-            int tier = [item intValue];
+            NSInteger tier = [item intValue];
             if (tier == 0)
                 return NSLocalizedString(@"User-Added", "Inspector -> tracker table");
@@ -936 +936 @@
 }
 
-- (BOOL) tableView: (NSTableView *) tableView shouldSelectRow: (int) row
+- (BOOL) tableView: (NSTableView *) tableView shouldSelectRow: (NSInteger) row
 {
     return tableView == fTrackerTable;
@@ -945 +945 @@
     if ([notification object] == fTrackerTable)
     {
-        int numSelected = [fTrackerTable numberOfSelectedRows];
+        NSInteger numSelected = [fTrackerTable numberOfSelectedRows];
         [fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG];
     }
@@ -958 +958 @@
 
 - (NSString *) tableView: (NSTableView *) tableView toolTipForCell: (NSCell *) cell rect: (NSRectPointer) rect
-                tableColumn: (NSTableColumn *) column row: (int) row mouseLocation: (NSPoint) mouseLocation
+                tableColumn: (NSTableColumn *) column row: (NSInteger) row mouseLocation: (NSPoint) mouseLocation
 {
     if (tableView == fPeerTable)
@@ -972 +972 @@
         
         NSString * portString;
-        int port;
+        NSInteger port;
         if ((port = [[peer objectForKey: @"Port"] intValue]) > 0)
             portString = [NSString stringWithFormat: @"%d", port];
@@ -1168 +1168 @@
 {
     BOOL upload = sender == fUploadLimitPopUp;
-    int mode;
+    NSInteger mode;
     switch ([sender indexOfSelectedItem])
     {
@@ -1206 +1206 @@
 {
     BOOL upload = sender == fUploadLimitField;
-    int limit = [sender intValue];
+    NSInteger limit = [sender intValue];
     
     Torrent * torrent;
@@ -1217 +1217 @@
 - (void) setRatioSetting: (id) sender
 {
-    int setting;
+    NSInteger setting;
     switch ([sender indexOfSelectedItem])
     {
@@ -1251 +1251 @@
 - (void) setRatioLimit: (id) sender
 {
-    float limit = [sender floatValue];
+    CGFloat limit = [sender floatValue];
     
     Torrent * torrent;
@@ -1261 +1261 @@
 - (void) setPeersConnectLimit: (id) sender
 {
-    int limit = [sender intValue];
+    NSInteger limit = [sender intValue];
     
     Torrent * torrent;
@@ -1310 +1310 @@
 - (void) updateInfoActivity
 {
-    int numberSelected = [fTorrents count];
+    NSInteger numberSelected = [fTorrents count];
     if (numberSelected == 0)
         return;
@@ -1401 +1401 @@
     [fAnnounceResponseField setSelectable: ![announceResponse isEqualToString: @""]];
     
-    int announceNext = [torrent nextAnnounceTime];
+    NSInteger announceNext = [torrent nextAnnounceTime];
     NSString * announceNextString;
     switch (announceNext)
@@ -1436 +1436 @@
     [fScrapeResponseField setSelectable: ![scrapeResponse isEqualToString: @""]];
     
-    int scrapeNext = [torrent nextScrapeTime];
+    NSInteger scrapeNext = [torrent nextScrapeTime];
     NSString * scrapeNextString;
     switch (scrapeNext)
@@ -1458 +1458 @@
     Torrent * torrent = [fTorrents objectAtIndex: 0];
     
-    int seeders = [torrent seeders], leechers = [torrent leechers], completed = [torrent completedFromTracker];
+    NSInteger seeders = [torrent seeders], leechers = [torrent leechers], completed = [torrent completedFromTracker];
     [fSeedersField setStringValue: seeders >= 0 ? [NSString stringWithFormat: @"%d", seeders] : @""];
     [fLeechersField setStringValue: leechers >= 0 ? [NSString stringWithFormat: @"%d", leechers] : @""];
@@ -1467 +1467 @@
     if (active)
     {
-        int total = [torrent totalPeersConnected];
+        NSInteger total = [torrent totalPeersConnected];
         NSString * connected = [NSString stringWithFormat:
                                 NSLocalizedString(@"%d Connected", "Inspector -> Peers tab -> peers"), total];
@@ -1474 +1474 @@
         {
             NSMutableArray * components = [NSMutableArray arrayWithCapacity: 4];
-            int count;
+            NSInteger count;
             if ((count = [torrent totalPeersTracker]) > 0)
                 [components addObject: [NSString stringWithFormat:
@@ -1523 +1523 @@
 }
 
-- (NSView *) tabViewForTag: (int) tag
+- (NSView *) tabViewForTag: (NSInteger) tag
 {
     switch (tag)
@@ -1561 +1561 @@
     if (hide)
     {
-        float webSeedFrameMaxY = NSMaxY(webSeedFrame);
+        CGFloat webSeedFrameMaxY = NSMaxY(webSeedFrame);
         webSeedFrame.size.height = 0;
         webSeedFrame.origin.y = webSeedFrameMaxY;

trunk/macosx/Torrent.h

@@ -66 +66 @@
     NSDate * fPreviousFinishedIndexesDate;
     
-    float fRatioLimit;
-    int fRatioSetting;
+    CGFloat fRatioLimit;
+    NSInteger fRatioSetting;
     BOOL fFinishedSeeding, fWaitToStart, fStalled;
     
-    int fOrderValue, fGroupValue;
+    NSInteger fOrderValue, fGroupValue;
     
     BOOL fAddedTrackers;
@@ -90 +90 @@
 - (NSString *) downloadFolder;
 
-- (void) getAvailability: (int8_t *) tab size: (int) size;
-- (void) getAmountFinished: (float *) tab size: (int) size;
+- (void) getAvailability: (int8_t *) tab size: (NSInteger) size;
+- (void) getAmountFinished: (float *) tab size: (NSInteger) size;
 - (NSIndexSet *) previousFinishedPieces;
 -(void) setPreviousFinishedPieces: (NSIndexSet *) indexes;
@@ -107 +107 @@
 - (void) resetCache;
 
-- (float) ratio;
-- (int) ratioSetting;
-- (void) setRatioSetting: (int) setting;
-- (float) ratioLimit;
-- (void) setRatioLimit: (float) limit;
-- (float) actualStopRatio; //returns INVALID if will not stop
-- (float) progressStopRatio;
+- (CGFloat) ratio;
+- (NSInteger) ratioSetting;
+- (void) setRatioSetting: (NSInteger) setting;
+- (CGFloat) ratioLimit;
+- (void) setRatioLimit: (CGFloat) limit;
+- (CGFloat) actualStopRatio; //returns INVALID if will not stop
+- (CGFloat) progressStopRatio;
 
 - (tr_speedlimit) speedMode: (BOOL) upload;
 - (void) setSpeedMode: (tr_speedlimit) mode upload: (BOOL) upload;
-- (int) speedLimit: (BOOL) upload;
-- (void) setSpeedLimit: (int) limit upload: (BOOL) upload;
+- (NSInteger) speedLimit: (BOOL) upload;
+- (void) setSpeedLimit: (NSInteger) limit upload: (BOOL) upload;
 
 - (void) setMaxPeerConnect: (uint16_t) count;
@@ -146 +146 @@
 - (NSString *) trackerAddressAnnounce;
 - (NSDate *) lastAnnounceTime;
-- (int) nextAnnounceTime;
+- (NSInteger) nextAnnounceTime;
 - (NSString *) announceResponse;
 
 - (NSString *) trackerAddressScrape;
 - (NSDate *) lastScrapeTime;
-- (int) nextScrapeTime;
+- (NSInteger) nextScrapeTime;
 - (NSString *) scrapeResponse;
 
@@ -163 +163 @@
 - (NSDate *) dateCreated;
 
-- (int) pieceSize;
-- (int) pieceCount;
+- (NSInteger) pieceSize;
+- (NSInteger) pieceCount;
 - (NSString *) hashString;
 - (BOOL) privateTorrent;
@@ -174 +174 @@
 - (BOOL) publicTorrent;
 
-- (float) progress;
-- (float) progressDone;
-- (float) progressLeft;
-- (float) checkingProgress;
-
-- (int) eta;
-- (int) etaRatio;
-
-- (float) notAvailableDesired;
+- (CGFloat) progress;
+- (CGFloat) progressDone;
+- (CGFloat) progressLeft;
+- (CGFloat) checkingProgress;
+
+- (NSInteger) eta;
+- (NSInteger) etaRatio;
+
+- (CGFloat) notAvailableDesired;
 
 - (BOOL) isActive;
@@ -205 +205 @@
 - (NSString *) stateString;
 
-- (int) seeders;
-- (int) leechers;
-- (int) completedFromTracker;
-
-- (int) totalPeersConnected;
-- (int) totalPeersTracker;
-- (int) totalPeersIncoming;
-- (int) totalPeersCache;
-- (int) totalPeersPex;
-- (int) totalPeersKnown;
-
-- (int) peersSendingToUs;
-- (int) peersGettingFromUs;
-
-- (float) downloadRate;
-- (float) uploadRate;
-- (float) totalRate;
+- (NSInteger) seeders;
+- (NSInteger) leechers;
+- (NSInteger) completedFromTracker;
+
+- (NSInteger) totalPeersConnected;
+- (NSInteger) totalPeersTracker;
+- (NSInteger) totalPeersIncoming;
+- (NSInteger) totalPeersCache;
+- (NSInteger) totalPeersPex;
+- (NSInteger) totalPeersKnown;
+
+- (NSInteger) peersSendingToUs;
+- (NSInteger) peersGettingFromUs;
+
+- (CGFloat) downloadRate;
+- (CGFloat) uploadRate;
+- (CGFloat) totalRate;
 - (uint64_t) haveVerified;
 - (uint64_t) haveTotal;
@@ -228 +228 @@
 - (uint64_t) uploadedTotal;
 - (uint64_t) failedHash;
-- (float) swarmSpeed;
-
-- (int) orderValue;
-- (void) setOrderValue: (int) orderValue;
-
-- (int) groupValue;
-- (void) setGroupValue: (int) groupValue;
-- (int) groupOrderValue;
+- (CGFloat) swarmSpeed;
+
+- (NSInteger) orderValue;
+- (void) setOrderValue: (NSInteger) orderValue;
+
+- (NSInteger) groupValue;
+- (void) setGroupValue: (NSInteger) groupValue;
+- (NSInteger) groupOrderValue;
 - (void) checkGroupValueForRemoval: (NSNotification *) notification;
 
 - (NSArray *) fileList;
-- (int) fileCount;
+- (NSInteger) fileCount;
 - (void) updateFileStat;
 
 //methods require fileStats to have been updated recently to be accurate
-- (float) fileProgress: (FileListNode *) node;
-- (BOOL) canChangeDownloadCheckForFile: (int) index;
+- (CGFloat) fileProgress: (FileListNode *) node;
+- (BOOL) canChangeDownloadCheckForFile: (NSInteger) index;
 - (BOOL) canChangeDownloadCheckForFiles: (NSIndexSet *) indexSet;
-- (int) checkForFiles: (NSIndexSet *) indexSet;
-- (void) setFileCheckState: (int) state forIndexes: (NSIndexSet *) indexSet;
-- (void) setFilePriority: (int) priority forIndexes: (NSIndexSet *) indexSet;
-- (BOOL) hasFilePriority: (int) priority forIndexes: (NSIndexSet *) indexSet;
+- (NSInteger) checkForFiles: (NSIndexSet *) indexSet;
+- (void) setFileCheckState: (NSInteger) state forIndexes: (NSIndexSet *) indexSet;
+- (void) setFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet;
+- (BOOL) hasFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet;
 - (NSSet *) filePrioritiesForIndexes: (NSIndexSet *) indexSet;
 
@@ -257 +257 @@
 - (NSDate *) dateActivityOrAdd;
 
-- (int) stalledMinutes;
+- (NSInteger) stalledMinutes;
 - (BOOL) isStalled;
 

trunk/macosx/Torrent.m

@@ -45 +45 @@
 
 - (void) createFileList;
-- (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (int) index;
+- (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (NSInteger) index;
 
 - (void) completenessChange: (NSNumber *) status;
@@ -52 +52 @@
 - (void) endQuickPause;
 
-- (NSString *) etaString: (int) eta;
+- (NSString *) etaString: (NSInteger) eta;
 
 - (void) updateAllTrackers: (NSMutableArray *) trackers;
@@ -232 +232 @@
 }
 
-- (void) getAvailability: (int8_t *) tab size: (int) size
+- (void) getAvailability: (int8_t *) tab size: (NSInteger) size
 {
     tr_torrentAvailability(fHandle, tab, size);
 }
 
-- (void) getAmountFinished: (float *) tab size: (int) size
+- (void) getAmountFinished: (float *) tab size: (NSInteger) size
 {
     tr_torrentAmountFinished(fHandle, tab, size);
@@ -274 +274 @@
     
     //check to stop for ratio
-    float stopRatio;
+    CGFloat stopRatio;
     if ([self isSeeding] && (stopRatio = [self actualStopRatio]) != INVALID && [self ratio] >= stopRatio)
     {
@@ -348 +348 @@
 }
 
-- (float) ratio
+- (CGFloat) ratio
 {
     return fStat->ratio;
 }
 
-- (int) ratioSetting
+- (NSInteger) ratioSetting
 {
     return fRatioSetting;
 }
 
-- (void) setRatioSetting: (int) setting
+- (void) setRatioSetting: (NSInteger) setting
 {
     fRatioSetting = setting;
 }
 
-- (float) ratioLimit
+- (CGFloat) ratioLimit
 {
     return fRatioLimit;
 }
 
-- (void) setRatioLimit: (float) limit
+- (void) setRatioLimit: (CGFloat) limit
 {
     if (limit >= 0)
@@ -374 +374 @@
 }
 
-- (float) actualStopRatio
+- (CGFloat) actualStopRatio
 {
     if (fRatioSetting == NSOnState)
@@ -384 +384 @@
 }
 
-- (float) progressStopRatio
-{
-    float stopRatio, ratio;
+- (CGFloat) progressStopRatio
+{
+    CGFloat stopRatio, ratio;
     if ((stopRatio = [self actualStopRatio]) == INVALID || (ratio = [self ratio]) >= stopRatio)
         return 1.0;
@@ -405 +405 @@
 }
 
-- (int) speedLimit: (BOOL) upload
+- (NSInteger) speedLimit: (BOOL) upload
 {
     return tr_torrentGetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN);
 }
 
-- (void) setSpeedLimit: (int) limit upload: (BOOL) upload
+- (void) setSpeedLimit: (NSInteger) limit upload: (BOOL) upload
 {
     tr_torrentSetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN, limit);
@@ -473 +473 @@
         NSArray * oldComponents = [oldFolder pathComponents],
                 * newComponents = [folder pathComponents];
-        int count;
+        NSInteger count;
         
         if ((count = [oldComponents count]) < [newComponents count]
@@ -559 +559 @@
             
             //determine amount needed
-            for (int i = 0; i < [self fileCount]; i++)
+            for (NSInteger i = 0; i < [self fileCount]; i++)
             {
                 if (tr_torrentGetFileDL(fHandle, i))
@@ -655 +655 @@
 }
 
-- (void) destinationChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) context
+- (void) destinationChoiceClosed: (NSOpenPanel *) openPanel returnCode: (NSInteger) code contextInfo: (void *) context
 {
     if (code != NSOKButton)
@@ -728 +728 @@
 - (NSDate *) lastAnnounceTime
 {
-    int date = fStat->lastAnnounceTime;
+    NSInteger date = fStat->lastAnnounceTime;
     return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil;
 }
 
-- (int) nextAnnounceTime
-{
-    int date = fStat->nextAnnounceTime;
+- (NSInteger) nextAnnounceTime
+{
+    NSInteger date = fStat->nextAnnounceTime;
     NSTimeInterval difference;
     switch (date)
@@ -744 +744 @@
         default:
             difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow];
-            return difference > 0 ? (int)difference : STAT_TIME_NONE;
+            return difference > 0 ? (NSInteger)difference : STAT_TIME_NONE;
     }
 }
@@ -760 +760 @@
 - (NSDate *) lastScrapeTime
 {
-    int date = fStat->lastScrapeTime;
+    NSInteger date = fStat->lastScrapeTime;
     return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil;
 }
 
-- (int) nextScrapeTime
-{
-    int date = fStat->nextScrapeTime;
+- (NSInteger) nextScrapeTime
+{
+    NSInteger date = fStat->nextScrapeTime;
     NSTimeInterval difference;
     switch (date)
@@ -776 +776 @@
         default:
             difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow];
-            return difference > 0 ? (int)difference : STAT_TIME_NONE;
+            return difference > 0 ? (NSInteger)difference : STAT_TIME_NONE;
     }
 }
@@ -787 +787 @@
 - (NSMutableArray *) allTrackers: (BOOL) separators
 {
-    int count = fInfo->trackerCount, capacity = count;
+    NSInteger count = fInfo->trackerCount, capacity = count;
     if (separators)
         capacity += fInfo->trackers[count-1].tier + 1;
     NSMutableArray * allTrackers = [NSMutableArray arrayWithCapacity: capacity];
     
-    for (int i = 0, tier = -1; i < count; i++)
+    for (NSInteger i = 0, tier = -1; i < count; i++)
     {
         if (separators && tier != fInfo->trackers[i].tier)
@@ -809 +809 @@
 {
     //find added tracker at end of first tier
-    int i;
+    NSInteger i;
     for (i = 1; i < [trackers count]; i++)
         if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
@@ -860 +860 @@
 - (NSDate *) dateCreated
 {
-    int date = fInfo->dateCreated;
+    NSInteger date = fInfo->dateCreated;
     return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil;
 }
 
-- (int) pieceSize
+- (NSInteger) pieceSize
 {
     return fInfo->pieceSize;
 }
 
-- (int) pieceCount
+- (NSInteger) pieceCount
 {
     return fInfo->pieceCount;
@@ -904 +904 @@
 }
 
-- (float) progress
+- (CGFloat) progress
 {
     return fStat->percentComplete;
 }
 
-- (float) progressDone
+- (CGFloat) progressDone
 {
     return fStat->percentDone;
 }
 
-- (float) progressLeft
-{
-    return (float)[self sizeLeft] / [self size];
-}
-
-- (float) checkingProgress
+- (CGFloat) progressLeft
+{
+    return (CGFloat)[self sizeLeft] / [self size];
+}
+
+- (CGFloat) checkingProgress
 {
     return fStat->recheckProgress;
 }
 
-- (int) eta
+- (NSInteger) eta
 {
     return fStat->eta;
 }
 
-- (int) etaRatio
+- (NSInteger) etaRatio
 {
     if (![self isSeeding])
         return TR_ETA_UNKNOWN;
     
-    float uploadRate = [self uploadRate];
+    CGFloat uploadRate = [self uploadRate];
     if (uploadRate < 0.1)
         return TR_ETA_UNKNOWN;
     
-    float stopRatio = [self actualStopRatio], ratio = [self ratio];
+    CGFloat stopRatio = [self actualStopRatio], ratio = [self ratio];
     if (stopRatio == INVALID || ratio >= stopRatio)
         return TR_ETA_UNKNOWN;
     
-    return (float)MAX([self downloadedTotal], [self haveTotal]) * (stopRatio - ratio) / uploadRate / 1024.0;
-}
-
-- (float) notAvailableDesired
-{
-    return 1.0 - (float)fStat->desiredAvailable / [self sizeLeft];
+    return (CGFloat)MAX([self downloadedTotal], [self haveTotal]) * (stopRatio - ratio) / uploadRate / 1024.0;
+}
+
+- (CGFloat) notAvailableDesired
+{
+    return 1.0 - (CGFloat)fStat->desiredAvailable / [self sizeLeft];
 }
 
@@ -1000 +1000 @@
 - (NSArray *) peers
 {
-    int totalPeers;
+    NSInteger totalPeers;
     tr_peer_stat * peers = tr_torrentPeers(fHandle, &totalPeers);
     
     NSMutableArray * peerDicts = [NSMutableArray arrayWithCapacity: totalPeers];
     
-    for (int i = 0; i < totalPeers; i++)
+    for (NSInteger i = 0; i < totalPeers; i++)
     {
         tr_peer_stat * peer = &peers[i];
@@ -1038 +1038 @@
 - (NSArray *) webSeeds
 {
-    const int webSeedCount = fInfo->webseedCount;
+    const NSInteger webSeedCount = fInfo->webseedCount;
     NSMutableArray * webSeeds = [NSMutableArray arrayWithCapacity: webSeedCount];
     
     float * dlSpeeds = tr_torrentWebSpeeds(fHandle);
     
-    for (int i = 0; i < webSeedCount; i++)
+    for (NSInteger i = 0; i < webSeedCount; i++)
     {
         NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 2];
@@ -1066 +1066 @@
     if (![self allDownloaded])
     {
-        float progress;
+        CGFloat progress;
         if ([self isFolder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
         {
@@ -1112 +1112 @@
         && (fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"]))))
     {
-        int eta = fStat->activity == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
+        NSInteger eta = fStat->activity == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
         string = [string stringByAppendingFormat: @" - %@", [self etaString: eta]];
     }
@@ -1164 +1164 @@
                                                     "Torrent -> status string"), [self peersSendingToUs]];
                 
-                int webSeedCount = fStat->webseedsSendingToUs;
+                NSInteger webSeedCount = fStat->webseedsSendingToUs;
                 if (webSeedCount > 0)
                 {
@@ -1281 +1281 @@
 }
 
-- (int) seeders
+- (NSInteger) seeders
 {
     return fStat->seeders;
 }
 
-- (int) leechers
+- (NSInteger) leechers
 {
     return fStat->leechers;
 }
 
-- (int) completedFromTracker
+- (NSInteger) completedFromTracker
 {
     return fStat->timesCompleted;
 }
 
-- (int) totalPeersConnected
+- (NSInteger) totalPeersConnected
 {
     return fStat->peersConnected;
 }
 
-- (int) totalPeersTracker
+- (NSInteger) totalPeersTracker
 {
     return fStat->peersFrom[TR_PEER_FROM_TRACKER];
 }
 
-- (int) totalPeersIncoming
+- (NSInteger) totalPeersIncoming
 {
     return fStat->peersFrom[TR_PEER_FROM_INCOMING];
 }
 
-- (int) totalPeersCache
+- (NSInteger) totalPeersCache
 {
     return fStat->peersFrom[TR_PEER_FROM_CACHE];
 }
 
-- (int) totalPeersPex
+- (NSInteger) totalPeersPex
 {
     return fStat->peersFrom[TR_PEER_FROM_PEX];
 }
 
-- (int) totalPeersKnown
+- (NSInteger) totalPeersKnown
 {
     return fStat->peersKnown;
 }
 
-- (int) peersSendingToUs
+- (NSInteger) peersSendingToUs
 {
     return fStat->peersSendingToUs;
 }
 
-- (int) peersGettingFromUs
+- (NSInteger) peersGettingFromUs
 {
     return fStat->peersGettingFromUs;
 }
 
-- (float) downloadRate
+- (CGFloat) downloadRate
 {
     return fStat->rateDownload;
 }
 
-- (float) uploadRate
+- (CGFloat) uploadRate
 {
     return fStat->rateUpload;
 }
 
-- (float) totalRate
+- (CGFloat) totalRate
 {
     return [self downloadRate] + [self uploadRate];
@@ -1381 +1381 @@
 }
 
-- (float) swarmSpeed
+- (CGFloat) swarmSpeed
 {
     return fStat->swarmSpeed;
 }
 
-- (int) orderValue
+- (NSInteger) orderValue
 {
     return fOrderValue;
 }
 
-- (void) setOrderValue: (int) orderValue
+- (void) setOrderValue: (NSInteger) orderValue
 {
     fOrderValue = orderValue;
 }
 
-- (int) groupValue
+- (NSInteger) groupValue
 {
     return fGroupValue;
 }
 
-- (void) setGroupValue: (int) goupValue
+- (void) setGroupValue: (NSInteger) goupValue
 {
     fGroupValue = goupValue;
 }
 
-- (int) groupOrderValue
+- (NSInteger) groupOrderValue
 {
     return [[GroupsController groups] rowValueForIndex: fGroupValue];
@@ -1422 +1422 @@
 }
 
-- (int) fileCount
+- (NSInteger) fileCount
 {
     return fInfo->fileCount;
@@ -1435 +1435 @@
 }
 
-- (float) fileProgress: (FileListNode *) node
+- (CGFloat) fileProgress: (FileListNode *) node
 {
     if ([self isComplete])
@@ -1449 +1449 @@
     
     uint64_t have = 0;
-    for (int index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
+    for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
         have += fFileStat[index].bytesCompleted;
     
     NSAssert([node size], @"director in torrent file has size 0");
-    return (float)have / [node size];
-}
-
-- (BOOL) canChangeDownloadCheckForFile: (int) index
+    return (CGFloat)have / [node size];
+}
+
+- (BOOL) canChangeDownloadCheckForFile: (NSInteger) index
 {
     if (!fFileStat)
@@ -1472 +1472 @@
         [self updateFileStat];
     
-    for (int index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
+    for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
         if (fFileStat[index].progress < 1.0)
             return YES;
@@ -1478 +1478 @@
 }
 
-- (int) checkForFiles: (NSIndexSet *) indexSet
+- (NSInteger) checkForFiles: (NSIndexSet *) indexSet
 {
     BOOL onState = NO, offState = NO;
-    for (int index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
+    for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
     {
         if (tr_torrentGetFileDL(fHandle, index) || ![self canChangeDownloadCheckForFile: index])
@@ -1494 +1494 @@
 }
 
-- (void) setFileCheckState: (int) state forIndexes: (NSIndexSet *) indexSet
+- (void) setFileCheckState: (NSInteger) state forIndexes: (NSIndexSet *) indexSet
 {
     NSUInteger count = [indexSet count];
@@ -1508 +1508 @@
 }
 
-- (void) setFilePriority: (int) priority forIndexes: (NSIndexSet *) indexSet
+- (void) setFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet
 {
     const NSUInteger count = [indexSet count];
@@ -1519 +1519 @@
 }
 
-- (BOOL) hasFilePriority: (int) priority forIndexes: (NSIndexSet *) indexSet
-{
-    for (int index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
+- (BOOL) hasFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet
+{
+    for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
         if (priority == tr_torrentGetFilePriority(fHandle, index) && [self canChangeDownloadCheckForFile: index])
             return YES;
@@ -1532 +1532 @@
     NSMutableSet * priorities = [NSMutableSet setWithCapacity: 3];
     
-    for (int index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
+    for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
     {
         if (![self canChangeDownloadCheckForFile: index])
             continue;
         
-        int priority = tr_torrentGetFilePriority(fHandle, index);
+        NSInteger priority = tr_torrentGetFilePriority(fHandle, index);
         if (priority == TR_PRI_LOW)
         {
@@ -1588 +1588 @@
 }
 
-- (int) stalledMinutes
+- (NSInteger) stalledMinutes
 {
     time_t start = fStat->startDate;
@@ -1743 +1743 @@
     if ([self isFolder])
     {
-        int count = [self fileCount];
+        NSInteger count = [self fileCount];
         NSMutableArray * fileList = [[NSMutableArray alloc] initWithCapacity: count];
         
-        for (int i = 0; i < count; i++)
+        for (NSInteger i = 0; i < count; i++)
         {
             tr_file * file = &fInfo->files[i];
@@ -1795 +1795 @@
 }
 
-- (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (int) index
+- (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (NSInteger) index
 {
     NSString * name = [components objectAtIndex: 0];
@@ -1931 +1931 @@
 }
 
-- (NSString *) etaString: (int) eta
+- (NSString *) etaString: (NSInteger) eta
 {
     switch (eta)
@@ -1947 +1947 @@
 {
     //get count
-    int count = 0;
+    NSInteger count = 0;
     NSEnumerator * enumerator = [trackers objectEnumerator];
     id object;
@@ -1956 +1956 @@
     //recreate the tracker structure
     tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count);
-    int tier = 0;
-    int i = 0;
+    NSInteger tier = 0, i = 0;
     enumerator = [trackers objectEnumerator];
     while ((object = [enumerator nextObject]))