From cfee388173d7562e51c18aece3e57d1444ba11bd Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 10 Mar 2008 15:04:01 +0000
Subject: [PATCH] Monotone-Parent: 7c28642f36f4c3feb073eabc686174075951ac84
 Monotone-Revision: 2faf999531ce61df1885728986fff22f2b832e2c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-03-10T15:04:01
Monotone-Branch: ca.inverse.sogo
---
 UI/SOGoUI/UIxComponent.m           | 24 ++++++------
 UI/Scheduler/UIxCalMonthOverview.m | 60 +++++++++++++++---------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 2444791ab..0a707bc5c 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -497,24 +497,24 @@ static BOOL uixDebugEnabled = NO;
              languages: languages];
 }
 
-- (NSString *) localizedNameForDayOfWeek:(unsigned)_dayOfWeek {
-  NSString *key =  [dayLabelKeys objectAtIndex:_dayOfWeek % 7];
-  return [self labelForKey:key];
+- (NSString *) localizedNameForDayOfWeek: (unsigned) dayOfWeek
+{
+  return [self labelForKey: [dayLabelKeys objectAtIndex: dayOfWeek % 7]];
 }
 
-- (NSString *)localizedAbbreviatedNameForDayOfWeek:(unsigned)_dayOfWeek {
-  NSString *key =  [abbrDayLabelKeys objectAtIndex:_dayOfWeek % 7];
-  return [self labelForKey:key];
+- (NSString *) localizedAbbreviatedNameForDayOfWeek: (unsigned) dayOfWeek
+{
+  return [self labelForKey: [abbrDayLabelKeys objectAtIndex: dayOfWeek % 7]];
 }
 
-- (NSString *)localizedNameForMonthOfYear:(unsigned)_monthOfYear {
-  NSString *key =  [monthLabelKeys objectAtIndex:(_monthOfYear - 1) % 12];
-  return [self labelForKey:key];
+- (NSString *) localizedNameForMonthOfYear: (unsigned) monthOfYear
+{
+  return [self labelForKey: [monthLabelKeys objectAtIndex: (monthOfYear - 1) % 12]];
 }
 
-- (NSString *)localizedAbbreviatedNameForMonthOfYear:(unsigned)_monthOfYear {
-  NSString *key =  [abbrMonthLabelKeys objectAtIndex:(_monthOfYear - 1) % 12];
-  return [self labelForKey:key];
+- (NSString *) localizedAbbreviatedNameForMonthOfYear: (unsigned) monthOfYear
+{
+  return [self labelForKey: [abbrMonthLabelKeys objectAtIndex: (monthOfYear - 1) % 12]];
 }
 
 /* HTTP method safety */
diff --git a/UI/Scheduler/UIxCalMonthOverview.m b/UI/Scheduler/UIxCalMonthOverview.m
index 5ab7be0da..ce59b9e08 100644
--- a/UI/Scheduler/UIxCalMonthOverview.m
+++ b/UI/Scheduler/UIxCalMonthOverview.m
@@ -9,71 +9,71 @@
 @implementation UIxCalMonthOverview
 
 - (void)dealloc {
-  [self->currentWeekStart release];
+  [currentWeekStart release];
   [super dealloc];
 }
 
 - (void)configureFormatters {
   [super configureFormatters];
   
-  [self->aptFormatter        setShortTitleOnly];
-  [self->privateAptFormatter setPrivateTitleOnly];
+  [aptFormatter        setShortTitleOnly];
+  [privateAptFormatter setPrivateTitleOnly];
 }
 
 - (void)setDayIndex:(int)_idx {
-    self->dayIndex = _idx;
+  dayIndex = _idx;
 }
 
 - (int)dayIndex {
-    return self->dayIndex;
+  return dayIndex;
 }
 
 - (void)setDayOfWeek:(int)_day {
-    self->dayOfWeek = _day;
+  dayOfWeek = _day;
 }
 
 - (int)dayOfWeek {
-    return self->dayOfWeek;
+  return dayOfWeek;
 }
 
 - (void)setCurrentWeekStartDate:(NSCalendarDate *)_date {
-    ASSIGN(self->currentWeekStart, _date);
+  ASSIGN(currentWeekStart, _date);
 }
 
 - (NSCalendarDate *)currentWeekStartDate {
-    return self->currentWeekStart;
+  return currentWeekStart;
 }
 
 - (void)setWeekOfYear:(int)_week {
-    NSCalendarDate *date;
+  NSCalendarDate *date;
     
-    self->weekOfYear = _week;
-    if(_week == 52 || _week == 53)
-        date = [[self startOfMonth] mondayOfWeek];
-    else
-        date = [self startOfMonth];
-    date = [date mondayOfWeek:_week];
-    [self setCurrentWeekStartDate:date];
+  weekOfYear = _week;
+  if(_week == 52 || _week == 53)
+    date = [[self startOfMonth] mondayOfWeek];
+  else
+    date = [self startOfMonth];
+  date = [date mondayOfWeek:_week];
+  [self setCurrentWeekStartDate:date];
 }
 
 - (int)weekOfYear {
-    return self->weekOfYear;
+  return weekOfYear;
 }
 
 - (int)year {
-    return [[self startOfMonth] yearOfCommonEra];
+  return [[self startOfMonth] yearOfCommonEra];
 }
 
 - (int)month {
-    return [[self startOfMonth] monthOfYear];
+  return [[self startOfMonth] monthOfYear];
 }
 
 - (NSString *)localizedDayOfWeekName {
-    return [self localizedNameForDayOfWeek:self->dayOfWeek];
+  return [self localizedNameForDayOfWeek:dayOfWeek];
 }
 
 - (NSDictionary *)currentWeekQueryParameters {
-    return [self queryParametersBySettingSelectedDate:self->currentWeekStart];
+  return [self queryParametersBySettingSelectedDate:currentWeekStart];
 }
 
 
@@ -81,17 +81,17 @@
 
 
 - (NSString *)weekStyle {
-    if([self->currentWeekStart isDateInSameWeek:[NSCalendarDate date]])
-        return @"monthoverview_week_hilite";
-    return @"monthoverview_week";
+  if([currentWeekStart isDateInSameWeek:[NSCalendarDate date]])
+    return @"monthoverview_week_hilite";
+  return @"monthoverview_week";
 }
 
 - (NSString *)contentStyle {
-    if([self->currentDay isToday])
-        return @"monthoverview_content_hilite";
-    else if([self->currentDay monthOfYear] != [[self startOfMonth] monthOfYear])
-        return @"monthoverview_content_dimmed";
-    return @"monthoverview_content";
+  if([currentDay isToday])
+    return @"monthoverview_content_hilite";
+  else if([currentDay monthOfYear] != [[self startOfMonth] monthOfYear])
+    return @"monthoverview_content_dimmed";
+  return @"monthoverview_content";
 }