Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-26 05:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

eliminate some more enumerator objects

Browse Source
This commit is contained in:
Mitchell Livingston
2008-12-26 07:25:17 +00:00
parent 8710f27709
commit f3add380e5
6 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
macosx/PrefsController.m
View File

@@ -406,21 +406,20 @@ tr_session * fHandle;
NSArray * directories = [NSArray arrayWithObjects: @"/System/Library/Sounds", @"/Library/Sounds", @"Library/Sounds", nil];
BOOL isDirectory;
NSString * directory;
NSEnumerator * enumerator = [directories objectEnumerator];
while ((directory = [enumerator nextObject]))
for (NSString * directory in directories)
{
BOOL isDirectory;
if ([[NSFileManager defaultManager] fileExistsAtPath: directory isDirectory: &isDirectory] && isDirectory)
{
NSString * sound;
NSEnumerator * soundEnumerator = [[[NSFileManager defaultManager] directoryContentsAtPath: directory] objectEnumerator];
while ((sound = [soundEnumerator nextObject]))
NSArray * directoryContents = [[NSFileManager defaultManager] directoryContentsAtPath: directory];
for (NSString * sound in directoryContents)
{
sound = [sound stringByDeletingPathExtension];
if ([NSSound soundNamed: sound])
[sounds addObject: sound];
}
}
}
return sounds;
}
@@ -945,9 +944,7 @@ tr_session * fHandle;
if ([components count] == 4)
{
valid = true;
NSEnumerator * enumerator = [components objectEnumerator];
NSString * component;
while ((component = [enumerator nextObject]))
for (NSString * component in components)
{
if ([component isEqualToString: @"*"])
[newComponents addObject: component];
@@ -1142,9 +1139,7 @@ tr_session * fHandle;
{
NSToolbar * toolbar = [window toolbar];
NSString * itemIdentifier = [toolbar selectedItemIdentifier];
NSEnumerator * enumerator = [[toolbar items] objectEnumerator];
NSToolbarItem * item;
while ((item = [enumerator nextObject]))
for (NSToolbarItem * item in [toolbar items])
if ([[item itemIdentifier] isEqualToString: itemIdentifier])
{
[window setTitle: [item label]];