From 2b119c63e0bd0fa96361369152a5aface05ffe32 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Fri, 27 Jun 2014 17:21:18 -0400
Subject: [PATCH] Applied comments

---
 UI/Scheduler/UIxCalDayTable.m       | 27 ++++++++++++---------------
 UI/Scheduler/UIxCalListingActions.m |  3 ++-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index ef635d590..799d55f57 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -79,6 +79,7 @@
   [weekDays release];
   [daysToDisplay release];
   [calendarsToDisplay release];
+  [currentView release];
   [hoursToDisplay release];
   [dateFormatter release];
   [timeFormat release];
@@ -125,7 +126,7 @@
 
 - (void) setCurrentView: (NSString *) aView
 {
-  currentView = [NSString stringWithString:aView];
+  ASSIGN(currentView, aView);
 }
 
 - (NSString *) currentView
@@ -181,7 +182,8 @@
 
 - (NSArray *) calendarsToDisplay
 {
-  if (!calendarsToDisplay) {
+  if (!calendarsToDisplay)
+  {
     int max=0, i;
     NSArray *folders;
     SOGoAppointmentFolders *co;
@@ -190,7 +192,7 @@
     unsigned int count, foldersCount;
     NSString *folderName, *fDisplayName;
     NSNumber *isActive;
-
+    
     co = [self clientObject];
     folders = [co subFolders];
     foldersCount = [folders count];
@@ -235,7 +237,7 @@
 
 - (void) setCurrentCalendar: (NSMutableArray *) aCalendar
 {
-  currentCalendar = aCalendar;
+  ASSIGN(currentCalendar, aCalendar);
 }
 
 - (NSMutableArray *) currentCalendar
@@ -297,12 +299,12 @@
 
 - (NSString *) labelForCalendar
 {
-  return [NSString stringWithFormat:[currentCalendar objectForKey:@"displayName"]];
+  return [currentCalendar objectForKey: @"displayName"];
 }
 
 - (NSString *) colorForCalendar
 {
-  return [NSString stringWithFormat:[currentCalendar objectForKey:@"color"]];
+  return [currentCalendar objectForKey:@"color"];
 }
 
 // - (NSDictionary *) _adjustedAppointment: (NSDictionary *) anAppointment
@@ -416,7 +418,6 @@
   classes = [NSMutableString string];
   if ([currentView isEqualToString:@"multicolumndayview"])
     [classes appendFormat:@"day dayColumn"];
-
   else {
     currentDayNbr = [daysToDisplay indexOfObject: currentTableDay];
     realDayOfWeek = [currentTableDay dayOfWeek];
@@ -453,22 +454,18 @@
 
 - (BOOL) isMultiColumnView
 {
-  BOOL flag = NO;
-  
   if ([currentView isEqualToString:@"multicolumndayview"])
-    flag = YES;
+    return YES;
   
-  return flag;
+  return NO;
 }
 
 - (BOOL) isNotMultiColumnView
 {
-  BOOL flag = NO;
-  
   if ([currentView isEqualToString:@"dayview"] || [currentView isEqualToString:@"weekview"])
-    flag = YES;
+    return YES;
   
-  return flag;
+  return NO;
 }
 
 @end
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index b3026d3ed..7b6445e78 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -1048,7 +1048,8 @@ _computeBlocksPosition (NSArray *blocks)
   /* ... _computeBlocksMultiplier() ... */
 }
 
-- (NSArray *) _selectedCalendars {
+- (NSArray *) _selectedCalendars
+{
   SOGoAppointmentFolders *co;
   SOGoAppointmentFolder *folder;
   NSMutableArray *selectedCalendars;