Changeset 7016
- Timestamp:
- Nov 2, 2008, 1:07:01 AM (12 years ago)
- Location:
- trunk/macosx
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Controller.m
r7013 r7016 1266 1266 [fTorrents removeObjectsInArray: torrents]; 1267 1267 1268 //for tiger - when 10.5-only repace with NSIntegerMax 1268 1269 int lowestOrderValue = INT_MAX; 1269 1270 enumerator = [torrents objectEnumerator]; -
trunk/macosx/InfoWindowController.h
r7007 r7016 37 37 38 38 IBOutlet NSView * fInfoView, * fActivityView, * fTrackerView, * fPeersView, * fFilesView, * fOptionsView; 39 intfCurrentTabTag;39 NSInteger fCurrentTabTag; 40 40 IBOutlet NSMatrix * fTabMatrix; 41 41 … … 65 65 IBOutlet PiecesView * fPiecesView; 66 66 IBOutlet NSSegmentedControl * fPiecesControl; 67 float fWebSeedTableHeight, fSpaceBetweenWebSeedAndPeer;67 CGFloat fWebSeedTableHeight, fSpaceBetweenWebSeedAndPeer; 68 68 NSViewAnimation * fWebSeedTableAnimation; 69 69 -
trunk/macosx/InfoWindowController.m
r7007 r7016 75 75 - (void) updateInfoFiles; 76 76 77 - (NSView *) tabViewForTag: ( int) tag;77 - (NSView *) tabViewForTag: (NSInteger) tag; 78 78 - (void) setWebSeedTableHidden: (BOOL) hide animate: (BOOL) animate; 79 79 - (NSArray *) peerSortDescriptors; … … 98 98 NSPanel * window = (NSPanel *)[self window]; 99 99 100 float windowHeight = [window frame].size.height;100 CGFloat windowHeight = [window frame].size.height; 101 101 102 102 [window setFrameAutosaveName: @"InspectorWindow"]; … … 121 121 fCurrentTabTag = INVALID; 122 122 NSString * identifier = [[NSUserDefaults standardUserDefaults] stringForKey: @"InspectorSelected"]; 123 inttag;123 NSInteger tag; 124 124 if ([identifier isEqualToString: TAB_INFO_IDENT]) 125 125 tag = TAB_INFO_TAG; … … 243 243 fTorrents = [torrents retain]; 244 244 245 intnumberSelected = [fTorrents count];245 NSUInteger numberSelected = [fTorrents count]; 246 246 if (numberSelected != 1) 247 247 { … … 255 255 256 256 uint64_t size = 0; 257 intfileCount = 0;257 NSInteger fileCount = 0; 258 258 NSEnumerator * enumerator = [torrents objectEnumerator]; 259 259 Torrent * torrent; … … 414 414 { 415 415 NSString * fileString; 416 intfileCount = [torrent fileCount];416 NSInteger fileCount = [torrent fileCount]; 417 417 if (fileCount == 1) 418 418 fileString = NSLocalizedString(@"1 file", "Inspector -> selected torrents"); … … 534 534 Torrent * torrent = [enumerator nextObject]; //first torrent 535 535 536 intuploadSpeedMode = [torrent speedMode: YES],537 uploadSpeedLimit = [torrent speedLimit: YES],538 downloadSpeedMode = [torrent speedMode: NO],539 downloadSpeedLimit = [torrent speedLimit: NO];536 NSInteger uploadSpeedMode = [torrent speedMode: YES], 537 uploadSpeedLimit = [torrent speedLimit: YES], 538 downloadSpeedMode = [torrent speedMode: NO], 539 downloadSpeedLimit = [torrent speedLimit: NO]; 540 540 541 541 while ((torrent = [enumerator nextObject]) … … 557 557 558 558 //set upload view 559 intindex;559 NSInteger index; 560 560 if (uploadSpeedMode == TR_SPEEDLIMIT_SINGLE) 561 561 index = OPTION_POPUP_LIMIT; … … 599 599 torrent = [enumerator nextObject]; //first torrent 600 600 601 intcheckRatio = [torrent ratioSetting];602 float ratioLimit = [torrent ratioLimit];601 NSInteger checkRatio = [torrent ratioSetting]; 602 CGFloat ratioLimit = [torrent ratioLimit]; 603 603 604 604 while ((torrent = [enumerator nextObject]) && (checkRatio != INVALID || checkRatio != INVALID)) … … 633 633 torrent = [enumerator nextObject]; //first torrent 634 634 635 intmaxPeers = [torrent maxPeerConnect];635 NSInteger maxPeers = [torrent maxPeerConnect]; 636 636 637 637 while ((torrent = [enumerator nextObject])) … … 684 684 - (void) setTab: (id) sender 685 685 { 686 intoldTabTag = fCurrentTabTag;686 NSInteger oldTabTag = fCurrentTabTag; 687 687 fCurrentTabTag = [fTabMatrix selectedTag]; 688 688 if (fCurrentTabTag == oldTabTag) … … 692 692 693 693 //take care of old view 694 float oldHeight = 0;694 CGFloat oldHeight = 0; 695 695 NSString * oldResizeSaveKey = nil; 696 696 if (oldTabTag != INVALID) … … 790 790 if (resizeSaveKey) 791 791 { 792 float height = [[NSUserDefaults standardUserDefaults] floatForKey: resizeSaveKey];793 if (height != 0 )792 CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: resizeSaveKey]; 793 if (height != 0.0) 794 794 viewRect.size.height = MAX(height, TAB_MIN_HEIGHT); 795 795 } 796 796 797 float difference = (viewRect.size.height - oldHeight) * [window userSpaceScaleFactor];797 CGFloat difference = (viewRect.size.height - oldHeight) * [window userSpaceScaleFactor]; 798 798 windowRect.origin.y -= difference; 799 799 windowRect.size.height += difference; … … 826 826 - (void) setNextTab 827 827 { 828 inttag = [fTabMatrix selectedTag]+1;828 NSInteger tag = [fTabMatrix selectedTag]+1; 829 829 if (tag >= [fTabMatrix numberOfColumns]) 830 830 tag = 0; … … 836 836 - (void) setPreviousTab 837 837 { 838 inttag = [fTabMatrix selectedTag]-1;838 NSInteger tag = [fTabMatrix selectedTag]-1; 839 839 if (tag < 0) 840 840 tag = [fTabMatrix numberOfColumns]-1; … … 844 844 } 845 845 846 - ( int) numberOfRowsInTableView: (NSTableView *) tableView846 - (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView 847 847 { 848 848 if (tableView == fPeerTable) … … 855 855 } 856 856 857 - (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: ( int) row857 - (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (NSInteger) row 858 858 { 859 859 if (tableView == fPeerTable) … … 899 899 if ([item isKindOfClass: [NSNumber class]]) 900 900 { 901 inttier = [item intValue];901 NSInteger tier = [item intValue]; 902 902 if (tier == 0) 903 903 return NSLocalizedString(@"User-Added", "Inspector -> tracker table"); … … 936 936 } 937 937 938 - (BOOL) tableView: (NSTableView *) tableView shouldSelectRow: ( int) row938 - (BOOL) tableView: (NSTableView *) tableView shouldSelectRow: (NSInteger) row 939 939 { 940 940 return tableView == fTrackerTable; … … 945 945 if ([notification object] == fTrackerTable) 946 946 { 947 intnumSelected = [fTrackerTable numberOfSelectedRows];947 NSInteger numSelected = [fTrackerTable numberOfSelectedRows]; 948 948 [fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG]; 949 949 } … … 958 958 959 959 - (NSString *) tableView: (NSTableView *) tableView toolTipForCell: (NSCell *) cell rect: (NSRectPointer) rect 960 tableColumn: (NSTableColumn *) column row: ( int) row mouseLocation: (NSPoint) mouseLocation960 tableColumn: (NSTableColumn *) column row: (NSInteger) row mouseLocation: (NSPoint) mouseLocation 961 961 { 962 962 if (tableView == fPeerTable) … … 972 972 973 973 NSString * portString; 974 intport;974 NSInteger port; 975 975 if ((port = [[peer objectForKey: @"Port"] intValue]) > 0) 976 976 portString = [NSString stringWithFormat: @"%d", port]; … … 1168 1168 { 1169 1169 BOOL upload = sender == fUploadLimitPopUp; 1170 intmode;1170 NSInteger mode; 1171 1171 switch ([sender indexOfSelectedItem]) 1172 1172 { … … 1206 1206 { 1207 1207 BOOL upload = sender == fUploadLimitField; 1208 intlimit = [sender intValue];1208 NSInteger limit = [sender intValue]; 1209 1209 1210 1210 Torrent * torrent; … … 1217 1217 - (void) setRatioSetting: (id) sender 1218 1218 { 1219 intsetting;1219 NSInteger setting; 1220 1220 switch ([sender indexOfSelectedItem]) 1221 1221 { … … 1251 1251 - (void) setRatioLimit: (id) sender 1252 1252 { 1253 float limit = [sender floatValue];1253 CGFloat limit = [sender floatValue]; 1254 1254 1255 1255 Torrent * torrent; … … 1261 1261 - (void) setPeersConnectLimit: (id) sender 1262 1262 { 1263 intlimit = [sender intValue];1263 NSInteger limit = [sender intValue]; 1264 1264 1265 1265 Torrent * torrent; … … 1310 1310 - (void) updateInfoActivity 1311 1311 { 1312 intnumberSelected = [fTorrents count];1312 NSInteger numberSelected = [fTorrents count]; 1313 1313 if (numberSelected == 0) 1314 1314 return; … … 1401 1401 [fAnnounceResponseField setSelectable: ![announceResponse isEqualToString: @""]]; 1402 1402 1403 intannounceNext = [torrent nextAnnounceTime];1403 NSInteger announceNext = [torrent nextAnnounceTime]; 1404 1404 NSString * announceNextString; 1405 1405 switch (announceNext) … … 1436 1436 [fScrapeResponseField setSelectable: ![scrapeResponse isEqualToString: @""]]; 1437 1437 1438 intscrapeNext = [torrent nextScrapeTime];1438 NSInteger scrapeNext = [torrent nextScrapeTime]; 1439 1439 NSString * scrapeNextString; 1440 1440 switch (scrapeNext) … … 1458 1458 Torrent * torrent = [fTorrents objectAtIndex: 0]; 1459 1459 1460 intseeders = [torrent seeders], leechers = [torrent leechers], completed = [torrent completedFromTracker];1460 NSInteger seeders = [torrent seeders], leechers = [torrent leechers], completed = [torrent completedFromTracker]; 1461 1461 [fSeedersField setStringValue: seeders >= 0 ? [NSString stringWithFormat: @"%d", seeders] : @""]; 1462 1462 [fLeechersField setStringValue: leechers >= 0 ? [NSString stringWithFormat: @"%d", leechers] : @""]; … … 1467 1467 if (active) 1468 1468 { 1469 inttotal = [torrent totalPeersConnected];1469 NSInteger total = [torrent totalPeersConnected]; 1470 1470 NSString * connected = [NSString stringWithFormat: 1471 1471 NSLocalizedString(@"%d Connected", "Inspector -> Peers tab -> peers"), total]; … … 1474 1474 { 1475 1475 NSMutableArray * components = [NSMutableArray arrayWithCapacity: 4]; 1476 intcount;1476 NSInteger count; 1477 1477 if ((count = [torrent totalPeersTracker]) > 0) 1478 1478 [components addObject: [NSString stringWithFormat: … … 1523 1523 } 1524 1524 1525 - (NSView *) tabViewForTag: ( int) tag1525 - (NSView *) tabViewForTag: (NSInteger) tag 1526 1526 { 1527 1527 switch (tag) … … 1561 1561 if (hide) 1562 1562 { 1563 float webSeedFrameMaxY = NSMaxY(webSeedFrame);1563 CGFloat webSeedFrameMaxY = NSMaxY(webSeedFrame); 1564 1564 webSeedFrame.size.height = 0; 1565 1565 webSeedFrame.origin.y = webSeedFrameMaxY; -
trunk/macosx/Torrent.h
r6885 r7016 66 66 NSDate * fPreviousFinishedIndexesDate; 67 67 68 float fRatioLimit;69 intfRatioSetting;68 CGFloat fRatioLimit; 69 NSInteger fRatioSetting; 70 70 BOOL fFinishedSeeding, fWaitToStart, fStalled; 71 71 72 intfOrderValue, fGroupValue;72 NSInteger fOrderValue, fGroupValue; 73 73 74 74 BOOL fAddedTrackers; … … 90 90 - (NSString *) downloadFolder; 91 91 92 - (void) getAvailability: (int8_t *) tab size: ( int) size;93 - (void) getAmountFinished: (float *) tab size: ( int) size;92 - (void) getAvailability: (int8_t *) tab size: (NSInteger) size; 93 - (void) getAmountFinished: (float *) tab size: (NSInteger) size; 94 94 - (NSIndexSet *) previousFinishedPieces; 95 95 -(void) setPreviousFinishedPieces: (NSIndexSet *) indexes; … … 107 107 - (void) resetCache; 108 108 109 - ( float) ratio;110 - ( int) ratioSetting;111 - (void) setRatioSetting: ( int) setting;112 - ( float) ratioLimit;113 - (void) setRatioLimit: ( float) limit;114 - ( float) actualStopRatio; //returns INVALID if will not stop115 - ( float) progressStopRatio;109 - (CGFloat) ratio; 110 - (NSInteger) ratioSetting; 111 - (void) setRatioSetting: (NSInteger) setting; 112 - (CGFloat) ratioLimit; 113 - (void) setRatioLimit: (CGFloat) limit; 114 - (CGFloat) actualStopRatio; //returns INVALID if will not stop 115 - (CGFloat) progressStopRatio; 116 116 117 117 - (tr_speedlimit) speedMode: (BOOL) upload; 118 118 - (void) setSpeedMode: (tr_speedlimit) mode upload: (BOOL) upload; 119 - ( int) speedLimit: (BOOL) upload;120 - (void) setSpeedLimit: ( int) limit upload: (BOOL) upload;119 - (NSInteger) speedLimit: (BOOL) upload; 120 - (void) setSpeedLimit: (NSInteger) limit upload: (BOOL) upload; 121 121 122 122 - (void) setMaxPeerConnect: (uint16_t) count; … … 146 146 - (NSString *) trackerAddressAnnounce; 147 147 - (NSDate *) lastAnnounceTime; 148 - ( int) nextAnnounceTime;148 - (NSInteger) nextAnnounceTime; 149 149 - (NSString *) announceResponse; 150 150 151 151 - (NSString *) trackerAddressScrape; 152 152 - (NSDate *) lastScrapeTime; 153 - ( int) nextScrapeTime;153 - (NSInteger) nextScrapeTime; 154 154 - (NSString *) scrapeResponse; 155 155 … … 163 163 - (NSDate *) dateCreated; 164 164 165 - ( int) pieceSize;166 - ( int) pieceCount;165 - (NSInteger) pieceSize; 166 - (NSInteger) pieceCount; 167 167 - (NSString *) hashString; 168 168 - (BOOL) privateTorrent; … … 174 174 - (BOOL) publicTorrent; 175 175 176 - ( float) progress;177 - ( float) progressDone;178 - ( float) progressLeft;179 - ( float) checkingProgress;180 181 - ( int) eta;182 - ( int) etaRatio;183 184 - ( float) notAvailableDesired;176 - (CGFloat) progress; 177 - (CGFloat) progressDone; 178 - (CGFloat) progressLeft; 179 - (CGFloat) checkingProgress; 180 181 - (NSInteger) eta; 182 - (NSInteger) etaRatio; 183 184 - (CGFloat) notAvailableDesired; 185 185 186 186 - (BOOL) isActive; … … 205 205 - (NSString *) stateString; 206 206 207 - ( int) seeders;208 - ( int) leechers;209 - ( int) completedFromTracker;210 211 - ( int) totalPeersConnected;212 - ( int) totalPeersTracker;213 - ( int) totalPeersIncoming;214 - ( int) totalPeersCache;215 - ( int) totalPeersPex;216 - ( int) totalPeersKnown;217 218 - ( int) peersSendingToUs;219 - ( int) peersGettingFromUs;220 221 - ( float) downloadRate;222 - ( float) uploadRate;223 - ( float) totalRate;207 - (NSInteger) seeders; 208 - (NSInteger) leechers; 209 - (NSInteger) completedFromTracker; 210 211 - (NSInteger) totalPeersConnected; 212 - (NSInteger) totalPeersTracker; 213 - (NSInteger) totalPeersIncoming; 214 - (NSInteger) totalPeersCache; 215 - (NSInteger) totalPeersPex; 216 - (NSInteger) totalPeersKnown; 217 218 - (NSInteger) peersSendingToUs; 219 - (NSInteger) peersGettingFromUs; 220 221 - (CGFloat) downloadRate; 222 - (CGFloat) uploadRate; 223 - (CGFloat) totalRate; 224 224 - (uint64_t) haveVerified; 225 225 - (uint64_t) haveTotal; … … 228 228 - (uint64_t) uploadedTotal; 229 229 - (uint64_t) failedHash; 230 - ( float) swarmSpeed;231 232 - ( int) orderValue;233 - (void) setOrderValue: ( int) orderValue;234 235 - ( int) groupValue;236 - (void) setGroupValue: ( int) groupValue;237 - ( int) groupOrderValue;230 - (CGFloat) swarmSpeed; 231 232 - (NSInteger) orderValue; 233 - (void) setOrderValue: (NSInteger) orderValue; 234 235 - (NSInteger) groupValue; 236 - (void) setGroupValue: (NSInteger) groupValue; 237 - (NSInteger) groupOrderValue; 238 238 - (void) checkGroupValueForRemoval: (NSNotification *) notification; 239 239 240 240 - (NSArray *) fileList; 241 - ( int) fileCount;241 - (NSInteger) fileCount; 242 242 - (void) updateFileStat; 243 243 244 244 //methods require fileStats to have been updated recently to be accurate 245 - ( float) fileProgress: (FileListNode *) node;246 - (BOOL) canChangeDownloadCheckForFile: ( int) index;245 - (CGFloat) fileProgress: (FileListNode *) node; 246 - (BOOL) canChangeDownloadCheckForFile: (NSInteger) index; 247 247 - (BOOL) canChangeDownloadCheckForFiles: (NSIndexSet *) indexSet; 248 - ( int) checkForFiles: (NSIndexSet *) indexSet;249 - (void) setFileCheckState: ( int) state forIndexes: (NSIndexSet *) indexSet;250 - (void) setFilePriority: ( int) priority forIndexes: (NSIndexSet *) indexSet;251 - (BOOL) hasFilePriority: ( int) priority forIndexes: (NSIndexSet *) indexSet;248 - (NSInteger) checkForFiles: (NSIndexSet *) indexSet; 249 - (void) setFileCheckState: (NSInteger) state forIndexes: (NSIndexSet *) indexSet; 250 - (void) setFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet; 251 - (BOOL) hasFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet; 252 252 - (NSSet *) filePrioritiesForIndexes: (NSIndexSet *) indexSet; 253 253 … … 257 257 - (NSDate *) dateActivityOrAdd; 258 258 259 - ( int) stalledMinutes;259 - (NSInteger) stalledMinutes; 260 260 - (BOOL) isStalled; 261 261 -
trunk/macosx/Torrent.m
r6979 r7016 45 45 46 46 - (void) createFileList; 47 - (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: ( int) index;47 - (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (NSInteger) index; 48 48 49 49 - (void) completenessChange: (NSNumber *) status; … … 52 52 - (void) endQuickPause; 53 53 54 - (NSString *) etaString: ( int) eta;54 - (NSString *) etaString: (NSInteger) eta; 55 55 56 56 - (void) updateAllTrackers: (NSMutableArray *) trackers; … … 232 232 } 233 233 234 - (void) getAvailability: (int8_t *) tab size: ( int) size234 - (void) getAvailability: (int8_t *) tab size: (NSInteger) size 235 235 { 236 236 tr_torrentAvailability(fHandle, tab, size); 237 237 } 238 238 239 - (void) getAmountFinished: (float *) tab size: ( int) size239 - (void) getAmountFinished: (float *) tab size: (NSInteger) size 240 240 { 241 241 tr_torrentAmountFinished(fHandle, tab, size); … … 274 274 275 275 //check to stop for ratio 276 float stopRatio;276 CGFloat stopRatio; 277 277 if ([self isSeeding] && (stopRatio = [self actualStopRatio]) != INVALID && [self ratio] >= stopRatio) 278 278 { … … 348 348 } 349 349 350 - ( float) ratio350 - (CGFloat) ratio 351 351 { 352 352 return fStat->ratio; 353 353 } 354 354 355 - ( int) ratioSetting355 - (NSInteger) ratioSetting 356 356 { 357 357 return fRatioSetting; 358 358 } 359 359 360 - (void) setRatioSetting: ( int) setting360 - (void) setRatioSetting: (NSInteger) setting 361 361 { 362 362 fRatioSetting = setting; 363 363 } 364 364 365 - ( float) ratioLimit365 - (CGFloat) ratioLimit 366 366 { 367 367 return fRatioLimit; 368 368 } 369 369 370 - (void) setRatioLimit: ( float) limit370 - (void) setRatioLimit: (CGFloat) limit 371 371 { 372 372 if (limit >= 0) … … 374 374 } 375 375 376 - ( float) actualStopRatio376 - (CGFloat) actualStopRatio 377 377 { 378 378 if (fRatioSetting == NSOnState) … … 384 384 } 385 385 386 - ( float) progressStopRatio387 { 388 float stopRatio, ratio;386 - (CGFloat) progressStopRatio 387 { 388 CGFloat stopRatio, ratio; 389 389 if ((stopRatio = [self actualStopRatio]) == INVALID || (ratio = [self ratio]) >= stopRatio) 390 390 return 1.0; … … 405 405 } 406 406 407 - ( int) speedLimit: (BOOL) upload407 - (NSInteger) speedLimit: (BOOL) upload 408 408 { 409 409 return tr_torrentGetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN); 410 410 } 411 411 412 - (void) setSpeedLimit: ( int) limit upload: (BOOL) upload412 - (void) setSpeedLimit: (NSInteger) limit upload: (BOOL) upload 413 413 { 414 414 tr_torrentSetSpeedLimit(fHandle, upload ? TR_UP : TR_DOWN, limit); … … 473 473 NSArray * oldComponents = [oldFolder pathComponents], 474 474 * newComponents = [folder pathComponents]; 475 intcount;475 NSInteger count; 476 476 477 477 if ((count = [oldComponents count]) < [newComponents count] … … 559 559 560 560 //determine amount needed 561 for ( inti = 0; i < [self fileCount]; i++)561 for (NSInteger i = 0; i < [self fileCount]; i++) 562 562 { 563 563 if (tr_torrentGetFileDL(fHandle, i)) … … 655 655 } 656 656 657 - (void) destinationChoiceClosed: (NSOpenPanel *) openPanel returnCode: ( int) code contextInfo: (void *) context657 - (void) destinationChoiceClosed: (NSOpenPanel *) openPanel returnCode: (NSInteger) code contextInfo: (void *) context 658 658 { 659 659 if (code != NSOKButton) … … 728 728 - (NSDate *) lastAnnounceTime 729 729 { 730 intdate = fStat->lastAnnounceTime;730 NSInteger date = fStat->lastAnnounceTime; 731 731 return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil; 732 732 } 733 733 734 - ( int) nextAnnounceTime735 { 736 intdate = fStat->nextAnnounceTime;734 - (NSInteger) nextAnnounceTime 735 { 736 NSInteger date = fStat->nextAnnounceTime; 737 737 NSTimeInterval difference; 738 738 switch (date) … … 744 744 default: 745 745 difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow]; 746 return difference > 0 ? ( int)difference : STAT_TIME_NONE;746 return difference > 0 ? (NSInteger)difference : STAT_TIME_NONE; 747 747 } 748 748 } … … 760 760 - (NSDate *) lastScrapeTime 761 761 { 762 intdate = fStat->lastScrapeTime;762 NSInteger date = fStat->lastScrapeTime; 763 763 return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil; 764 764 } 765 765 766 - ( int) nextScrapeTime767 { 768 intdate = fStat->nextScrapeTime;766 - (NSInteger) nextScrapeTime 767 { 768 NSInteger date = fStat->nextScrapeTime; 769 769 NSTimeInterval difference; 770 770 switch (date) … … 776 776 default: 777 777 difference = [[NSDate dateWithTimeIntervalSince1970: date] timeIntervalSinceNow]; 778 return difference > 0 ? ( int)difference : STAT_TIME_NONE;778 return difference > 0 ? (NSInteger)difference : STAT_TIME_NONE; 779 779 } 780 780 } … … 787 787 - (NSMutableArray *) allTrackers: (BOOL) separators 788 788 { 789 intcount = fInfo->trackerCount, capacity = count;789 NSInteger count = fInfo->trackerCount, capacity = count; 790 790 if (separators) 791 791 capacity += fInfo->trackers[count-1].tier + 1; 792 792 NSMutableArray * allTrackers = [NSMutableArray arrayWithCapacity: capacity]; 793 793 794 for ( inti = 0, tier = -1; i < count; i++)794 for (NSInteger i = 0, tier = -1; i < count; i++) 795 795 { 796 796 if (separators && tier != fInfo->trackers[i].tier) … … 809 809 { 810 810 //find added tracker at end of first tier 811 inti;811 NSInteger i; 812 812 for (i = 1; i < [trackers count]; i++) 813 813 if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]]) … … 860 860 - (NSDate *) dateCreated 861 861 { 862 intdate = fInfo->dateCreated;862 NSInteger date = fInfo->dateCreated; 863 863 return date > 0 ? [NSDate dateWithTimeIntervalSince1970: date] : nil; 864 864 } 865 865 866 - ( int) pieceSize866 - (NSInteger) pieceSize 867 867 { 868 868 return fInfo->pieceSize; 869 869 } 870 870 871 - ( int) pieceCount871 - (NSInteger) pieceCount 872 872 { 873 873 return fInfo->pieceCount; … … 904 904 } 905 905 906 - ( float) progress906 - (CGFloat) progress 907 907 { 908 908 return fStat->percentComplete; 909 909 } 910 910 911 - ( float) progressDone911 - (CGFloat) progressDone 912 912 { 913 913 return fStat->percentDone; 914 914 } 915 915 916 - ( float) progressLeft917 { 918 return ( float)[self sizeLeft] / [self size];919 } 920 921 - ( float) checkingProgress916 - (CGFloat) progressLeft 917 { 918 return (CGFloat)[self sizeLeft] / [self size]; 919 } 920 921 - (CGFloat) checkingProgress 922 922 { 923 923 return fStat->recheckProgress; 924 924 } 925 925 926 - ( int) eta926 - (NSInteger) eta 927 927 { 928 928 return fStat->eta; 929 929 } 930 930 931 - ( int) etaRatio931 - (NSInteger) etaRatio 932 932 { 933 933 if (![self isSeeding]) 934 934 return TR_ETA_UNKNOWN; 935 935 936 float uploadRate = [self uploadRate];936 CGFloat uploadRate = [self uploadRate]; 937 937 if (uploadRate < 0.1) 938 938 return TR_ETA_UNKNOWN; 939 939 940 float stopRatio = [self actualStopRatio], ratio = [self ratio];940 CGFloat stopRatio = [self actualStopRatio], ratio = [self ratio]; 941 941 if (stopRatio == INVALID || ratio >= stopRatio) 942 942 return TR_ETA_UNKNOWN; 943 943 944 return ( float)MAX([self downloadedTotal], [self haveTotal]) * (stopRatio - ratio) / uploadRate / 1024.0;945 } 946 947 - ( float) notAvailableDesired948 { 949 return 1.0 - ( float)fStat->desiredAvailable / [self sizeLeft];944 return (CGFloat)MAX([self downloadedTotal], [self haveTotal]) * (stopRatio - ratio) / uploadRate / 1024.0; 945 } 946 947 - (CGFloat) notAvailableDesired 948 { 949 return 1.0 - (CGFloat)fStat->desiredAvailable / [self sizeLeft]; 950 950 } 951 951 … … 1000 1000 - (NSArray *) peers 1001 1001 { 1002 inttotalPeers;1002 NSInteger totalPeers; 1003 1003 tr_peer_stat * peers = tr_torrentPeers(fHandle, &totalPeers); 1004 1004 1005 1005 NSMutableArray * peerDicts = [NSMutableArray arrayWithCapacity: totalPeers]; 1006 1006 1007 for ( inti = 0; i < totalPeers; i++)1007 for (NSInteger i = 0; i < totalPeers; i++) 1008 1008 { 1009 1009 tr_peer_stat * peer = &peers[i]; … … 1038 1038 - (NSArray *) webSeeds 1039 1039 { 1040 const intwebSeedCount = fInfo->webseedCount;1040 const NSInteger webSeedCount = fInfo->webseedCount; 1041 1041 NSMutableArray * webSeeds = [NSMutableArray arrayWithCapacity: webSeedCount]; 1042 1042 1043 1043 float * dlSpeeds = tr_torrentWebSpeeds(fHandle); 1044 1044 1045 for ( inti = 0; i < webSeedCount; i++)1045 for (NSInteger i = 0; i < webSeedCount; i++) 1046 1046 { 1047 1047 NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 2]; … … 1066 1066 if (![self allDownloaded]) 1067 1067 { 1068 float progress;1068 CGFloat progress; 1069 1069 if ([self isFolder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"]) 1070 1070 { … … 1112 1112 && (fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"])))) 1113 1113 { 1114 inteta = fStat->activity == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];1114 NSInteger eta = fStat->activity == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio]; 1115 1115 string = [string stringByAppendingFormat: @" - %@", [self etaString: eta]]; 1116 1116 } … … 1164 1164 "Torrent -> status string"), [self peersSendingToUs]]; 1165 1165 1166 intwebSeedCount = fStat->webseedsSendingToUs;1166 NSInteger webSeedCount = fStat->webseedsSendingToUs; 1167 1167 if (webSeedCount > 0) 1168 1168 { … … 1281 1281 } 1282 1282 1283 - ( int) seeders1283 - (NSInteger) seeders 1284 1284 { 1285 1285 return fStat->seeders; 1286 1286 } 1287 1287 1288 - ( int) leechers1288 - (NSInteger) leechers 1289 1289 { 1290 1290 return fStat->leechers; 1291 1291 } 1292 1292 1293 - ( int) completedFromTracker1293 - (NSInteger) completedFromTracker 1294 1294 { 1295 1295 return fStat->timesCompleted; 1296 1296 } 1297 1297 1298 - ( int) totalPeersConnected1298 - (NSInteger) totalPeersConnected 1299 1299 { 1300 1300 return fStat->peersConnected; 1301 1301 } 1302 1302 1303 - ( int) totalPeersTracker1303 - (NSInteger) totalPeersTracker 1304 1304 { 1305 1305 return fStat->peersFrom[TR_PEER_FROM_TRACKER]; 1306 1306 } 1307 1307 1308 - ( int) totalPeersIncoming1308 - (NSInteger) totalPeersIncoming 1309 1309 { 1310 1310 return fStat->peersFrom[TR_PEER_FROM_INCOMING]; 1311 1311 } 1312 1312 1313 - ( int) totalPeersCache1313 - (NSInteger) totalPeersCache 1314 1314 { 1315 1315 return fStat->peersFrom[TR_PEER_FROM_CACHE]; 1316 1316 } 1317 1317 1318 - ( int) totalPeersPex1318 - (NSInteger) totalPeersPex 1319 1319 { 1320 1320 return fStat->peersFrom[TR_PEER_FROM_PEX]; 1321 1321 } 1322 1322 1323 - ( int) totalPeersKnown1323 - (NSInteger) totalPeersKnown 1324 1324 { 1325 1325 return fStat->peersKnown; 1326 1326 } 1327 1327 1328 - ( int) peersSendingToUs1328 - (NSInteger) peersSendingToUs 1329 1329 { 1330 1330 return fStat->peersSendingToUs; 1331 1331 } 1332 1332 1333 - ( int) peersGettingFromUs1333 - (NSInteger) peersGettingFromUs 1334 1334 { 1335 1335 return fStat->peersGettingFromUs; 1336 1336 } 1337 1337 1338 - ( float) downloadRate1338 - (CGFloat) downloadRate 1339 1339 { 1340 1340 return fStat->rateDownload; 1341 1341 } 1342 1342 1343 - ( float) uploadRate1343 - (CGFloat) uploadRate 1344 1344 { 1345 1345 return fStat->rateUpload; 1346 1346 } 1347 1347 1348 - ( float) totalRate1348 - (CGFloat) totalRate 1349 1349 { 1350 1350 return [self downloadRate] + [self uploadRate]; … … 1381 1381 } 1382 1382 1383 - ( float) swarmSpeed1383 - (CGFloat) swarmSpeed 1384 1384 { 1385 1385 return fStat->swarmSpeed; 1386 1386 } 1387 1387 1388 - ( int) orderValue1388 - (NSInteger) orderValue 1389 1389 { 1390 1390 return fOrderValue; 1391 1391 } 1392 1392 1393 - (void) setOrderValue: ( int) orderValue1393 - (void) setOrderValue: (NSInteger) orderValue 1394 1394 { 1395 1395 fOrderValue = orderValue; 1396 1396 } 1397 1397 1398 - ( int) groupValue1398 - (NSInteger) groupValue 1399 1399 { 1400 1400 return fGroupValue; 1401 1401 } 1402 1402 1403 - (void) setGroupValue: ( int) goupValue1403 - (void) setGroupValue: (NSInteger) goupValue 1404 1404 { 1405 1405 fGroupValue = goupValue; 1406 1406 } 1407 1407 1408 - ( int) groupOrderValue1408 - (NSInteger) groupOrderValue 1409 1409 { 1410 1410 return [[GroupsController groups] rowValueForIndex: fGroupValue]; … … 1422 1422 } 1423 1423 1424 - ( int) fileCount1424 - (NSInteger) fileCount 1425 1425 { 1426 1426 return fInfo->fileCount; … … 1435 1435 } 1436 1436 1437 - ( float) fileProgress: (FileListNode *) node1437 - (CGFloat) fileProgress: (FileListNode *) node 1438 1438 { 1439 1439 if ([self isComplete]) … … 1449 1449 1450 1450 uint64_t have = 0; 1451 for ( intindex = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])1451 for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index]) 1452 1452 have += fFileStat[index].bytesCompleted; 1453 1453 1454 1454 NSAssert([node size], @"director in torrent file has size 0"); 1455 return ( float)have / [node size];1456 } 1457 1458 - (BOOL) canChangeDownloadCheckForFile: ( int) index1455 return (CGFloat)have / [node size]; 1456 } 1457 1458 - (BOOL) canChangeDownloadCheckForFile: (NSInteger) index 1459 1459 { 1460 1460 if (!fFileStat) … … 1472 1472 [self updateFileStat]; 1473 1473 1474 for ( intindex = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])1474 for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index]) 1475 1475 if (fFileStat[index].progress < 1.0) 1476 1476 return YES; … … 1478 1478 } 1479 1479 1480 - ( int) checkForFiles: (NSIndexSet *) indexSet1480 - (NSInteger) checkForFiles: (NSIndexSet *) indexSet 1481 1481 { 1482 1482 BOOL onState = NO, offState = NO; 1483 for ( intindex = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])1483 for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index]) 1484 1484 { 1485 1485 if (tr_torrentGetFileDL(fHandle, index) || ![self canChangeDownloadCheckForFile: index]) … … 1494 1494 } 1495 1495 1496 - (void) setFileCheckState: ( int) state forIndexes: (NSIndexSet *) indexSet1496 - (void) setFileCheckState: (NSInteger) state forIndexes: (NSIndexSet *) indexSet 1497 1497 { 1498 1498 NSUInteger count = [indexSet count]; … … 1508 1508 } 1509 1509 1510 - (void) setFilePriority: ( int) priority forIndexes: (NSIndexSet *) indexSet1510 - (void) setFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet 1511 1511 { 1512 1512 const NSUInteger count = [indexSet count]; … … 1519 1519 } 1520 1520 1521 - (BOOL) hasFilePriority: ( int) priority forIndexes: (NSIndexSet *) indexSet1522 { 1523 for ( intindex = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])1521 - (BOOL) hasFilePriority: (NSInteger) priority forIndexes: (NSIndexSet *) indexSet 1522 { 1523 for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index]) 1524 1524 if (priority == tr_torrentGetFilePriority(fHandle, index) && [self canChangeDownloadCheckForFile: index]) 1525 1525 return YES; … … 1532 1532 NSMutableSet * priorities = [NSMutableSet setWithCapacity: 3]; 1533 1533 1534 for ( intindex = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])1534 for (NSInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index]) 1535 1535 { 1536 1536 if (![self canChangeDownloadCheckForFile: index]) 1537 1537 continue; 1538 1538 1539 intpriority = tr_torrentGetFilePriority(fHandle, index);1539 NSInteger priority = tr_torrentGetFilePriority(fHandle, index); 1540 1540 if (priority == TR_PRI_LOW) 1541 1541 { … … 1588 1588 } 1589 1589 1590 - ( int) stalledMinutes1590 - (NSInteger) stalledMinutes 1591 1591 { 1592 1592 time_t start = fStat->startDate; … … 1743 1743 if ([self isFolder]) 1744 1744 { 1745 intcount = [self fileCount];1745 NSInteger count = [self fileCount]; 1746 1746 NSMutableArray * fileList = [[NSMutableArray alloc] initWithCapacity: count]; 1747 1747 1748 for ( inti = 0; i < count; i++)1748 for (NSInteger i = 0; i < count; i++) 1749 1749 { 1750 1750 tr_file * file = &fInfo->files[i]; … … 1795 1795 } 1796 1796 1797 - (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: ( int) index1797 - (void) insertPath: (NSMutableArray *) components forParent: (FileListNode *) parent fileSize: (uint64_t) size index: (NSInteger) index 1798 1798 { 1799 1799 NSString * name = [components objectAtIndex: 0]; … … 1931 1931 } 1932 1932 1933 - (NSString *) etaString: ( int) eta1933 - (NSString *) etaString: (NSInteger) eta 1934 1934 { 1935 1935 switch (eta) … … 1947 1947 { 1948 1948 //get count 1949 intcount = 0;1949 NSInteger count = 0; 1950 1950 NSEnumerator * enumerator = [trackers objectEnumerator]; 1951 1951 id object; … … 1956 1956 //recreate the tracker structure 1957 1957 tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count); 1958 int tier = 0; 1959 int i = 0; 1958 NSInteger tier = 0, i = 0; 1960 1959 enumerator = [trackers objectEnumerator]; 1961 1960 while ((object = [enumerator nextObject]))
Note: See TracChangeset
for help on using the changeset viewer.