From d89f02ff53945ae7ce36364900e85404921e2ccd Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 19 Jun 2015 22:08:08 -0400 Subject: [PATCH] Change signature of [iCalAlarm alarmForEvent:..] The first argument doesn't have to be a iCalRepeatableEntity; a simple iCalEntity is enough. --- SoObjects/Appointments/iCalAlarm+SOGo.h | 6 +++--- SoObjects/Appointments/iCalAlarm+SOGo.m | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SoObjects/Appointments/iCalAlarm+SOGo.h b/SoObjects/Appointments/iCalAlarm+SOGo.h index 2980f7bc6..741be01fa 100644 --- a/SoObjects/Appointments/iCalAlarm+SOGo.h +++ b/SoObjects/Appointments/iCalAlarm+SOGo.h @@ -1,6 +1,6 @@ /* iCalAlarm+SOGo.h - this file is part of SOGo * - * Copyright (C) 2014 Inverse inc. + * Copyright (C) 2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,11 +20,11 @@ #import -@class iCalRepeatableEntityObject; +@class iCalEntityObject; @interface iCalAlarm (SOGoExtensions) -+ (id) alarmForEvent: (iCalRepeatableEntityObject *) theEntity ++ (id) alarmForEvent: (iCalEntityObject *) theEntity owner: (NSString *) theOwner action: (NSString *) reminderAction unit: (NSString *) reminderUnit diff --git a/SoObjects/Appointments/iCalAlarm+SOGo.m b/SoObjects/Appointments/iCalAlarm+SOGo.m index c98c316db..cb1cc57c0 100644 --- a/SoObjects/Appointments/iCalAlarm+SOGo.m +++ b/SoObjects/Appointments/iCalAlarm+SOGo.m @@ -1,6 +1,6 @@ /* iCalAlarm+SOGo.m - this file is part of SOGo * - * Copyright (C) 2014 Inverse inc. + * Copyright (C) 2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ #import #import +#import @implementation iCalAlarm (SOGoExtensions) @@ -65,7 +66,7 @@ [alarm addChild: aAttendee]; } -+ (id) alarmForEvent: (iCalRepeatableEntityObject *) theEntity ++ (id) alarmForEvent: (iCalEntityObject *) theEntity owner: (NSString *) theOwner action: (NSString *) reminderAction unit: (NSString *) reminderUnit