Changeset 7081

Timestamp:

Nov 9, 2008, 12:33:09 PM (12 years ago)

Author:

livings124

Message:

more type conversions and remove pointless method call

Location:

trunk/macosx

Files:

• GroupsController.h (modified) (1 diff)
• GroupsController.m (modified) (4 diffs)
• PrefsController.m (modified) (1 diff)

trunk/macosx/GroupsController.h

@@ -32 +32 @@
 + (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;

trunk/macosx/GroupsController.m

@@ -107 +107 @@
 }
 
-- (int) numberOfGroups
+- (NSInteger) numberOfGroups
 {
     return [fGroups count];
 }
 
-- (int) rowValueForIndex: (int) index
+- (NSInteger) rowValueForIndex: (NSInteger) index
 {
     if (index != -1)
@@ -123 +123 @@
 }
 
-- (int) indexForRow: (int) row
+- (NSInteger) indexForRow: (NSInteger) row
 {
     return [[[fGroups objectAtIndex: row] objectForKey: @"Index"] intValue];
 }
 
-- (NSString *) nameForIndex: (int) index
-{
-    int orderIndex = [self rowValueForIndex: index];
+- (NSString *) nameForIndex: (NSInteger) index
+{
+    NSInteger orderIndex = [self rowValueForIndex: index];
     return orderIndex != -1 ? [[fGroups objectAtIndex: orderIndex] objectForKey: @"Name"] : nil;
 }
 
-- (void) setName: (NSString *) name forIndex: (int) index
-{
-    int orderIndex = [self rowValueForIndex: index];
+- (void) setName: (NSString *) name forIndex: (NSInteger) index
+{
+    NSInteger orderIndex = [self rowValueForIndex: index];
     [[fGroups objectAtIndex: orderIndex] setObject: name forKey: @"Name"];
     [self saveGroups];
@@ -143 +143 @@
 }
 
-- (NSImage *) imageForIndex: (int) index
-{
-    int orderIndex = [self rowValueForIndex: index];
+- (NSImage *) imageForIndex: (NSInteger) index
+{
+    NSInteger orderIndex = [self rowValueForIndex: index];
     return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]]
                             : [NSImage imageNamed: @"GroupsNoneTemplate.png"];
 }
 
-- (NSColor *) colorForIndex: (int) index
-{
-    int orderIndex = [self rowValueForIndex: index];
+- (NSColor *) colorForIndex: (NSInteger) 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]];
@@ -212 +212 @@
 }
 
-- (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];

trunk/macosx/PrefsController.m

@@ -716 +716 @@
 {
     NSString * address = [sender stringValue];
-    
     tr_sessionSetProxy(fHandle, [address UTF8String]);
-    [sender setStringValue: address];
     [fDefaults setObject: address forKey: @"ProxyAddress"];
 }