resolve warnings from 1.2

nghialv · May 24, 2015 · 9f7b064 · 9f7b064
1 parent 3f6a70b
commit 9f7b064
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/Net/Net.swift b/Net/Net.swift
@@ -208,13 +208,13 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
     }
 
     // MARK: NSURLSessionDelegate
-    func URLSessionDidFinishEventsForBackgroundURLSession(session: NSURLSession!) {
+    func URLSessionDidFinishEventsForBackgroundURLSession(session: NSURLSession) {
         // this will be call for every backgroud event
         eventsForBackgroundHandler?(session)
     }
 
     // MARK: NSURLSessionTaskDelegate
-    func URLSession(session: NSURLSession!, task: NSURLSessionTask!, didCompleteWithError error: NSError!) {
+    func URLSession(session: NSURLSession, task: NSURLSessionTask, didCompleteWithError error: NSError?) {
         if (error != nil) {
             if let downloadTask = task as? NSURLSessionDownloadTask {
                 let downloader = downloaders[downloadTask]
@@ -236,7 +236,7 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
         }
     }
 
-    func URLSession(session: NSURLSession!, task: NSURLSessionTask!, didSendBodyData bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) {
+    func URLSession(session: NSURLSession, task: NSURLSessionTask, didSendBodyData bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) {
         // upload progress
         if let uploadTask = task as? NSURLSessionUploadTask {
             let progress = Double(totalBytesSent) / Double(totalBytesExpectedToSend)
@@ -246,13 +246,12 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
         }
     }
 
-    func URLSession(session: NSURLSession!, task: NSURLSessionTask!, willPerformHTTPRedirection response: NSHTTPURLResponse!, newRequest request: NSURLRequest!, completionHandler: ((NSURLRequest!) -> Void)!) {
-
+    func URLSession(session: NSURLSession, task: NSURLSessionTask, willPerformHTTPRedirection response: NSHTTPURLResponse, newRequest request: NSURLRequest, completionHandler: (NSURLRequest!) -> Void) {
     }
 
 
     // MARK: NSURLSessionDownloadDelegate
-    func URLSession(session: NSURLSession!, downloadTask: NSURLSessionDownloadTask!, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) {
+    func URLSession(session: NSURLSession, downloadTask: NSURLSessionDownloadTask, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) {
         let progress = totalBytesExpectedToWrite == NSURLSessionTransferSizeUnknown ? -1.0 : Double(totalBytesWritten) / Double(totalBytesExpectedToWrite)
 
         let downloader = downloaders[downloadTask]

diff --git a/ios_example/example/AppDelegate.swift b/ios_example/example/AppDelegate.swift
@@ -23,18 +23,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         NSLog("handle event for background session")
     }
 
-    func applicationDidEnterBackground(application: UIApplication!) {
+    func applicationDidEnterBackground(application: UIApplication) {
         NSLog("App did enter background")
     }
-
-    func applicationWillEnterForeground(application: UIApplication!) {
-    }
-
-    func applicationDidBecomeActive(application: UIApplication!) {
-    }
-
-    func applicationWillTerminate(application: UIApplication!) {
-    }
-
 }
 
diff --git a/ios_example/example/HttpViewController.swift b/ios_example/example/HttpViewController.swift
@@ -19,11 +19,11 @@ class HttpViewController: UIViewController, NSXMLParserDelegate {
     }
 
     // MARK: NSXMLParser delegate
-    func parser(parser: NSXMLParser!, didStartElement elementName: String!, namespaceURI: String!, qualifiedName qName: String!, attributes attributeDict: [NSObject : AnyObject]!) {
+    func parser(parser: NSXMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [NSObject : AnyObject]) {
         NSLog("did start element : \(elementName)")
     }
 
-    func parser(parser: NSXMLParser!, foundCharacters string: String!) {
+    func parser(parser: NSXMLParser, foundCharacters string: String?) {
     }
 
     // MARK: Actions