Changeset 12943

Timestamp:

Oct 6, 2011, 2:16:19 AM (11 years ago)

Author:

livings124

Message:

remove most instances of deprecated filename and filenames methods

Location:

trunk/macosx

Files:

• AddMagnetWindowController.m (modified) (1 diff)
• AddWindowController.m (modified) (1 diff)
• Controller.m (modified) (2 diffs)
• CreatorWindowController.m (modified) (2 diffs)
• GroupsPrefsController.m (modified) (1 diff)
• MessageWindowController.m (modified) (2 diffs)
• PrefsController.m (modified) (4 diffs)

trunk/macosx/AddMagnetWindowController.m

@@ -231 +231 @@
 {
     if (code == NSOKButton)
-        [self setDestinationPath: [[openPanel filenames] objectAtIndex: 0]];
+        [self setDestinationPath: [[[openPanel URLs] objectAtIndex: 0] path]];
     else
     {

trunk/macosx/AddWindowController.m

@@ -328 +328 @@
     {
         fLockDestination = NO;
-        [self setDestinationPath: [[openPanel filenames] objectAtIndex: 0]];
+        [self setDestinationPath: [[[openPanel URLs] objectAtIndex: 0] path]];
     }
     else

trunk/macosx/Controller.m

@@ -1446 +1446 @@
     {
         for (Torrent * torrent in torrents)
-            [torrent moveTorrentDataFileTo: [[panel filenames] objectAtIndex: 0]];
+            [torrent moveTorrentDataFileTo: [[[panel URLs] objectAtIndex: 0] path]];
     }
     
@@ -1502 +1502 @@
     //copy torrent to new location with name of data file
     if (code == NSOKButton)
-        [[torrents objectAtIndex: 0] copyTorrentFileTo: [panel filename]];
+        [[torrents objectAtIndex: 0] copyTorrentFileTo: [[panel URL] path]];
     
     [torrents removeObjectAtIndex: 0];

trunk/macosx/CreatorWindowController.m

@@ -405 +405 @@
     
     BOOL success = [panel runModal] == NSOKButton;
-    return success ? [[panel filenames] objectAtIndex: 0] : nil;
+    return success ? [[[panel URLs] objectAtIndex: 0] path] : nil;
 }
 
@@ -413 +413 @@
     {
         [fLocation release];
-        fLocation = [[panel filename] retain];
+        fLocation = [[[panel URL] path] retain];
         
         [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]];

trunk/macosx/GroupsPrefsController.m

@@ -222 +222 @@
     if (code == NSOKButton)
     {
-        NSString * path = [[openPanel filenames] objectAtIndex: 0];
+        NSString * path = [[[openPanel URLs] objectAtIndex: 0] path];
         [[GroupsController groups] setCustomDownloadLocation: path forIndex: index];
         [[GroupsController groups] setUsesCustomDownloadLocation: YES forIndex: index];

trunk/macosx/MessageWindowController.m

@@ -405 +405 @@
         NSString * fileString = [messageStrings componentsJoinedByString: @"\n"];
         
-        if (![fileString writeToFile: [panel filename] atomically: YES encoding: NSUTF8StringEncoding error: nil])
+        if (![fileString writeToFile: [[panel URL] path] atomically: YES encoding: NSUTF8StringEncoding error: nil])
         {
             NSAlert * alert = [[NSAlert alloc] init];
@@ -412 +412 @@
             [alert setInformativeText: [NSString stringWithFormat:
                     NSLocalizedString(@"There was a problem creating the file \"%@\".",
-                    "Save log alert panel -> message"), [[panel filename] lastPathComponent]]];
+                    "Save log alert panel -> message"), [[[panel URL] path] lastPathComponent]]];
             [alert setAlertStyle: NSWarningAlertStyle];
             

trunk/macosx/PrefsController.m

@@ -1388 +1388 @@
         [fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
         
-        NSString * folder = [[openPanel filenames] objectAtIndex: 0];
+        NSString * folder = [[[openPanel URLs] objectAtIndex: 0] path];
         [fDefaults setObject: folder forKey: @"DownloadFolder"];
         [fDefaults setObject: @"Constant" forKey: @"DownloadChoice"];
@@ -1405 +1405 @@
     if (code == NSOKButton)
     {
-        NSString * folder = [[openPanel filenames] objectAtIndex: 0];
+        NSString * folder = [[[openPanel URLs] objectAtIndex: 0] path];
         [fDefaults setObject: folder forKey: @"IncompleteDownloadFolder"];
         
@@ -1422 +1422 @@
             [sharedQueue removePathFromQueue: [path stringByExpandingTildeInPath]];
         
-        path = [[openPanel filenames] objectAtIndex: 0];
+        path = [[[openPanel URLs] objectAtIndex: 0] path];
         [fDefaults setObject: path forKey: @"AutoImportDirectory"];
         [sharedQueue addPath: [path stringByExpandingTildeInPath]];
@@ -1438 +1438 @@
     if (code == NSOKButton)
     {
-        NSString * filePath = [[openPanel filenames] objectAtIndex: 0];
+        NSString * filePath = [[[openPanel URLs] objectAtIndex: 0] path];
         
         if ([[NSFileManager defaultManager] fileExistsAtPath: filePath])  // script file exists