Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

more type conversions and remove pointless method call

Browse Source
This commit is contained in:
Mitchell Livingston
2008-11-09 12:33:09 +00:00
parent 00ab31b454
commit 19870b5794
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
macosx/GroupsController.h
View File

@@ -31,23 +31,23 @@
+ (GroupsController *) groups;
- (int) numberOfGroups;
- (NSInteger) numberOfGroups;
- (int) rowValueForIndex: (int) index;
- (int) indexForRow: (int) row;
- (NSInteger) rowValueForIndex: (NSInteger) index;
- (NSInteger) indexForRow: (NSInteger) row;
- (NSString *) nameForIndex: (int) index;
- (void) setName: (NSString *) name forIndex: (int) index;
- (NSString *) nameForIndex: (NSInteger) index;
- (void) setName: (NSString *) name forIndex: (NSInteger) index;
- (NSImage *) imageForIndex: (int) index;
- (NSImage *) imageForIndex: (NSInteger) index;
- (NSColor *) colorForIndex: (int) index;
- (void) setColor: (NSColor *) color forIndex: (int) index;
- (NSColor *) colorForIndex: (NSInteger) index;
- (void) setColor: (NSColor *) color forIndex: (NSInteger) index;
- (void) addNewGroup;
- (void) removeGroupWithRowIndexes: (NSIndexSet *) rowIndexes;
- (NSIndexSet *) moveGroupsAtRowIndexes: (NSIndexSet *) indexes toRow: (int) newRow oldSelected: (NSIndexSet *) selectedIndexes;
- (NSIndexSet *) moveGroupsAtRowIndexes: (NSIndexSet *) indexes toRow: (NSInteger) newRow oldSelected: (NSIndexSet *) selectedIndexes;
- (NSMenu *) groupMenuWithTarget: (id) target action: (SEL) action isSmall: (BOOL) small;

26
macosx/GroupsController.m
View File

@@ -106,12 +106,12 @@ GroupsController * fGroupsInstance = nil;
[super dealloc];
}
- (int) numberOfGroups
- (NSInteger) numberOfGroups
{
return [fGroups count];
}
- (int) rowValueForIndex: (int) index
- (NSInteger) rowValueForIndex: (NSInteger) index
{
if (index != -1)
{
@@ -122,40 +122,40 @@ GroupsController * fGroupsInstance = nil;
return -1;
}
- (int) indexForRow: (int) row
- (NSInteger) indexForRow: (NSInteger) row
{
return [[[fGroups objectAtIndex: row] objectForKey: @"Index"] intValue];
}
- (NSString *) nameForIndex: (int) index
- (NSString *) nameForIndex: (NSInteger) index
{
int orderIndex = [self rowValueForIndex: index];
NSInteger orderIndex = [self rowValueForIndex: index];
return orderIndex != -1 ? [[fGroups objectAtIndex: orderIndex] objectForKey: @"Name"] : nil;
}
- (void) setName: (NSString *) name forIndex: (int) index
- (void) setName: (NSString *) name forIndex: (NSInteger) index
{
int orderIndex = [self rowValueForIndex: index];
NSInteger orderIndex = [self rowValueForIndex: index];
[[fGroups objectAtIndex: orderIndex] setObject: name forKey: @"Name"];
[self saveGroups];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGroups" object: self];
}
- (NSImage *) imageForIndex: (int) index
- (NSImage *) imageForIndex: (NSInteger) index
{
int orderIndex = [self rowValueForIndex: index];
NSInteger orderIndex = [self rowValueForIndex: index];
return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]]
: [NSImage imageNamed: @"GroupsNoneTemplate.png"];
}
- (NSColor *) colorForIndex: (int) index
- (NSColor *) colorForIndex: (NSInteger) index
{
int orderIndex = [self rowValueForIndex: index];
NSInteger orderIndex = [self rowValueForIndex: index];
return orderIndex != -1 ? [[fGroups objectAtIndex: orderIndex] objectForKey: @"Color"] : nil;
}
- (void) setColor: (NSColor *) color forIndex: (int) index
- (void) setColor: (NSColor *) color forIndex: (NSInteger) index
{
NSMutableDictionary * dict = [fGroups objectAtIndex: [self rowValueForIndex: index]];
[dict removeObjectForKey: @"Icon"];
@@ -211,7 +211,7 @@ GroupsController * fGroupsInstance = nil;
[self saveGroups];
}
- (NSIndexSet *) moveGroupsAtRowIndexes: (NSIndexSet *) indexes toRow: (int) newRow oldSelected: (NSIndexSet *) selectedIndexes
- (NSIndexSet *) moveGroupsAtRowIndexes: (NSIndexSet *) indexes toRow: (NSInteger) newRow oldSelected: (NSIndexSet *) selectedIndexes
{
NSArray * selectedGroups = [fGroups objectsAtIndexes: selectedIndexes];

2
macosx/PrefsController.m
View File

@@ -715,9 +715,7 @@ tr_handle * fHandle;
- (void) setProxyAddress: (id) sender
{
NSString * address = [sender stringValue];
tr_sessionSetProxy(fHandle, [address UTF8String]);
[sender setStringValue: address];
[fDefaults setObject: address forKey: @"ProxyAddress"];
}