Skip to content

Commit 2dc6c83

Browse files
committed
update for Swift 1.2, Xcode 6.3
1 parent afac052 commit 2dc6c83

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

bk2ch19p725calendar/ch32p986calendar/ViewController.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ViewController: UIViewController, EKEventViewDelegate, EKEventEditViewDele
5858
}
5959
// obtain local source
6060
var src : EKSource! = nil
61-
for source in self.database.sources() as [EKSource] {
61+
for source in self.database.sources() as! [EKSource] {
6262
if source.sourceType.value == EKSourceTypeLocal.value {
6363
src = source
6464
break
@@ -83,7 +83,7 @@ class ViewController: UIViewController, EKEventViewDelegate, EKEventEditViewDele
8383
}
8484

8585
func calendarWithName( name:String ) -> EKCalendar? {
86-
let calendars = self.database.calendarsForEntityType(EKEntityTypeEvent) as [EKCalendar]
86+
let calendars = self.database.calendarsForEntityType(EKEntityTypeEvent) as! [EKCalendar]
8787
for cal in calendars { // (should be using identifier)
8888
if cal.title == name {
8989
return cal
@@ -212,6 +212,7 @@ class ViewController: UIViewController, EKEventViewDelegate, EKEventEditViewDele
212212
}
213213
}
214214
sort(&events) {return $0.compareStartDateWithEvent($1) == .OrderedAscending}
215+
// println(events)
215216
}
216217
}
217218

@@ -226,7 +227,7 @@ class ViewController: UIViewController, EKEventViewDelegate, EKEventEditViewDele
226227
println("need to search for nap event first")
227228
return
228229
}
229-
let ev = self.database.calendarItemWithIdentifier(self.napid) as EKEvent!
230+
let ev = self.database.calendarItemWithIdentifier(self.napid) as! EKEvent!
230231
if ev == nil {
231232
println("failed to retrieve event")
232233
return
@@ -314,9 +315,9 @@ class ViewController: UIViewController, EKEventViewDelegate, EKEventEditViewDele
314315

315316
func calendarChooserDidFinish(calendarChooser: EKCalendarChooser!) {
316317
// up to us to respond
317-
let cals = calendarChooser.selectedCalendars
318+
let cals = calendarChooser.selectedCalendars as! Set<EKCalendar>!
318319
if cals != nil && cals.count > 0 {
319-
let calsToDelete = cals.valueForKey("calendarIdentifier") as NSSet
320+
let calsToDelete = map(cals!) {$0.calendarIdentifier}
320321
let alert = UIAlertController(title: "Delete selected calendar?", message: nil, preferredStyle: .ActionSheet)
321322
alert.addAction(UIAlertAction(title: "Cancel", style: .Cancel, handler: nil))
322323
alert.addAction(UIAlertAction(title: "Delete", style: .Destructive, handler: {

bk2ch19p731reminders/ch32p994reminders/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ViewController: UIViewController {
7171
let today = NSDate()
7272
let greg = NSCalendar(calendarIdentifier:NSCalendarIdentifierGregorian)!
7373
// day without time means "all day"
74-
let comps : NSCalendarUnit = .YearCalendarUnit | .MonthCalendarUnit | .DayCalendarUnit
74+
let comps : NSCalendarUnit = .CalendarUnitYear | .CalendarUnitMonth | .CalendarUnitDay
7575
// start date not needed on iOS
7676
// rem.startDateComponents = [greg components:comps fromDate:today];
7777
rem.dueDateComponents = greg.components(comps, fromDate:today)

0 commit comments

Comments
 (0)