upgraded syntax to swift 2.0

revdotcom · Sep 29, 2015 · 734b252 · 734b252
1 parent e506880
commit 734b252
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 xcuserdata
+build/
diff --git a/Observable-Swift.xcodeproj/project.pbxproj b/Observable-Swift.xcodeproj/project.pbxproj
@@ -352,6 +352,8 @@
 		65263A941954BC5000B39269 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftMigration = 0700;
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = "Leszek Ślażyński";
 				TargetAttributes = {

diff --git a/Observable-Swift/Event.swift b/Observable-Swift/Event.swift
@@ -51,7 +51,7 @@ public struct Event<T>: UnownableEvent {
         _subscriptions.removeAll()
     }
 
-    public mutating func add(#owner : AnyObject, _ handler : HandlerType) -> SubscriptionType {
+    public mutating func add(owner owner : AnyObject, _ handler : HandlerType) -> SubscriptionType {
         return add(SubscriptionType(owner: owner, handler: handler))
     }
 

diff --git a/Observable-Swift/EventReference.swift b/Observable-Swift/EventReference.swift
@@ -34,7 +34,7 @@ public class EventReference<T>: OwnableEvent {
         event.removeAll()
     }
 
-    public func add(#owner : AnyObject, _ handler : HandlerType) -> SubscriptionType {
+    public func add(owner owner : AnyObject, _ handler : HandlerType) -> SubscriptionType {
         return event.add(owner: owner, handler)
     }
 

diff --git a/Observable-Swift/Observable.swift b/Observable-Swift/Observable.swift
@@ -31,7 +31,7 @@ public struct Observable<T> : UnownableObservable {
     didSet { afterChange.notify(ValueChange(oldValue, value)) }
     }
 
-    public mutating func unshare(#removeSubscriptions: Bool) {
+    public mutating func unshare(removeSubscriptions removeSubscriptions: Bool) {
         if removeSubscriptions {
             beforeChange = EventReference<ValueChange<T>>()
             afterChange = EventReference<ValueChange<T>>()

diff --git a/Observable-Swift/ObservableChainingProxy.swift b/Observable-Swift/ObservableChainingProxy.swift
@@ -56,11 +56,11 @@ public class ObservableChainingProxy<O1: AnyObservable, O2: AnyObservable>: Owna
         self.base = base
         self.path = path
 
-        var beforeSubscription = EventSubscription(owner: self) { [weak self] in
+        let beforeSubscription = EventSubscription(owner: self) { [weak self] in
             self!.beforeChange.notify(self!.targetChangeToValueChange($0))
         }
 
-        var afterSubscription = EventSubscription(owner: self) { [weak self] in
+        let afterSubscription = EventSubscription(owner: self) { [weak self] in
             self!.afterChange.notify(self!.targetChangeToValueChange($0))
         }
 

diff --git a/Observable-Swift/OwningEventReference.swift b/Observable-Swift/OwningEventReference.swift
@@ -41,7 +41,7 @@ public class OwningEventReference<T>: EventReference<T> {
         event.removeAll()
     }
 
-    public override func add(#owner : AnyObject, _ handler : HandlerType) -> SubscriptionType {
+    public override func add(owner owner : AnyObject, _ handler : HandlerType) -> SubscriptionType {
         let subscr = event.add(owner: owner, handler)
         if owned != nil {
             subscr.addOwnedObject(self)

diff --git a/Observable-Swift/Protocols.swift b/Observable-Swift/Protocols.swift
@@ -27,7 +27,7 @@ public protocol AnyEvent {
     mutating func removeAll()
 
     /// Create, add and return a subscription with given handler and owner.
-    mutating func add(#owner : AnyObject, _ handler : ValueType -> ()) -> EventSubscription<ValueType>
+    mutating func add(owner owner : AnyObject, _ handler : ValueType -> ()) -> EventSubscription<ValueType>
 
 }
 
@@ -64,7 +64,7 @@ public protocol WritableObservable : AnyObservable {
 /// Observable which is a value type. Elementary observables are value types.
 public protocol UnownableObservable : WritableObservable {
     /// Unshares events
-    mutating func unshare(#removeSubscriptions: Bool)
+    mutating func unshare(removeSubscriptions removeSubscriptions: Bool)
 }
 
 /// Observable which is a reference type. Compound observables are reference types.