Changeset 7032
- Timestamp:
- Nov 4, 2008, 1:31:24 AM (12 years ago)
- Location:
- trunk/macosx
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Badger.h
r6737 r7032 30 30 tr_handle * fLib; 31 31 32 NS Integer fCompleted;32 NSUInteger fCompleted; 33 33 34 34 //tiger-only fields 35 35 NSImage * fDockIcon, * fBadge; 36 36 NSDictionary * fAttributes; 37 NS Integer fCompletedBadged;37 NSUInteger fCompletedBadged; 38 38 BOOL fSpeedBadge, fQuittingTiger; 39 39 } -
trunk/macosx/CreatorWindowController.m
r7013 r7032 35 35 + (NSString *) chooseFile; 36 36 - (void) updateEnableOpenCheckForTrackers; 37 - (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: ( int) code contextInfo: (void *) info;38 39 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: ( int) returnCode contextInfo: (void *) contextInfo;37 - (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (NSInteger) code contextInfo: (void *) info; 38 39 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo; 40 40 - (void) createReal; 41 41 - (void) checkProgress; 42 - (void) failureSheetClosed: (NSAlert *) alert returnCode: ( int) code contextInfo: (void *) info;42 - (void) failureSheetClosed: (NSAlert *) alert returnCode: (NSInteger) code contextInfo: (void *) info; 43 43 44 44 @end … … 300 300 [fTrackerTable reloadData]; 301 301 302 introw = [fTrackers count] - 1;302 NSInteger row = [fTrackers count] - 1; 303 303 [fTrackerTable selectRow: row byExtendingSelection: NO]; 304 304 [fTrackerTable editColumn: 0 row: row withEvent: nil select: YES]; … … 364 364 } 365 365 366 - (void) locationSheetClosed: (NSSavePanel *) panel returnCode: ( int) code contextInfo: (void *) info366 - (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (NSInteger) code contextInfo: (void *) info 367 367 { 368 368 if (code == NSOKButton) … … 376 376 } 377 377 378 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: ( int) returnCode contextInfo: (void *) contextInfo378 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo 379 379 { 380 380 if (([NSApp isOnLeopardOrBetter] ? [[alert suppressionButton] state] == NSOnState : returnCode == NSAlertThirdButtonReturn)) … … 393 393 { 394 394 NSArray * pathComponents = [fLocation pathComponents]; 395 intcount = [pathComponents count];395 NSInteger count = [pathComponents count]; 396 396 397 397 NSAlert * alert = [[[NSAlert alloc] init] autorelease]; … … 506 506 } 507 507 508 - (void) failureSheetClosed: (NSAlert *) alert returnCode: ( int) code contextInfo: (void *) info508 - (void) failureSheetClosed: (NSAlert *) alert returnCode: (NSInteger) code contextInfo: (void *) info 509 509 { 510 510 [[alert window] orderOut: nil]; -
trunk/macosx/FilterButton.h
r6995 r7032 27 27 @interface FilterButton : NSButton 28 28 { 29 NS Integer fCount;29 NSUInteger fCount; 30 30 } 31 31 32 - (void) setCount: (NS Integer) count;32 - (void) setCount: (NSUInteger) count; 33 33 34 34 @end -
trunk/macosx/FilterButton.m
r6995 r7032 31 31 if ((self = [super initWithCoder: coder])) 32 32 { 33 fCount = -1;33 fCount = NSNotFound; 34 34 } 35 35 return self; 36 36 } 37 37 38 - (void) setCount: (NS Integer) count38 - (void) setCount: (NSUInteger) count 39 39 { 40 40 if (count == fCount) -
trunk/macosx/NSBezierPathAdditions.h
r4423 r7032 27 27 @interface NSBezierPath (NSBezierPathAdditions) 28 28 29 + (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: ( float) radius;29 + (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (CGFloat) radius; 30 30 31 31 @end -
trunk/macosx/NSBezierPathAdditions.m
r4423 r7032 28 28 @implementation NSBezierPath (NSBezierPathAdditions) 29 29 30 + (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: ( float) radius30 + (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (CGFloat) radius 31 31 { 32 32 if ([NSApp isOnLeopardOrBetter]) 33 33 return [self bezierPathWithRoundedRect: rect xRadius: radius yRadius: radius]; 34 34 35 float minX = NSMinX(rect),36 minY = NSMinY(rect),37 maxX = NSMaxX(rect),38 maxY = NSMaxY(rect),39 midX = NSMidX(rect),40 midY = NSMidY(rect);35 CGFloat minX = NSMinX(rect), 36 minY = NSMinY(rect), 37 maxX = NSMaxX(rect), 38 maxY = NSMaxY(rect), 39 midX = NSMidX(rect), 40 midY = NSMidY(rect); 41 41 42 42 NSBezierPath * bp = [NSBezierPath bezierPath]; -
trunk/macosx/NSStringAdditions.h
r6960 r7032 37 37 38 38 + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds; 39 + (NSString *) timeString: ( NSUInteger) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max;39 + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max; 40 40 41 41 - (NSComparisonResult) compareFinder: (NSString *) string; //how the Finder compares strings -
trunk/macosx/NSStringAdditions.m
r7024 r7032 113 113 } 114 114 115 + (NSString *) timeString: ( NSUInteger) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max115 + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max 116 116 { 117 117 NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: MIN(max, 4)]; … … 120 120 if (max > 0 && seconds >= (24 * 60 * 60)) 121 121 { 122 NS Integer days = remaining / (24 * 60 * 60);122 NSUInteger days = remaining / (24 * 60 * 60); 123 123 if (days == 1) 124 124 [timeArray addObject: NSLocalizedString(@"1 day", "time string")]; -
trunk/macosx/TorrentCell.m
r7018 r7032 394 394 groupRect.origin.y--; 395 395 } 396 CGFloat radius = minimal ? 3.0f : 6.0f;396 const CGFloat radius = minimal ? 3.0f : 6.0f; 397 397 398 398 NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue],
Note: See TracChangeset
for help on using the changeset viewer.