mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-31 03:12:44 +00:00
Code Issues Releases Wiki Activity

redo [6731] using the built-in stringByTrimmingCharactersInSet:

Browse source
This commit is contained in:
Mitchell Livingston 2008-09-06 13:49:20 +00:00
parent fbea64b8ae
commit b121a59172
4 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macosx/CreatorWindowController.m
View file

@ -311,7 +311,7 @@
{
NSString * tracker = (NSString *)object;
tracker = [tracker stringByTrimmingWhitespace];
tracker = [tracker stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
if ([tracker rangeOfString: @"://"].location == NSNotFound)
tracker = [@"http://" stringByAppendingString: tracker];

2
macosx/NSStringAdditions.h
View file

@ -29,8 +29,6 @@
+ (NSString *) ellipsis;
- (NSString *) stringByAppendingEllipsis;
- (NSString *) stringByTrimmingWhitespace;
+ (NSString *) stringForFileSize: (uint64_t) size;
+ (NSString *) stringForSpeed: (float) speed;

13
macosx/NSStringAdditions.m
View file

@ -38,19 +38,6 @@
return [self stringByAppendingString: [NSString ellipsis]];
}
- (NSString *) stringByTrimmingWhitespace
{
NSString * newString = self;
while ([newString length] > 0 && [[NSCharacterSet whitespaceAndNewlineCharacterSet] characterIsMember:
[newString characterAtIndex: [newString length] - 1]])
newString = [newString substringToIndex: [newString length] - 1];
while ([newString length] > 0 && [[NSCharacterSet whitespaceAndNewlineCharacterSet] characterIsMember:
[newString characterAtIndex: 0]])
newString = [newString substringFromIndex: 1];
return newString;
}
+ (NSString *) stringForFileSize: (uint64_t) size
{
if (size < 1024)

2
macosx/Torrent.m
View file

@ -809,7 +809,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
NSString * tracker = [trackers objectAtIndex: i];
tracker = [tracker stringByTrimmingWhitespace];
tracker = [tracker stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
if ([tracker rangeOfString: @"://"].location == NSNotFound)
{