Changeset 14667

Timestamp:

Jan 8, 2016, 10:05:19 AM (6 years ago)

Author:

mikedld

Message:

Get rid of some more deprecation warnings (OS X)

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• InfoFileViewController.m (modified) (1 diff)
• InfoWindowController.m (modified) (2 diffs)
• PrefsController.m (modified) (1 diff)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -3644 +3644 @@
         
         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;

trunk/macosx/InfoFileViewController.m

@@ -196 +196 @@
             
             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;

trunk/macosx/InfoWindowController.m

@@ -298 +298 @@
     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;
@@ -309 +309 @@
             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;

trunk/macosx/PrefsController.m

@@ -1463 +1463 @@
     
     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;

trunk/macosx/Torrent.m

@@ -653 +653 @@
         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;
 }