From 769b29ce68872b3f32e9233bf87154a278cc5ccc Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 16 Jul 2007 01:05:03 +0000 Subject: [PATCH] get compiling --- macosx/InfoWindowController.m | 4 ++-- macosx/Torrent.h | 4 ++-- macosx/Torrent.m | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 7b3b315d9..156d83b2d 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -432,8 +432,8 @@ else [fConnectedPeersField setStringValue: NSLocalizedString(@"info not available", "Inspector -> Peers tab -> peers")]; - [fDownloadingFromField setStringValue: active ? [NSString stringWithInt: [torrent peersUploading]] : @""]; - [fUploadingToField setStringValue: active ? [NSString stringWithInt: [torrent peersDownloading]] : @""]; + [fDownloadingFromField setStringValue: active ? [NSString stringWithInt: [torrent peersSendingToUs]] : @""]; + [fUploadingToField setStringValue: active ? [NSString stringWithInt: [torrent peersGettingFromUs]] : @""]; if (fPeers) [fPeers release]; diff --git a/macosx/Torrent.h b/macosx/Torrent.h index 4deacb842..9d0e82ba8 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -184,8 +184,8 @@ - (int) totalPeersCache; - (int) totalPeersPex; -- (int) peersUploading; -- (int) peersDownloading; +- (int) peersSendingToUs; +- (int) peersGettingFromUs; - (float) downloadRate; - (float) uploadRate; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 968879950..7811cee5f 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -384,10 +384,10 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 [statusString setString: @""]; if ([self totalPeersConnected] != 1) [statusString appendFormat: NSLocalizedString(@"Downloading from %d of %d peers", - "Torrent -> status string"), [self peersUploading], [self totalPeersConnected]]; + "Torrent -> status string"), [self peersSendingToUs], [self totalPeersConnected]]; else [statusString appendFormat: NSLocalizedString(@"Downloading from %d of 1 peer", - "Torrent -> status string"), [self peersUploading]]; + "Torrent -> status string"), [self peersSendingToUs]]; int eta = [self eta]; if (eta < 0) @@ -427,10 +427,10 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 [statusString setString: @""]; if ([self totalPeersConnected] != 1) [statusString appendFormat: NSLocalizedString(@"Seeding to %d of %d peers", "Torrent -> status string"), - [self peersDownloading], [self totalPeersConnected]]; + [self peersSendingToUs], [self totalPeersConnected]]; else [statusString appendFormat: NSLocalizedString(@"Seeding to %d of 1 peer", "Torrent -> status string"), - [self peersDownloading]]; + [self peersGettingFromUs]]; break; @@ -1209,15 +1209,15 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 } //peers uploading to you -- (int) peersUploading +- (int) peersSendingToUs { - return fStat->peersUploading; + return fStat->peersSendingToUs; } //peers downloading from you -- (int) peersDownloading +- (int) peersGettingFromUs { - return fStat->peersDownloading; + return fStat->peersGettingFromUs; } - (float) downloadRate