mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-04 02:28:03 +00:00
Code Issues Releases Wiki Activity

even more type changes

Browse source
This commit is contained in:
Mitchell Livingston 2008-11-04 01:31:24 +00:00
parent 8fa0863467
commit ddfe1eddfc
9 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
macosx/Badger.h
View file

@ -29,12 +29,12 @@
{
tr_handle * fLib;
NSInteger fCompleted;
NSUInteger fCompleted;
//tiger-only fields
NSImage * fDockIcon, * fBadge;
NSDictionary * fAttributes;
NSInteger fCompletedBadged;
NSUInteger fCompletedBadged;
BOOL fSpeedBadge, fQuittingTiger;
}

16
macosx/CreatorWindowController.m
View file

@ -34,12 +34,12 @@
+ (NSString *) chooseFile;
- (void) updateEnableOpenCheckForTrackers;
- (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
- (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (NSInteger) code contextInfo: (void *) info;
- (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (int) returnCode contextInfo: (void *) contextInfo;
- (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo;
- (void) createReal;
- (void) checkProgress;
- (void) failureSheetClosed: (NSAlert *) alert returnCode: (int) code contextInfo: (void *) info;
- (void) failureSheetClosed: (NSAlert *) alert returnCode: (NSInteger) code contextInfo: (void *) info;
@end
@ -299,7 +299,7 @@
[fTrackers addObject: @""];
[fTrackerTable reloadData];
int row = [fTrackers count] - 1;
NSInteger row = [fTrackers count] - 1;
[fTrackerTable selectRow: row byExtendingSelection: NO];
[fTrackerTable editColumn: 0 row: row withEvent: nil select: YES];
}
@ -363,7 +363,7 @@
[fOpenCheck setState: (fOpenTorrent && hasTracker) ? NSOnState : NSOffState];
}
- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (void *) info
- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (NSInteger) code contextInfo: (void *) info
{
if (code == NSOKButton)
{
@ -375,7 +375,7 @@
}
}
- (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (int) returnCode contextInfo: (void *) contextInfo
- (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
{
if (([NSApp isOnLeopardOrBetter] ? [[alert suppressionButton] state] == NSOnState : returnCode == NSAlertThirdButtonReturn))
[[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningCreatorBlankAddress"];
@ -392,7 +392,7 @@
if ([[NSFileManager defaultManager] fileExistsAtPath: fLocation])
{
NSArray * pathComponents = [fLocation pathComponents];
int count = [pathComponents count];
NSInteger count = [pathComponents count];
NSAlert * alert = [[[NSAlert alloc] init] autorelease];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> file already exists warning -> button")];
@ -505,7 +505,7 @@
}
}
- (void) failureSheetClosed: (NSAlert *) alert returnCode: (int) code contextInfo: (void *) info
- (void) failureSheetClosed: (NSAlert *) alert returnCode: (NSInteger) code contextInfo: (void *) info
{
[[alert window] orderOut: nil];
[[self window] close];

4
macosx/FilterButton.h
View file

@ -26,9 +26,9 @@
@interface FilterButton : NSButton
{
NSInteger fCount;
NSUInteger fCount;
}
- (void) setCount: (NSInteger) count;
- (void) setCount: (NSUInteger) count;
@end

4
macosx/FilterButton.m
View file

@ -30,12 +30,12 @@
{
if ((self = [super initWithCoder: coder]))
{
fCount = -1;
fCount = NSNotFound;
}
return self;
}
- (void) setCount: (NSInteger) count
- (void) setCount: (NSUInteger) count
{
if (count == fCount)
return;

2
macosx/NSBezierPathAdditions.h
View file

@ -26,6 +26,6 @@
@interface NSBezierPath (NSBezierPathAdditions)
+ (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (float) radius;
+ (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (CGFloat) radius;
@end

14
macosx/NSBezierPathAdditions.m
View file

@ -27,17 +27,17 @@
@implementation NSBezierPath (NSBezierPathAdditions)
+ (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (float) radius
+ (NSBezierPath *) bezierPathWithRoundedRect: (NSRect) rect radius: (CGFloat) radius
{
if ([NSApp isOnLeopardOrBetter])
return [self bezierPathWithRoundedRect: rect xRadius: radius yRadius: radius];
float minX = NSMinX(rect),
minY = NSMinY(rect),
maxX = NSMaxX(rect),
maxY = NSMaxY(rect),
midX = NSMidX(rect),
midY = NSMidY(rect);
CGFloat minX = NSMinX(rect),
minY = NSMinY(rect),
maxX = NSMaxX(rect),
maxY = NSMaxY(rect),
midX = NSMidX(rect),
midY = NSMidY(rect);
NSBezierPath * bp = [NSBezierPath bezierPath];
[bp moveToPoint: NSMakePoint(maxX, midY)];

2
macosx/NSStringAdditions.h
View file

@ -36,7 +36,7 @@
+ (NSString *) stringForRatio: (CGFloat) ratio;
+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds;
+ (NSString *) timeString: (NSUInteger) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max;
+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max;
- (NSComparisonResult) compareFinder: (NSString *) string; //how the Finder compares strings
- (NSComparisonResult) compareNumeric: (NSString *) string; //simple compare method for strings with numbers (works for IP addresses)

4
macosx/NSStringAdditions.m
View file

@ -112,14 +112,14 @@
return [NSString timeString: seconds showSeconds: showSeconds maxFields: NSUIntegerMax];
}
+ (NSString *) timeString: (NSUInteger) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max
+ (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxFields: (NSUInteger) max
{
NSMutableArray * timeArray = [NSMutableArray arrayWithCapacity: MIN(max, 4)];
NSUInteger remaining = seconds;
if (max > 0 && seconds >= (24 * 60 * 60))
{
NSInteger days = remaining / (24 * 60 * 60);
NSUInteger days = remaining / (24 * 60 * 60);
if (days == 1)
[timeArray addObject: NSLocalizedString(@"1 day", "time string")];
else

2
macosx/TorrentCell.m
View file

@ -393,7 +393,7 @@
groupRect.size.height--;
groupRect.origin.y--;
}
CGFloat radius = minimal ? 3.0f : 6.0f;
const CGFloat radius = minimal ? 3.0f : 6.0f;
NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue],
* darkGroupColor = [groupColor blendedColorWithFraction: 0.2f ofColor: [NSColor whiteColor]];