Changeset 7032


Ignore:
Timestamp:
Nov 4, 2008, 1:31:24 AM (12 years ago)
Author:
livings124
Message:

even more type changes

Location:
trunk/macosx
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Badger.h

    r6737 r7032  
    3030    tr_handle * fLib;
    3131   
    32     NSInteger fCompleted;
     32    NSUInteger fCompleted;
    3333   
    3434    //tiger-only fields
    3535    NSImage * fDockIcon, * fBadge;
    3636    NSDictionary * fAttributes;
    37     NSInteger fCompletedBadged;
     37    NSUInteger fCompletedBadged;
    3838    BOOL fSpeedBadge, fQuittingTiger;
    3939}
  • trunk/macosx/CreatorWindowController.m

    r7013 r7032  
    3535+ (NSString *) chooseFile;
    3636- (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;
    4040- (void) createReal;
    4141- (void) checkProgress;
    42 - (void) failureSheetClosed: (NSAlert *) alert returnCode: (int) code contextInfo: (void *) info;
     42- (void) failureSheetClosed: (NSAlert *) alert returnCode: (NSInteger) code contextInfo: (void *) info;
    4343
    4444@end
     
    300300        [fTrackerTable reloadData];
    301301       
    302         int row = [fTrackers count] - 1;
     302        NSInteger row = [fTrackers count] - 1;
    303303        [fTrackerTable selectRow: row byExtendingSelection: NO];
    304304        [fTrackerTable editColumn: 0 row: row withEvent: nil select: YES];
     
    364364}
    365365
    366 - (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (void *) info
     366- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (NSInteger) code contextInfo: (void *) info
    367367{
    368368    if (code == NSOKButton)
     
    376376}
    377377
    378 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (int) returnCode contextInfo: (void *) contextInfo
     378- (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
    379379{
    380380    if (([NSApp isOnLeopardOrBetter] ? [[alert suppressionButton] state] == NSOnState : returnCode == NSAlertThirdButtonReturn))
     
    393393    {
    394394        NSArray * pathComponents = [fLocation pathComponents];
    395         int count = [pathComponents count];
     395        NSInteger count = [pathComponents count];
    396396       
    397397        NSAlert * alert = [[[NSAlert alloc] init] autorelease];
     
    506506}
    507507
    508 - (void) failureSheetClosed: (NSAlert *) alert returnCode: (int) code contextInfo: (void *) info
     508- (void) failureSheetClosed: (NSAlert *) alert returnCode: (NSInteger) code contextInfo: (void *) info
    509509{
    510510    [[alert window] orderOut: nil];
  • trunk/macosx/FilterButton.h

    r6995 r7032  
    2727@interface FilterButton : NSButton
    2828{
    29     NSInteger fCount;
     29    NSUInteger fCount;
    3030}
    3131
    32 - (void) setCount: (NSInteger) count;
     32- (void) setCount: (NSUInteger) count;
    3333
    3434@end
  • trunk/macosx/FilterButton.m

    r6995 r7032  
    3131    if ((self = [super initWithCoder: coder]))
    3232    {
    33         fCount = -1;
     33        fCount = NSNotFound;
    3434    }
    3535    return self;
    3636}
    3737
    38 - (void) setCount: (NSInteger) count
     38- (void) setCount: (NSUInteger) count
    3939{
    4040    if (count == fCount)
  • trunk/macosx/NSBezierPathAdditions.h

    r4423 r7032  
    2727@interface NSBezierPath (NSBezierPathAdditions)
    2828
    29 + (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (float) radius;
     29+ (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (CGFloat) radius;
    3030
    3131@end
  • trunk/macosx/NSBezierPathAdditions.m

    r4423 r7032  
    2828@implementation NSBezierPath (NSBezierPathAdditions)
    2929
    30 + (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (float) radius
     30+ (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (CGFloat) radius
    3131{
    3232    if ([NSApp isOnLeopardOrBetter])
    3333        return [self bezierPathWithRoundedRect: rect xRadius: radius yRadius: radius];
    3434   
    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);
    4141   
    4242    NSBezierPath * bp = [NSBezierPath bezierPath];
  • trunk/macosx/NSStringAdditions.h

    r6960 r7032  
    3737
    3838+ (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;
    4040
    4141- (NSComparisonResult) compareFinder: (NSString *) string; //how the Finder compares strings
  • trunk/macosx/NSStringAdditions.m

    r7024 r7032  
    113113}
    114114
    115 + (NSString *) timeString: (NSUInteger) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max
     115+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max
    116116{
    117117    NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: MIN(max, 4)];
     
    120120    if (max > 0 && seconds >= (24 * 60 * 60))
    121121    {
    122         NSInteger days = remaining / (24 * 60 * 60);
     122        NSUInteger days = remaining / (24 * 60 * 60);
    123123        if (days == 1)
    124124            [timeArray addObject: NSLocalizedString(@"1 day", "time string")];
  • trunk/macosx/TorrentCell.m

    r7018 r7032  
    394394            groupRect.origin.y--;
    395395        }
    396         CGFloat radius = minimal ? 3.0f : 6.0f;
     396        const CGFloat radius = minimal ? 3.0f : 6.0f;
    397397       
    398398        NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue],
Note: See TracChangeset for help on using the changeset viewer.