From 96cdace6feea31b005153a275f371eab175a0aca Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 5 Sep 2006 20:13:16 +0000 Subject: [PATCH] Monotone-Parent: 6e571370868349ff9fdc22d99f98878688e1a798 Monotone-Revision: 648ca938b27c6fb6be0365e39d56a5441ded8ed5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-09-05T20:13:16 Monotone-Branch: ca.inverse.sogo --- UI/SOGoUI/UIxComponent.h | 2 +- UI/SOGoUI/UIxComponent.m | 16 ++++++++-------- UI/Scheduler/UIxCalView.m | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/UI/SOGoUI/UIxComponent.h b/UI/SOGoUI/UIxComponent.h index f4b07d985..c8a3911ba 100644 --- a/UI/SOGoUI/UIxComponent.h +++ b/UI/SOGoUI/UIxComponent.h @@ -38,7 +38,7 @@ { NSMutableDictionary *queryParameters; NSTimeZone *viewTimeZone; - NSCalendarDate *selectedDate; + NSCalendarDate *_selectedDate; } - (NSString *)queryParameterForKey:(NSString *)_key; diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index b9e8aa38b..bf069de14 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -114,7 +114,7 @@ static BOOL uixDebugEnabled = NO; if ((self = [super init])) { viewTimeZone = nil; - selectedDate = nil; + _selectedDate = nil; } return self; @@ -125,8 +125,8 @@ static BOOL uixDebugEnabled = NO; [self->queryParameters release]; if (viewTimeZone) [viewTimeZone release]; - if (selectedDate) - [selectedDate release]; + if (_selectedDate) + [_selectedDate release]; [super dealloc]; } @@ -350,7 +350,7 @@ static BOOL uixDebugEnabled = NO; NSCalendarDate *cdate; unsigned hour, minute; - if (!selectedDate) + if (!_selectedDate) { s = [self queryParameterForKey: @"day"]; if ([s length] > 0) @@ -367,15 +367,15 @@ static BOOL uixDebugEnabled = NO; { hour = [[s substringToIndex: 2] unsignedIntValue]; minute = [[s substringFromIndex: 2] unsignedIntValue]; - selectedDate = [cdate hour: hour minute: minute]; + _selectedDate = [cdate hour: hour minute: minute]; } else - selectedDate = [cdate hour: 12 minute: 0]; + _selectedDate = [cdate hour: 12 minute: 0]; - [selectedDate retain]; + [_selectedDate retain]; } - return selectedDate; + return _selectedDate; } - (NSString *)dateStringForDate:(NSCalendarDate *)_date { diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index 24ed0f318..a1faf58ed 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -421,11 +421,11 @@ static BOOL shouldDisplayWeekend = NO; - (NSArray *) fetchCoreInfos { - if (!self->appointments) + SOGoAppointmentFolder *folder; + NSCalendarDate *sd, *ed; + + if (!self->appointments) { - id folder; - NSCalendarDate *sd, *ed; - folder = [self clientObject]; sd = [self startDate]; ed = [self endDate];