Merge pull request #7 from hyperoslo/improve/drop-self

Drop use of self

Author: 3lvis

Pod/PagesDemo/AppDelegate.swift

@@ -43,9 +43,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         target: pages,
         action: "next")
 
-      self.window = UIWindow(frame: UIScreen.mainScreen().bounds)
-      self.window?.rootViewController = navigationController
-      self.window?.makeKeyAndVisible()
+      window = UIWindow(frame: UIScreen.mainScreen().bounds)
+      window?.rootViewController = navigationController
+      window?.makeKeyAndVisible()
 
       return true
     }

Pod/Pod.xcodeproj/project.pbxproj

@@ -19,7 +19,6 @@
 		14C136521AB784B200B7B07A /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = CONTRIBUTING.md; path = ../CONTRIBUTING.md; sourceTree = "<group>"; };
 		14C136541AB784B200B7B07A /* LICENSE.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = LICENSE.md; path = ../LICENSE.md; sourceTree = "<group>"; };
 		14C136551AB784B200B7B07A /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
-		14C1365C1AB784BC00B7B07A /* .gitkeep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitkeep; sourceTree = "<group>"; };
 		BDA157F21AD7E6D90011D55A /* PagesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PagesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		BDA157F51AD7E6D90011D55A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BDA157F61AD7E6D90011D55A /* PagesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagesTests.swift; sourceTree = "<group>"; };
@@ -84,7 +83,6 @@
 		14C1365B1AB784BC00B7B07A /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				14C1365C1AB784BC00B7B07A /* .gitkeep */,
 				BDA157FB1AD7E6FF0011D55A /* PagesController.swift */,
 			);
 			name = Source;

Source/PagesController.swift

@@ -7,7 +7,7 @@ import UIKit
 
   public var enableSwipe = true {
     didSet {
-      self.toggle()
+      toggle()
     }
   }
 
@@ -23,45 +23,45 @@ import UIKit
         navigationOrientation: navigationOrientation,
         options: options)
 
-      self.add(pages)
+      add(pages)
   }
 
   public override func viewDidLoad() {
     super.viewDidLoad()
 
-    self.delegate = self
-    self.dataSource = self
-    self.goto(self.startPage)
+    delegate = self
+    dataSource = self
+    goto(startPage)
   }
 }
 
 // MARK: Public methods
 extension PagesController {
 
   public func goto(index: Int) {
-    if index > -1 && index < self.pages.count {
-      let viewController = self.pages[index]
-      self.currentIndex = index
-      self.setViewControllers([viewController],
-        direction: (index > self.currentIndex) ? .Forward : .Reverse,
+    if index > -1 && index < pages.count {
+      let viewController = pages[index]
+      currentIndex = index
+      setViewControllers([viewController],
+        direction: (index > currentIndex) ? .Forward : .Reverse,
         animated: true, completion: nil)
-      if self.setNavigationTitle {
-        self.title = viewController.title
+      if setNavigationTitle {
+        title = viewController.title
       }
     }
   }
 
   public func next() {
-    self.goto(self.currentIndex + 1)
+    goto(currentIndex + 1)
   }
 
   public func previous() {
-    self.goto(self.currentIndex - 1)
+    goto(currentIndex - 1)
   }
 
   public func add(viewControllers: [UIViewController]) {
     for viewController in viewControllers {
-      self.addViewController(viewController)
+      addViewController(viewController)
     }
   }
 }
@@ -72,20 +72,20 @@ extension PagesController {
 
   public func pageViewController(pageViewController: UIPageViewController, viewControllerBeforeViewController viewController: UIViewController) -> UIViewController? {
     let index = prevIndex(viewControllerIndex(viewController))
-    return self.pages.at(index)
+    return pages.at(index)
   }
 
   public func pageViewController(pageViewController: UIPageViewController, viewControllerAfterViewController viewController: UIViewController) -> UIViewController? {
     let index: Int? = nextIndex(viewControllerIndex(viewController))
-    return self.pages.at(index)
+    return pages.at(index)
   }
 
   public func presentationCountForPageViewController(pageViewController: UIPageViewController) -> Int {
-    return self.pages.count
+    return pages.count
   }
 
   public func presentationIndexForPageViewController(pageViewController: UIPageViewController) -> Int {
-    return self.currentIndex
+    return currentIndex
   }
 
 }
@@ -97,11 +97,11 @@ extension PagesController {
   public func pageViewController(pageViewController: UIPageViewController, willTransitionToViewControllers pendingViewControllers: [AnyObject]) {
 
     if let viewController = pendingViewControllers.first as? UIViewController,
-      index = self.viewControllerIndex(viewController) {
-        self.currentIndex = index
+      index = viewControllerIndex(viewController) {
+        currentIndex = index
 
-        if self.setNavigationTitle {
-          self.title = viewController.title
+        if setNavigationTitle {
+          title = viewController.title
         }
     }
   }
@@ -113,25 +113,25 @@ extension PagesController {
 extension PagesController {
 
   func viewControllerIndex(viewController: UIViewController) -> Int? {
-    return find(self.pages, viewController)
+    return find(pages, viewController)
   }
 
   private func toggle() {
-    for recognizer in self.gestureRecognizers {
-      (recognizer as! UIGestureRecognizer).enabled = self.enableSwipe
+    for recognizer in gestureRecognizers {
+      (recognizer as! UIGestureRecognizer).enabled = enableSwipe
     }
   }
 
   private func addViewController(viewController: UIViewController) {
-    self.pages.append(viewController)
+    pages.append(viewController)
 
-    if self.pages.count == 1 {
-      self.setViewControllers([viewController],
+    if pages.count == 1 {
+      setViewControllers([viewController],
         direction: .Forward,
         animated: true,
         completion: nil)
-      if self.setNavigationTitle {
-        self.title = viewController.title
+      if setNavigationTitle {
+        title = viewController.title
       }
     }
   }
@@ -140,7 +140,7 @@ extension PagesController {
 extension Array {
 
   func at(index: Int?) -> T? {
-    if let index = index where index >= 0 && index < self.endIndex {
+    if let index = index where index >= 0 && index < endIndex {
       return self[index]
     } else {
       return nil