Get rid of some more deprecation warnings (OS X)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 27963493661fc350de2bb387619801c80bbb6c2e..2c68104a2b51f97606536d889c892effb79eb51f 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -3643,7 +3643,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             return NSZeroRect;
         
         frame.origin = [fTableView convertPoint: frame.origin toView: nil];
-        frame.origin = [fWindow convertBaseToScreen: frame.origin];
+        frame = [fWindow convertRectToScreen: frame];
         frame.origin.y -= frame.size.height;
         return frame;
     }

diff --git a/macosx/InfoFileViewController.m b/macosx/InfoFileViewController.m
index 4bc4288c88f3343ff1639b09b00c58acfabb5861..6d64ee8a8c05bb96ac9ba5e0b7c210bcacda7d14 100644 (file)
--- a/macosx/InfoFileViewController.m
+++ b/macosx/InfoFileViewController.m
@@ -195,7 +195,7 @@
                 return NSZeroRect;
             
             frame.origin = [fileOutlineView convertPoint: frame.origin toView: nil];
-            frame.origin = [[[self view] window] convertBaseToScreen: frame.origin];
+            frame = [[[self view] window] convertRectToScreen: frame];
             frame.origin.y -= frame.size.height;
             return frame;
         }

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 603132e64dbcebb074ed82dff1d767865a29e4f2..a14fff8fc1d84792ee7d103274feb798b873b736 100644 (file)
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -297,7 +297,7 @@ typedef enum
     
     NSRect windowRect = [window frame], viewRect = [view frame];
     
-    const CGFloat difference = (NSHeight(viewRect) - oldHeight) * [window userSpaceScaleFactor];
+    const CGFloat difference = NSHeight(viewRect) - oldHeight;
     windowRect.origin.y -= difference;
     windowRect.size.height += difference;
     
@@ -308,7 +308,7 @@ typedef enum
             const CGFloat screenHeight = NSHeight([[window screen] visibleFrame]);
             if (NSHeight(windowRect) > screenHeight)
             {
-                const CGFloat difference = (screenHeight - NSHeight(windowRect)) * [window userSpaceScaleFactor];
+                const CGFloat difference = screenHeight - NSHeight(windowRect);
                 windowRect.origin.y -= difference;
                 windowRect.size.height += difference;
                 

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 35dccfa74c8319dafff163623901c280e3a991b3..e0e09e44ad9a59437a3787529968ff61fafc8b69 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -1462,7 +1462,7 @@
         return;
     
     NSRect windowRect = [window frame];
-    const CGFloat difference = (NSHeight([view frame]) - NSHeight([[window contentView] frame])) * [window userSpaceScaleFactor];
+    const CGFloat difference = NSHeight([view frame]) - NSHeight([[window contentView] frame]);
     windowRect.origin.y -= difference;
     windowRect.size.height += difference;
     

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index c6bd815964c484924e88ced18203b2c66a86b708..6b73daddb2f8f123ac85da927862091e3dbf5620 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -652,10 +652,9 @@ bool trashDataFile(const char * filename, tr_error ** error)
     if ([self isMagnet])
         return [NSImage imageNamed: @"Magnet"];
     
-    #warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6
     if (!fIcon)
-        fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self isFolder] ? NSFileTypeForHFSTypeCode(kGenericFolderIcon)
-                                                                                : [[self name] pathExtension]] retain];
+        fIcon = [self isFolder] ? [[NSImage imageNamed: NSImageNameFolder] retain]
+                                : [[[NSWorkspace sharedWorkspace] iconForFileType: [[self name] pathExtension]] retain];
     return fIcon;
 }