diff --git a/macosx/Badger.m b/macosx/Badger.m index a7aab8c51..52562be8b 100644 --- a/macosx/Badger.m +++ b/macosx/Badger.m @@ -95,7 +95,7 @@ badgeRect.origin.y += badgeBottomExtra; //place badge text - [self badgeString: [NSString stringWithInt: fCompleted] forRect: badgeRect]; + [self badgeString: [NSString stringWithFormat: @"%d", fCompleted] forRect: badgeRect]; [fDockIcon unlockFocus]; } diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 58ae27a30..b159495d0 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -395,9 +395,9 @@ Torrent * torrent = [fTorrents objectAtIndex: 0]; int seeders = [torrent seeders], leechers = [torrent leechers], downloaded = [torrent completedFromTracker]; - [fSeedersField setStringValue: seeders < 0 ? @"" : [NSString stringWithInt: seeders]]; - [fLeechersField setStringValue: leechers < 0 ? @"" : [NSString stringWithInt: leechers]]; - [fCompletedFromTrackerField setStringValue: downloaded < 0 ? @"" : [NSString stringWithInt: downloaded]]; + [fSeedersField setStringValue: seeders < 0 ? @"" : [NSString stringWithFormat: @"%d", seeders]]; + [fLeechersField setStringValue: leechers < 0 ? @"" : [NSString stringWithFormat: @"%d", leechers]]; + [fCompletedFromTrackerField setStringValue: downloaded < 0 ? @"" : [NSString stringWithFormat: @"%d", downloaded]]; BOOL active = [torrent isActive]; @@ -432,8 +432,8 @@ else [fConnectedPeersField setStringValue: NSLocalizedString(@"info not available", "Inspector -> Peers tab -> peers")]; - [fDownloadingFromField setStringValue: active ? [NSString stringWithInt: [torrent peersSendingToUs]] : @""]; - [fUploadingToField setStringValue: active ? [NSString stringWithInt: [torrent peersGettingFromUs]] : @""]; + [fDownloadingFromField setStringValue: active ? [NSString stringWithFormat: @"%d", [torrent peersSendingToUs]] : @""]; + [fUploadingToField setStringValue: active ? [NSString stringWithFormat: @"%d", [torrent peersGettingFromUs]] : @""]; [fPeers release]; fPeers = [[[torrent peers] sortedArrayUsingDescriptors: [self peerSortDescriptors]] retain]; diff --git a/macosx/StringAdditions.h b/macosx/StringAdditions.h index 421626bb3..3a61c593b 100644 --- a/macosx/StringAdditions.h +++ b/macosx/StringAdditions.h @@ -29,8 +29,6 @@ + (NSString *) ellipsis; - (NSString *) stringByAppendingEllipsis; -+ (NSString *) stringWithInt: (int) value; - + (NSString *) stringForFileSize: (uint64_t) size; + (NSString *) stringForSpeed: (float) speed; + (NSString *) stringForSpeedAbbrev: (float) speed; diff --git a/macosx/StringAdditions.m b/macosx/StringAdditions.m index 32021c655..0a52a1ab4 100644 --- a/macosx/StringAdditions.m +++ b/macosx/StringAdditions.m @@ -37,11 +37,6 @@ return [self stringByAppendingString: [NSString ellipsis]]; } -+ (NSString *) stringWithInt: (int) value -{ - return [NSString stringWithFormat: @"%d", value]; -} - + (NSString *) stringForFileSize: (uint64_t) size { if (size < 1024)