Resolved issue N_SE-38059

[apps/osp/Calendar.git] / src / ClEventEditorForm.cpp

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 59facdc..e0e095a 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -639,12 +639,12 @@ EventEditorForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView,
                        {
                                __pPm->SetAllDayEvent(true);
 
-                               if (__pEditTimeStartTime != null)
+                               if (__pEditTimeStartTime)
                                {
                                        __pEditTimeStartTime->SetShowState(false);
                                }
 
-                               if (__pEditTimeEndTime != null)
+                               if (__pEditTimeEndTime)
                                {
                                        __pEditTimeEndTime->SetShowState(false);
                                }
@@ -653,30 +653,14 @@ EventEditorForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView,
                        {
                                __pPm->SetAllDayEvent(false);
 
-                               if (__pEditDateStartDate != null && __pEditTimeStartTime != null
-                                       && __pEditDateEndDate != null && __pEditTimeEndTime != null)
+                               if (__pEditTimeStartTime)
                                {
-                                       DateTime startTime;
-                                       startTime.SetValue(__pEditDateStartDate->GetYear(), __pEditDateStartDate->GetMonth(), __pEditDateStartDate->GetDay(),
-                                                                               __pEditTimeStartTime->GetHour(), __pEditTimeStartTime->GetMinute());
-                                       DateTime endTime;
-                                       endTime.SetValue(__pEditDateEndDate->GetYear(), __pEditDateEndDate->GetMonth(), __pEditDateEndDate->GetDay(),
-                                                                       __pEditTimeEndTime->GetHour(), __pEditTimeEndTime->GetMinute());
-                                       if (startTime >= endTime)
-                                       {
-                                               endTime.AddHours(1);
-                                       }
-
-                                       __pPm->SetStartTime(startTime);
-                                       __pPm->SetEndTime(endTime);
-
-                                       __pEditTimeStartTime->SetTime(__pPm->GetStartTime());
                                        __pEditTimeStartTime->SetShowState(true);
-                                       __pEditTimeStartTime->Invalidate(false);
+                               }
 
-                                       __pEditTimeEndTime->SetTime(__pPm->GetEndTime());
+                               if (__pEditTimeEndTime)
+                               {
                                        __pEditTimeEndTime->SetShowState(true);
-                                       __pEditTimeEndTime->Invalidate(false);
                                }
                        }
                }
@@ -708,7 +692,7 @@ EventEditorForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView,
                        if (__pPm->GetReminder(itemIndex) != null)
                        {
                                UpdatePm();
-                               pList = new (std::nothrow) LinkedList();
+                               pList = new (std::nothrow) LinkedList(SingleObjectDeleter);
                                pList->Add(new (std::nothrow) Reminder(*__pPm->GetReminder(itemIndex)));
                                pList->Add(new (std::nothrow) Integer(itemIndex));
                        }
@@ -721,9 +705,9 @@ EventEditorForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView,
                {
                        // Call RepeatForm
                        UpdatePm();
-                       pList = new (std::nothrow) LinkedList();
+                       pList = new (std::nothrow) LinkedList(SingleObjectDeleter);
                        pList->Add(new (std::nothrow) DateTime(__pPm->GetStartTime()));
-                       if (__pPm->GetRecurrence() != null)
+                       if (__pPm->GetRecurrence())
                        {
                                pList->Add(new (std::nothrow) Recurrence(*__pPm->GetRecurrence()));
                        }
@@ -1581,43 +1565,33 @@ EventEditorForm::SendAppControlResult(AppCtrlResult appControlResult)
 result
 EventEditorForm::UpdatePm(void)
 {
-       if (__pEditFieldTitle != null)
+       if (__pEditFieldTitle)
        {
                __pPm->SetSubject(__pEditFieldTitle->GetText());
        }
 
-       DateTime startTime = __pPm->GetStartTime();
-       DateTime endTime = __pPm->GetEndTime();
-       if (__pEditDateStartDate != null)
+       DateTime startTime;
+       DateTime endTime;
+       if (__pEditDateStartDate && __pEditTimeStartTime)
        {
                startTime.SetValue(__pEditDateStartDate->GetYear(), __pEditDateStartDate->GetMonth(), __pEditDateStartDate->GetDay(),
-                                                       startTime.GetHour(), startTime.GetMinute());
-       }
-       if (__pEditTimeStartTime != null)
-       {
-               startTime.SetValue(startTime.GetYear(), startTime.GetMonth(), startTime.GetDay(),
-                                                       __pEditTimeStartTime->GetHour(), __pEditTimeStartTime->GetMinute());
+                               __pEditTimeStartTime->GetHour(), __pEditTimeStartTime->GetMinute());
        }
-       if (__pEditDateEndDate != null)
+       if (__pEditDateEndDate && __pEditTimeEndTime)
        {
                endTime.SetValue(__pEditDateEndDate->GetYear(), __pEditDateEndDate->GetMonth(), __pEditDateEndDate->GetDay(),
-                                                       endTime.GetHour(), endTime.GetMinute());
-       }
-       if (__pEditTimeEndTime != null)
-       {
-               endTime.SetValue(endTime.GetYear(), endTime.GetMonth(), endTime.GetDay(),
-                                                       __pEditTimeEndTime->GetHour(), __pEditTimeEndTime->GetMinute());
+                               __pEditTimeEndTime->GetHour(), __pEditTimeEndTime->GetMinute());
        }
 
        __pPm->SetStartTime(startTime);
        __pPm->SetEndTime(endTime);
 
-       if (__pExpandableEditAreaNote != null)
+       if (__pExpandableEditAreaNote)
        {
                __pPm->SetDescription(__pExpandableEditAreaNote->GetText());
        }
 
-       if (__pEditFieldLocation != null)
+       if (__pEditFieldLocation)
        {
                __pPm->SetLocation(__pEditFieldLocation->GetText());
        }