From 556beea4c373395e16aa00ae7e5e5db8e6f46468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 24 Aug 2018 16:51:23 +0200
Subject: macOS: Update all deprecated enums to their 10.12+ equivalents
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I3034258da95c9c70eb6758db92967f438617f6e9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/plugins/platforms/cocoa/qcocoahelpers.mm | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qcocoahelpers.mm')

diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index c7ddd8458d..0f5ddfa49a 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -295,12 +295,12 @@ Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
 Qt::MouseButton cocoaButton2QtButton(NSEvent *event)
 {
     switch (event.type) {
-    case NSMouseMoved:
+    case NSEventTypeMouseMoved:
         return Qt::NoButton;
 
-    case NSRightMouseUp:
-    case NSRightMouseDown:
-    case NSRightMouseDragged:
+    case NSEventTypeRightMouseUp:
+    case NSEventTypeRightMouseDown:
+    case NSEventTypeRightMouseDragged:
         return Qt::RightButton;
 
     default:
@@ -318,22 +318,22 @@ Qt::MouseButton cocoaButton2QtButton(NSEvent *event)
 QEvent::Type cocoaEvent2QtMouseEvent(NSEvent *event)
 {
     switch (event.type) {
-    case NSLeftMouseDown:
-    case NSRightMouseDown:
-    case NSOtherMouseDown:
+    case NSEventTypeLeftMouseDown:
+    case NSEventTypeRightMouseDown:
+    case NSEventTypeOtherMouseDown:
         return QEvent::MouseButtonPress;
 
-    case NSLeftMouseUp:
-    case NSRightMouseUp:
-    case NSOtherMouseUp:
+    case NSEventTypeLeftMouseUp:
+    case NSEventTypeRightMouseUp:
+    case NSEventTypeOtherMouseUp:
         return QEvent::MouseButtonRelease;
 
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
+    case NSEventTypeLeftMouseDragged:
+    case NSEventTypeRightMouseDragged:
+    case NSEventTypeOtherMouseDragged:
         return QEvent::MouseMove;
 
-    case NSMouseMoved:
+    case NSEventTypeMouseMoved:
         return QEvent::MouseMove;
 
     default:
@@ -432,7 +432,7 @@ QT_END_NAMESPACE
     // FIXME: Not obvious, from Cocoa's documentation, that QString::toNSString() makes a deep copy
     button.title = (NSString *)cleanTitle.toCFString();
     ((NSButtonCell *)button.cell).font =
-            [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]];
+            [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSControlSizeRegular]];
     [self addSubview:button];
     return button;
 }
-- 
cgit v1.2.3