From d4baaede82f45d0ec2694854ec768b4d5dfa6751 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 7 Sep 2008 17:57:58 +0000 Subject: [PATCH] remove an unused method; trivial type changes --- macosx/CTGradient/CTGradientAdditions.h | 2 +- macosx/CTGradient/CTGradientAdditions.m | 2 +- macosx/CreatorWindowController.m | 6 +++--- macosx/PrefsController.h | 1 - macosx/PrefsController.m | 6 ------ 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/macosx/CTGradient/CTGradientAdditions.h b/macosx/CTGradient/CTGradientAdditions.h index 666b8a3bc..f1f5b1261 100644 --- a/macosx/CTGradient/CTGradientAdditions.h +++ b/macosx/CTGradient/CTGradientAdditions.h @@ -26,7 +26,7 @@ @interface CTGradient (ProgressBar) -+ (CTGradient *) progressGradientForRed: (float) redComponent green: (float) greenComponent blue: (float) blueComponent; ++ (CTGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent; + (CTGradient *)progressWhiteGradient; + (CTGradient *)progressGrayGradient; diff --git a/macosx/CTGradient/CTGradientAdditions.m b/macosx/CTGradient/CTGradientAdditions.m index bf9cfc1ce..09a55f25c 100644 --- a/macosx/CTGradient/CTGradientAdditions.m +++ b/macosx/CTGradient/CTGradientAdditions.m @@ -26,7 +26,7 @@ @implementation CTGradient (ProgressBar) -+ (CTGradient *) progressGradientForRed: (float) redComponent green: (float) greenComponent blue: (float) blueComponent ++ (CTGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent { CTGradientElement color1; color1.red = redComponent; diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m index 70dab62ab..3e24a653c 100644 --- a/macosx/CreatorWindowController.m +++ b/macosx/CreatorWindowController.m @@ -155,7 +155,7 @@ if (multifile) { NSString * fileString; - int count = fInfo->fileCount; + NSInteger count = fInfo->fileCount; if (count != 1) fileString = [NSString stringWithFormat: NSLocalizedString(@"%d files", "Create torrent -> info"), count]; else @@ -487,12 +487,12 @@ NSWindow * window = [self window]; NSRect windowRect = [window frame]; - float difference = [fProgressView frame].size.height - [[window contentView] frame].size.height; + CGFloat difference = [fProgressView frame].size.height - [[window contentView] frame].size.height; windowRect.origin.y -= difference; windowRect.size.height += difference; //don't allow vertical resizing - float height = windowRect.size.height; + CGFloat height = windowRect.size.height; [window setMinSize: NSMakeSize([window minSize].width, height)]; [window setMaxSize: NSMakeSize([window maxSize].width, height)]; diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index 472f787a5..03935cd81 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -64,7 +64,6 @@ + (void) setHandle: (tr_handle *) handle; + (tr_handle *) handle; -- (void) updatePortField; - (void) setPort: (id) sender; - (void) setNat: (id) sender; - (void) updatePortStatus; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index 52a697458..3a2eb22c2 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -322,12 +322,6 @@ tr_handle * fHandle; TOOLBAR_PEERS, TOOLBAR_NETWORK, TOOLBAR_REMOTE, nil]; } -//used by ipc -- (void) updatePortField -{ - [fPortField setIntValue: [fDefaults integerForKey: @"BindPort"]]; -} - - (void) setPort: (id) sender { int port = [sender intValue];