From 5975ae7a59ab8371e3f2cce12320e5579c11925b Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 13 Jul 2007 03:11:50 +0000 Subject: [PATCH] simplify some file view code...speed difference should be negligible --- macosx/InfoWindowController.m | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 7a78ed820..08ffd4c97 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -613,20 +613,13 @@ return NO; Torrent * torrent = [fTorrents objectAtIndex: 0]; - NSIndexSet * indexSet = [fFileOutline selectedRowIndexes], * itemIndexes; - NSMutableIndexSet * usedIndexes = [NSMutableIndexSet indexSet]; + NSIndexSet * indexSet = [fFileOutline selectedRowIndexes]; + NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet]; int i, index, state = (menuItem == fFileCheckItem) ? NSOnState : NSOffState; for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i]) - { - itemIndexes = [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"]; - if (![usedIndexes containsIndexes: itemIndexes]) - { - if ([torrent checkForFiles: itemIndexes] != state && [torrent canChangeDownloadCheckForFiles: itemIndexes]) - return YES; - [usedIndexes addIndexes: itemIndexes]; - } - } - return NO; + [itemIndexes addIndexes: [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"]]; + + return [torrent checkForFiles: itemIndexes] != state && [torrent canChangeDownloadCheckForFiles: itemIndexes]; } if (action == @selector(setOnlySelectedCheck:)) @@ -635,20 +628,13 @@ return NO; Torrent * torrent = [fTorrents objectAtIndex: 0]; - NSIndexSet * indexSet = [fFileOutline selectedRowIndexes], * itemIndexes; - NSMutableIndexSet * usedIndexes = [NSMutableIndexSet indexSet]; + NSIndexSet * indexSet = [fFileOutline selectedRowIndexes]; + NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet]; int i, index; for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i]) - { - itemIndexes = [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"]; - if (![usedIndexes containsIndexes: itemIndexes]) - { - if ([torrent canChangeDownloadCheckForFiles: itemIndexes]) - return YES; - [usedIndexes addIndexes: itemIndexes]; - } - } - return NO; + [itemIndexes addIndexes: [[fFileOutline itemAtRow: i] objectForKey: @"Indexes"]]; + + return [torrent canChangeDownloadCheckForFiles: itemIndexes]; } if (action == @selector(setPriority:))