Changeset 7032

Timestamp:

Nov 4, 2008, 1:31:24 AM (12 years ago)

Author:

livings124

Message:

even more type changes

Location:

trunk/macosx

Files:

• Badger.h (modified) (1 diff)
• CreatorWindowController.m (modified) (6 diffs)
• FilterButton.h (modified) (1 diff)
• FilterButton.m (modified) (1 diff)
• NSBezierPathAdditions.h (modified) (1 diff)
• NSBezierPathAdditions.m (modified) (1 diff)
• NSStringAdditions.h (modified) (1 diff)
• NSStringAdditions.m (modified) (2 diffs)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/Badger.h

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

trunk/macosx/CreatorWindowController.m

@@ -35 +35 @@
 + (NSString *) chooseFile;
 - (void) updateEnableOpenCheckForTrackers;
-- (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
-
-- (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (int) returnCode contextInfo: (void *) contextInfo;
+- (void) locationSheetClosed: (NSSavePanel *) openPanel returnCode: (NSInteger) code contextInfo: (void *) info;
+
+- (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
@@ -300 +300 @@
         [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];
@@ -364 +364 @@
 }
 
-- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (void *) info
+- (void) locationSheetClosed: (NSSavePanel *) panel returnCode: (NSInteger) code contextInfo: (void *) info
 {
     if (code == NSOKButton)
@@ -376 +376 @@
 }
 
-- (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))
@@ -393 +393 @@
     {
         NSArray * pathComponents = [fLocation pathComponents];
-        int count = [pathComponents count];
+        NSInteger count = [pathComponents count];
         
         NSAlert * alert = [[[NSAlert alloc] init] autorelease];
@@ -506 +506 @@
 }
 
-- (void) failureSheetClosed: (NSAlert *) alert returnCode: (int) code contextInfo: (void *) info
+- (void) failureSheetClosed: (NSAlert *) alert returnCode: (NSInteger) code contextInfo: (void *) info
 {
     [[alert window] orderOut: nil];

trunk/macosx/FilterButton.h

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

trunk/macosx/FilterButton.m

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

trunk/macosx/NSBezierPathAdditions.h

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

trunk/macosx/NSBezierPathAdditions.m

@@ -28 +28 @@
 @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];

trunk/macosx/NSStringAdditions.h

@@ -37 +37 @@
 
 + (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

trunk/macosx/NSStringAdditions.m

@@ -113 +113 @@
 }
 
-+ (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)];
@@ -120 +120 @@
     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")];

trunk/macosx/TorrentCell.m

@@ -394 +394 @@
             groupRect.origin.y--;
         }
-        CGFloat radius = minimal ? 3.0f : 6.0f;
+        const CGFloat radius = minimal ? 3.0f : 6.0f;
         
         NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue],