From cd893626cbab0e55ca9f9a5ef384532e978fe702 Mon Sep 17 00:00:00 2001
From: Akemi <der.richter@gmx.de>
Date: Sat, 9 Jun 2018 20:10:25 +0200
Subject: cocoa-cb: fix building with Swift 4.2

init is a reserved keyword and Swift 4.2 got a bit stricter about using
it. this could be fixed by adding apostrophes around init but makes the
code uglier. hence i just renamed init to initialized and for
consistency uninit to uninitialized.

Fixes #5899
---
 video/out/cocoa_cb_common.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'video/out/cocoa_cb_common.swift')

diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
index e6705902c4..a4aae9ff2a 100644
--- a/video/out/cocoa_cb_common.swift
+++ b/video/out/cocoa_cb_common.swift
@@ -35,11 +35,11 @@ class CocoaCB: NSObject {
     }
 
     enum State {
-        case uninit
+        case uninitialized
         case needsInit
-        case `init`
+        case initialized
     }
-    var backendState: State = .uninit
+    var backendState: State = .uninitialized
 
     let eventsLock = NSLock()
     var events: Int = 0
@@ -58,7 +58,7 @@ class CocoaCB: NSObject {
     }
 
     func preinit(_ vo: UnsafeMutablePointer<vo>) {
-        if backendState == .uninit {
+        if backendState == .uninitialized {
             backendState = .needsInit
 
             if let app = NSApp as? Application {
@@ -122,7 +122,7 @@ class CocoaCB: NSObject {
             window.isMovableByWindowBackground = true
         }
 
-        backendState = .init
+        backendState = .initialized
     }
 
     func updateWindowSize(_ vo: UnsafeMutablePointer<vo>) {
@@ -476,7 +476,7 @@ class CocoaCB: NSObject {
             }
             shutdown()
         case MPV_EVENT_PROPERTY_CHANGE:
-            if backendState == .init {
+            if backendState == .initialized {
                 handlePropertyChange(event)
             }
         default:
-- 
cgit v1.2.3