equal
deleted
inserted
replaced
54 mDayViewDocLoader = NULL; |
54 mDayViewDocLoader = NULL; |
55 mDayViewAltDocLoader = NULL; |
55 mDayViewAltDocLoader = NULL; |
56 mCalenDayView = NULL; |
56 mCalenDayView = NULL; |
57 mCalenMonthView = NULL; |
57 mCalenMonthView = NULL; |
58 mCalenDayViewAlt = NULL; |
58 mCalenDayViewAlt = NULL; |
|
59 mSettingsView = NULL; |
59 |
60 |
60 // Connect to instance view and entry view creation signals from agenda |
61 // Connect to instance view and entry view creation signals from agenda |
61 // interface |
62 // interface |
62 connect(mController.agendaInterface(), SIGNAL(instanceViewCreationCompleted(int)), |
63 connect(mController.agendaInterface(), SIGNAL(instanceViewCreationCompleted(int)), |
63 this, SLOT(handleInstanceViewCreation(int))); |
64 this, SLOT(handleInstanceViewCreation(int))); |
94 // |
95 // |
95 CalenViewManager::~CalenViewManager() |
96 CalenViewManager::~CalenViewManager() |
96 { |
97 { |
97 TRACE_ENTRY_POINT; |
98 TRACE_ENTRY_POINT; |
98 |
99 |
99 delete mCalenMonthView; |
100 if (mSettingsView) { |
100 delete mCalenDayView; |
101 delete mSettingsView; |
101 delete mSettingsView; |
102 mSettingsView = 0; |
102 delete mDayViewDocLoader; |
103 } |
103 delete mDayViewAltDocLoader; |
104 if (mDayViewDocLoader) { |
104 delete mMonthViewDocLoader; |
105 delete mDayViewDocLoader; |
|
106 mDayViewDocLoader = 0; |
|
107 } |
|
108 if (mDayViewAltDocLoader) { |
|
109 delete mDayViewAltDocLoader; |
|
110 mDayViewAltDocLoader = 0; |
|
111 } |
|
112 if (mMonthViewDocLoader) { |
|
113 delete mMonthViewDocLoader; |
|
114 mMonthViewDocLoader = 0; |
|
115 } |
105 TRACE_EXIT_POINT; |
116 TRACE_EXIT_POINT; |
106 } |
117 } |
107 |
118 |
108 // ---------------------------------------------------------------------------- |
119 // ---------------------------------------------------------------------------- |
109 // CalenViewManager::constructAndActivateView |
120 // CalenViewManager::constructAndActivateView |
661 // ---------------------------------------------------------------------------- |
672 // ---------------------------------------------------------------------------- |
662 // |
673 // |
663 void CalenViewManager::handleInstanceViewCreation(int status) |
674 void CalenViewManager::handleInstanceViewCreation(int status) |
664 { |
675 { |
665 Q_UNUSED(status); |
676 Q_UNUSED(status); |
666 mCalenMonthView->fetchEntriesAndUpdateModel(); |
677 if (mCalenMonthView) { |
|
678 mCalenMonthView->fetchEntriesAndUpdateModel(); |
|
679 } |
667 } |
680 } |
668 |
681 |
669 // ---------------------------------------------------------------------------- |
682 // ---------------------------------------------------------------------------- |
670 // CalenViewManager::handleDeletingCompleted |
683 // CalenViewManager::handleDeletingCompleted |
671 // Slot to handle completion of entry view creation |
684 // Slot to handle completion of entry view creation |