From ace6821574977ca0082f953f0eed522960e276be Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Fri, 28 Aug 2009 23:40:11 +0000
Subject: [PATCH] remove a couple of 10.6 deprecated methods

---
 macosx/CreatorWindowController.m |  4 ++--
 macosx/GroupsPrefsController.m   |  4 ++--
 macosx/InfoWindowController.m    |  2 +-
 macosx/Torrent.m                 | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m
index 9aec7bfa6..57a390eb9 100644
--- a/macosx/CreatorWindowController.m
+++ b/macosx/CreatorWindowController.m
@@ -287,8 +287,8 @@
         [fTrackers addObject: @""];
         [fTrackerTable reloadData];
         
-        NSInteger row = [fTrackers count] - 1;
-        [fTrackerTable selectRow: row byExtendingSelection: NO];
+        const NSInteger row = [fTrackers count] - 1;
+        [fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
         [fTrackerTable editColumn: 0 row: row withEvent: nil select: YES];
     }
 }
diff --git a/macosx/GroupsPrefsController.m b/macosx/GroupsPrefsController.m
index c7fffe2d8..e9d383e75 100644
--- a/macosx/GroupsPrefsController.m
+++ b/macosx/GroupsPrefsController.m
@@ -133,7 +133,7 @@
             selectedRow++;
         else;
         
-        [fTableView selectRow: selectedRow byExtendingSelection: NO];
+        [fTableView selectRowIndexes: [NSIndexSet indexSetWithIndex: selectedRow] byExtendingSelection: NO];
         [fTableView reloadData];
     }
     
@@ -154,7 +154,7 @@
             [fTableView reloadData];
             
             row = [fTableView numberOfRows]-1;
-            [fTableView selectRow: row byExtendingSelection: NO];
+            [fTableView selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
             [fTableView scrollRowToVisible: row];
             
             [[fSelectedColorNameField window] makeFirstResponder: fSelectedColorNameField];
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index a5b3a8574..12188cc40 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -1686,7 +1686,7 @@ typedef enum
     
     [fTrackers insertObject: @"" atIndex: index];
     [fTrackerTable reloadData];
-    [fTrackerTable selectRow: index byExtendingSelection: NO];
+    [fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: index] byExtendingSelection: NO];
     [fTrackerTable editColumn: 0 row: index withEvent: nil select: YES];
 }
 
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index beae8e35e..1925cf3e7 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -493,8 +493,8 @@ int trashDataFile(const char * filename)
         [self quickPause];
         
         //allow if file can be moved or does not exist
-        if ([[NSFileManager defaultManager] movePath: [oldFolder stringByAppendingPathComponent: [self name]]
-                            toPath: [folder stringByAppendingPathComponent: [self name]] handler: nil]
+        if ([[NSFileManager defaultManager] moveItemAtPath: [oldFolder stringByAppendingPathComponent: [self name]]
+                            toPath: [folder stringByAppendingPathComponent: [self name]] error: NULL]
             || ![[NSFileManager defaultManager] fileExistsAtPath: [oldFolder stringByAppendingPathComponent: [self name]]])
         {
             //get rid of both incomplete folder and old download folder, even if move failed
@@ -529,7 +529,7 @@ int trashDataFile(const char * filename)
 
 - (void) copyTorrentFileTo: (NSString *) path
 {
-    [[NSFileManager defaultManager] copyPath: [self torrentLocation] toPath: path handler: nil];
+    [[NSFileManager defaultManager] copyItemAtPath: [self torrentLocation] toPath: path error: NULL];
 }
 
 - (BOOL) alertForRemainingDiskSpace
@@ -1807,8 +1807,8 @@ int trashDataFile(const char * filename)
             {
                 [self quickPause];
                 
-                if ([[NSFileManager defaultManager] movePath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]
-                                        toPath: [fDownloadFolder stringByAppendingPathComponent: [self name]] handler: nil])
+                if ([[NSFileManager defaultManager] moveItemAtPath: [[self downloadFolder] stringByAppendingPathComponent: [self name]]
+                                        toPath: [fDownloadFolder stringByAppendingPathComponent: [self name]] error: NULL])
                     [self updateDownloadFolder];
                 else
                     canMove = NO;