From fd01b7395d04ebc7bad97ac358d0e907f9d16b7d Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sat, 1 Nov 2008 22:08:02 +0000 Subject: [PATCH] trivial changes --- Transmission.xcodeproj/project.pbxproj | 20 +++++++-------- macosx/AddWindowController.h | 2 +- macosx/AddWindowController.m | 3 ++- macosx/Controller.h | 6 ++--- macosx/Controller.m | 3 +++ macosx/CreatorWindowController.m | 2 +- macosx/DragOverlayView.m | 34 +++++++++++++------------- macosx/DragOverlayWindow.m | 15 ++++++------ 8 files changed, 44 insertions(+), 41 deletions(-) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 3d0cc7cf2..d5f5abfe3 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -37,7 +37,7 @@ 4D36BBC90CA309AA00A63CA5 /* evutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D36BBC80CA309AA00A63CA5 /* evutil.c */; }; 4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3EA0A908AE13C600EA10C2 /* IOKit.framework */; }; 4D4ADFC70DA1631500A68297 /* blocklist.c in Sources */ = {isa = PBXBuildFile; fileRef = A2D3078E0D9EC45F0051FD27 /* blocklist.c */; }; - 4D4B7F6109E055660053C1EB /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; }; + 4D4B7F6109E055660053C1EB /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; 4D4C8BD00E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; }; 4D4C8BD10E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; }; 4D4C8BD20E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; }; @@ -46,7 +46,7 @@ 4D6DAAC7090CE00500F43C22 /* RevealOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D6DAAC5090CE00500F43C22 /* RevealOn.png */; }; 4D752E930913C949008EAAD4 /* Preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D752E920913C949008EAAD4 /* Preferences.png */; }; 4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; }; - 4D9A2BF909E16D4F002D0FF9 /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; }; + 4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; 4DA6FDBA0911233800450CB1 /* PauseOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB80911233800450CB1 /* PauseOn.png */; }; 4DA6FDBB0911233800450CB1 /* PauseOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB90911233800450CB1 /* PauseOff.png */; }; 4DA6FDC5091141AD00450CB1 /* ResumeOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDC3091141AD00450CB1 /* ResumeOff.png */; }; @@ -262,10 +262,10 @@ BE75C3700C72A0EF00DBEFE0 /* poll.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3630C72A0EF00DBEFE0 /* poll.c */; }; BE75C3710C72A0EF00DBEFE0 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3640C72A0EF00DBEFE0 /* select.c */; }; BE75C38A0C72A1ED00DBEFE0 /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE75C3490C729E9500DBEFE0 /* libevent.a */; }; - BEFC1C040C07753100B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; }; + BEFC1C040C07753100B0BB3C /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; }; BEFC1C1A0C07756200B0BB3C /* daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C0E0C07756200B0BB3C /* daemon.c */; }; - BEFC1CF40C07822400B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; }; + BEFC1CF40C07822400B0BB3C /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; BEFC1D050C07825A00B0BB3C /* remote.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C140C07756200B0BB3C /* remote.c */; }; BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; }; BEFC1E290C07861A00B0BB3C /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = BEFC1DF00C07861A00B0BB3C /* version.h */; }; @@ -397,7 +397,7 @@ 4D118E1808CB46B20033958F /* PrefsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PrefsController.h; path = macosx/PrefsController.h; sourceTree = ""; }; 4D118E1908CB46B20033958F /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PrefsController.m; path = macosx/PrefsController.m; sourceTree = ""; }; 4D18389709DEC0030047D688 /* libtransmission.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtransmission.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.0.9.7.dylib; path = /usr/lib/libcrypto.0.9.7.dylib; sourceTree = ""; }; + 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = ""; }; 4D2784360905709500687951 /* Transmission.icns */ = {isa = PBXFileReference; explicitFileType = image.icns; name = Transmission.icns; path = macosx/Images/Transmission.icns; sourceTree = ""; }; 4D364D9E091FBB2C00377D12 /* TorrentTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentTableView.h; path = macosx/TorrentTableView.h; sourceTree = ""; }; 4D364D9F091FBB2C00377D12 /* TorrentTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentTableView.m; path = macosx/TorrentTableView.m; sourceTree = ""; }; @@ -792,7 +792,7 @@ buildActionMask = 2147483647; files = ( 4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */, - 4D9A2BF909E16D4F002D0FF9 /* libcrypto.0.9.7.dylib in Frameworks */, + 4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */, A22E59A70DC11A1D00F4BE15 /* libcurl.dylib in Frameworks */, A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */, 4D4C8BD10E93DB720004ACB8 /* libz.dylib in Frameworks */, @@ -807,7 +807,7 @@ 4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */, A2C0C2E00E00CCE400D95339 /* Security.framework in Frameworks */, 4D1838DD09DEC0E80047D688 /* libtransmission.a in Frameworks */, - 4D4B7F6109E055660053C1EB /* libcrypto.0.9.7.dylib in Frameworks */, + 4D4B7F6109E055660053C1EB /* libcrypto.dylib in Frameworks */, A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */, A261F1DC0A69A1610002815A /* Growl.framework in Frameworks */, A29EBE710DC06068006CEE80 /* libcurl.dylib in Frameworks */, @@ -843,7 +843,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BEFC1C040C07753100B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */, + BEFC1C040C07753100B0BB3C /* libcrypto.dylib in Frameworks */, BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */, A22E59A80DC11A1F00F4BE15 /* libcurl.dylib in Frameworks */, A2B3FB530E59027100FF78FB /* Cocoa.framework in Frameworks */, @@ -855,7 +855,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BEFC1CF40C07822400B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */, + BEFC1CF40C07822400B0BB3C /* libcrypto.dylib in Frameworks */, BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */, A22E59A90DC11A2000F4BE15 /* libcurl.dylib in Frameworks */, A25E03D90E4015100086C225 /* Cocoa.framework in Frameworks */, @@ -1212,7 +1212,7 @@ 4DDBB71509E16B3F00284745 /* Libraries */ = { isa = PBXGroup; children = ( - 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */, + 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */, A29EBE700DC06068006CEE80 /* libcurl.dylib */, 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */, ); diff --git a/macosx/AddWindowController.h b/macosx/AddWindowController.h index 4d328029b..27e76d4d1 100644 --- a/macosx/AddWindowController.h +++ b/macosx/AddWindowController.h @@ -24,8 +24,8 @@ #import #import "Torrent.h" -#import "FileOutlineController.h" +@class FileOutlineController; @class Controller; @interface AddWindowController : NSWindowController diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m index 7bc60172e..75ea39f98 100644 --- a/macosx/AddWindowController.m +++ b/macosx/AddWindowController.m @@ -23,6 +23,7 @@ *****************************************************************************/ #import "AddWindowController.h" +#import "FileOutlineController.h" #import "Controller.h" #import "GroupsController.h" #import "NSStringAdditions.h" @@ -30,7 +31,7 @@ #import "NSApplicationAdditions.h" #import "ExpandedPathToIconTransformer.h" -#define UPDATE_SECONDS 1.0f +#define UPDATE_SECONDS 1.0 @interface AddWindowController (Private) diff --git a/macosx/Controller.h b/macosx/Controller.h index d8517bb10..2000d8f3f 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -30,13 +30,13 @@ #import "AddWindowController.h" #import "DragOverlayWindow.h" #import "Badger.h" -#import "StatusBarView.h" -#import "FilterButton.h" -#import "MenuLabel.h" #import @class TorrentTableView; +@class StatusBarView; +@class FilterButton; +@class MenuLabel; typedef enum { diff --git a/macosx/Controller.m b/macosx/Controller.m index 5caac8bd2..c2fdadc5f 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -40,6 +40,9 @@ #import "GroupToolbarItem.h" #import "ToolbarSegmentedCell.h" #import "BlocklistDownloader.h" +#import "StatusBarView.h" +#import "FilterButton.h" +#import "MenuLabel.h" #import "NSApplicationAdditions.h" #import "NSStringAdditions.h" #import "NSMenuAdditions.h" diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m index 6e62faef2..69a7a57a2 100644 --- a/macosx/CreatorWindowController.m +++ b/macosx/CreatorWindowController.m @@ -25,7 +25,7 @@ #import "CreatorWindowController.h" #import "NSApplicationAdditions.h" #import "NSStringAdditions.h" -#include "utils.h" //tr_httpIsValidURL +#import "utils.h" //tr_httpIsValidURL #define TRACKER_ADD_TAG 0 #define TRACKER_REMOVE_TAG 1 diff --git a/macosx/DragOverlayView.m b/macosx/DragOverlayView.m index 9e0d29820..8cdc711ea 100644 --- a/macosx/DragOverlayView.m +++ b/macosx/DragOverlayView.m @@ -25,8 +25,8 @@ #import "DragOverlayView.h" #import "NSBezierPathAdditions.h" -#define PADDING 10.0 -#define ICON_WIDTH 64.0 +#define PADDING 10.0f +#define ICON_WIDTH 64.0f @implementation DragOverlayView @@ -35,25 +35,25 @@ if ((self = [super initWithFrame: frame])) { //create badge - NSRect badgeRect = NSMakeRect(0, 0, 325.0, 84.0); - NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0]; + NSRect badgeRect = NSMakeRect(0.0f, 0.0f, 325.0f, 84.0f); + NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0f]; fBackBadge = [[NSImage alloc] initWithSize: badgeRect.size]; [fBackBadge lockFocus]; - [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.75] set]; + [[NSColor colorWithCalibratedWhite: 0.0f alpha: 0.75f] set]; [bp fill]; [fBackBadge unlockFocus]; //create attributes NSShadow * stringShadow = [[NSShadow alloc] init]; - [stringShadow setShadowOffset: NSMakeSize(2.0, -2.0)]; - [stringShadow setShadowBlurRadius: 4.0]; + [stringShadow setShadowOffset: NSMakeSize(2.0f, -2.0f)]; + [stringShadow setShadowBlurRadius: 4.0f]; NSFont * bigFont = [[NSFontManager sharedFontManager] convertFont: - [NSFont fontWithName: @"Lucida Grande" size: 18.0] toHaveTrait: NSBoldFontMask], - * smallFont = [NSFont fontWithName: @"Lucida Grande" size: 14.0]; + [NSFont fontWithName: @"Lucida Grande" size: 18.0f] toHaveTrait: NSBoldFontMask], + * smallFont = [NSFont fontWithName: @"Lucida Grande" size: 14.0f]; NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail]; @@ -94,20 +94,20 @@ [fBadge lockFocus]; //place icon - [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect - operation: NSCompositeSourceOver fraction: 1.0]; + [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5f, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect + operation: NSCompositeSourceOver fraction: 1.0f]; //place main text NSSize mainLineSize = [mainLine sizeWithAttributes: fMainLineAttributes]; NSSize subLineSize = [subLine sizeWithAttributes: fSubLineAttributes]; - NSRect lineRect = NSMakeRect(PADDING + ICON_WIDTH + 5.0, - (badgeSize.height + (subLineSize.height + 2.0 - mainLineSize.height)) * 0.5, - badgeSize.width - (PADDING + ICON_WIDTH + 2.0) - PADDING, mainLineSize.height); + NSRect lineRect = NSMakeRect(PADDING + ICON_WIDTH + 5.0f, + (badgeSize.height + (subLineSize.height + 2.0f - mainLineSize.height)) * 0.5f, + badgeSize.width - (PADDING + ICON_WIDTH + 2.0f) - PADDING, mainLineSize.height); [mainLine drawInRect: lineRect withAttributes: fMainLineAttributes]; //place sub text - lineRect.origin.y -= subLineSize.height + 2.0; + lineRect.origin.y -= subLineSize.height + 2.0f; lineRect.size.height = subLineSize.height; [subLine drawInRect: lineRect withAttributes: fSubLineAttributes]; @@ -122,8 +122,8 @@ { NSRect frame = [self frame]; NSSize imageSize = [fBadge size]; - [fBadge compositeToPoint: NSMakePoint((frame.size.width - imageSize.width) * 0.5, - (frame.size.height - imageSize.height) * 0.5) operation: NSCompositeSourceOver]; + [fBadge compositeToPoint: NSMakePoint((frame.size.width - imageSize.width) * 0.5f, + (frame.size.height - imageSize.height) * 0.5f) operation: NSCompositeSourceOver]; } } diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m index 132b71132..8814dafc9 100644 --- a/macosx/DragOverlayWindow.m +++ b/macosx/DragOverlayWindow.m @@ -36,8 +36,8 @@ { fLib = lib; - [self setBackgroundColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.5]]; - [self setAlphaValue: 0.0]; + [self setBackgroundColor: [NSColor colorWithCalibratedWhite: 0.0f alpha: 0.5f]]; + [self setAlphaValue: 0.0f]; [self setOpaque: NO]; [self setHasShadow: NO]; @@ -76,22 +76,21 @@ - (void) setTorrents: (NSArray *) files { uint64_t size = 0; - int count = 0; + NSInteger count = 0; NSString * name; BOOL folder; - int fileCount = 0; + NSInteger fileCount = 0; NSString * file; NSEnumerator * enumerator = [files objectEnumerator]; - tr_ctor * ctor; - tr_info info; while ((file = [enumerator nextObject])) { if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame) { - ctor = tr_ctorNew(fLib); + tr_ctor * ctor = tr_ctorNew(fLib); tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]); + tr_info info; if (tr_torrentParse(fLib, ctor, &info) == TR_OK) { count++; @@ -173,7 +172,7 @@ [fFadeInAnimation stopAnimation]; [fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]]; } - if ([self alphaValue] > 0.0) + if ([self alphaValue] > 0.0f) [fFadeOutAnimation startAnimation]; } -- 2.40.0