Update for Xcode 6.1.1

free1990 · Dec 5, 2014 · d569b0e · d569b0e
1 parent 1d65295
commit d569b0e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/Client/Frontend/Bookmarks/BookmarksViewController.swift b/Client/Frontend/Bookmarks/BookmarksViewController.swift
@@ -77,20 +77,20 @@ class BookmarksViewController: UITableViewController {
         let cell: UITableViewCell = tableView.dequeueReusableCellWithIdentifier(BOOKMARK_CELL_IDENTIFIER, forIndexPath: indexPath) as UITableViewCell;
 
         if let image = (UIImage(named: "leaf.png")) {
-            cell.imageView.image = createMockFavicon(image)
+            cell.imageView!.image = createMockFavicon(image)
         }
 
         let bookmark = bookmarks[indexPath.row]
         // TODO: We need an async image loader api here
         favicons.getForUrl(NSURL(string: bookmark.url)!, options: nil, callback: { (icon: Favicon) -> Void in
             if let img = icon.img {
-                cell.imageView.image = createMockFavicon(img);
+                cell.imageView!.image = createMockFavicon(img);
             }
         });
 
-        cell.textLabel.text = bookmark.title
-        cell.textLabel.font = UIFont(name: "FiraSans-SemiBold", size: 13)
-        cell.textLabel.textColor = UIColor.darkGrayColor()
+        cell.textLabel!.text = bookmark.title
+        cell.textLabel!.font = UIFont(name: "FiraSans-SemiBold", size: 13)
+        cell.textLabel!.textColor = UIColor.darkGrayColor()
         cell.indentationWidth = 20
 
         return cell

diff --git a/Client/Frontend/Reader/SiteTableViewController.swift b/Client/Frontend/Reader/SiteTableViewController.swift
@@ -31,14 +31,14 @@ class SiteTableViewController: UITableViewController {
         // TODO: We need better async image loading here
         favicons.getForUrl(NSURL(string: site.url)!, options: nil, callback: { (icon: Favicon) -> Void in
             if var img = icon.img {
-                cell.imageView.image = createMockFavicon(img);
+                cell.imageView!.image = createMockFavicon(img);
                 cell.setNeedsLayout()
             }
         });
 
-        cell.textLabel.text = site.title
-        cell.textLabel.font = UIFont(name: "FiraSans-SemiBold", size: 13)
-        cell.textLabel.textColor = UIColor.darkGrayColor()
+        cell.textLabel!.text = site.title
+        cell.textLabel!.font = UIFont(name: "FiraSans-SemiBold", size: 13)
+        cell.textLabel!.textColor = UIColor.darkGrayColor()
         cell.indentationWidth = 20
 
         return cell

diff --git a/Client/Frontend/Settings/SettingsViewController.swift b/Client/Frontend/Settings/SettingsViewController.swift
@@ -72,9 +72,9 @@ class SettingsViewController: UIViewController, ToolbarViewProtocol, UITableView
         let cell: UITableViewCell = tableView.dequeueReusableCellWithIdentifier(SETTING_CELL_ID, forIndexPath: indexPath) as UITableViewCell
 
         if var item = panels[indexPath.item] {
-            cell.textLabel.text = item.title
-            cell.textLabel.font = UIFont(name: "FiraSans-Light", size: cell.textLabel.font.pointSize)
-            cell.textLabel.textColor = UIColor.whiteColor()
+            cell.textLabel!.text = item.title
+            cell.textLabel!.font = UIFont(name: "FiraSans-Light", size: cell.textLabel!.font.pointSize)
+            cell.textLabel!.textColor = UIColor.whiteColor()
             cell.backgroundColor = self.view.backgroundColor
             cell.separatorInset = UIEdgeInsetsZero
             cell.selectionStyle = UITableViewCellSelectionStyle.None

diff --git a/Client/Frontend/Tabs/TabsViewController.swift b/Client/Frontend/Tabs/TabsViewController.swift
@@ -74,15 +74,15 @@ class TabsViewController: UITableViewController
             // TODO: We need better async image loading here
             favicons.getForUrl(NSURL(string: tab.url)!, options: nil, callback: { (icon: Favicon) -> Void in
                 if var img = icon.img {
-                    cell.imageView.image = createMockFavicon(img);
+                    cell.imageView!.image = createMockFavicon(img);
                     cell.setNeedsLayout()
                 }
             });
-            cell.textLabel.text = tab.title
+            cell.textLabel!.text = tab.title
         }
 
-        cell.textLabel.font = UIFont(name: "FiraSans-SemiBold", size: 13)
-        cell.textLabel.textColor = UIColor.darkGrayColor()
+        cell.textLabel!.font = UIFont(name: "FiraSans-SemiBold", size: 13)
+        cell.textLabel!.textColor = UIColor.darkGrayColor()
         cell.indentationWidth = 20
         return cell
     }

diff --git a/Extensions/SendTo/ActionViewController.swift b/Extensions/SendTo/ActionViewController.swift
@@ -79,8 +79,8 @@ class ClientPickerViewController: UITableViewController {
 
     override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
         let cell = UITableViewCell()
-        cell.textLabel.font = UIFont(name: "FiraSans-Regular", size: 17)
-        cell.textLabel.text = NSLocalizedString("Send to ", comment: "") + clients[indexPath.row].name // TODO This needs a localized format string
+        cell.textLabel!.font = UIFont(name: "FiraSans-Regular", size: 17)
+        cell.textLabel!.text = NSLocalizedString("Send to ", comment: "") + clients[indexPath.row].name // TODO This needs a localized format string
         return cell
     }
 

diff --git a/Extensions/ShareTo/ShareViewController.swift b/Extensions/ShareTo/ShareViewController.swift
@@ -193,14 +193,14 @@ class ShareDialogController: UIViewController, UITableViewDataSource, UITableVie
 
     func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
         let cell = UITableViewCell()
-        cell.textLabel.textColor = UIColor(red:0.733, green:0.729, blue:0.757, alpha:1.000)
-        cell.textLabel.font = UIFont(name: "FiraSans-Regular", size: 17)
-        cell.imageView.transform = CGAffineTransformMakeScale(0.5, 0.5)
+        cell.textLabel!.textColor = UIColor(red:0.733, green:0.729, blue:0.757, alpha:1.000)
+        cell.textLabel!.font = UIFont(name: "FiraSans-Regular", size: 17)
+        cell.imageView!.transform = CGAffineTransformMakeScale(0.5, 0.5)
         cell.accessoryType = selectedShareDestinations.containsObject(ShareDestinations[indexPath.row].code) ? UITableViewCellAccessoryType.Checkmark : UITableViewCellAccessoryType.None
         cell.tintColor = UIColor(red:0.427, green:0.800, blue:0.102, alpha:1.0)
         cell.layoutMargins = UIEdgeInsetsZero
-        cell.textLabel.text = ShareDestinations[indexPath.row].name
-        cell.imageView.image = UIImage(named: ShareDestinations[indexPath.row].image)
+        cell.textLabel!.text = ShareDestinations[indexPath.row].name
+        cell.imageView!.image = UIImage(named: ShareDestinations[indexPath.row].image)
         return cell
     }