equal
deleted
inserted
replaced
55 |
55 |
56 // Store the pointer in tls, also avoid multiple creations |
56 // Store the pointer in tls, also avoid multiple creations |
57 checkMultipleCreation(); |
57 checkMultipleCreation(); |
58 |
58 |
59 // Get an instance of AgendaUtil interface class |
59 // Get an instance of AgendaUtil interface class |
60 // This will take care of |
60 // This will take care of |
61 mAgendaUtil = new AgendaUtil(); |
61 mAgendaUtil = new AgendaUtil(this); |
62 |
62 |
63 iStateMachine = CCalenStateMachine::NewL( *this ); |
63 iStateMachine = CCalenStateMachine::NewL( *this ); |
64 |
64 |
65 // Create the notifier. |
65 // Create the notifier. |
66 iNotifier = new( ELeave )CalenNotifier( *iStateMachine ); |
66 iNotifier = new( ELeave )CalenNotifier( *iStateMachine ); |
67 |
67 |
220 // ---------------------------------------------------------------------------- |
220 // ---------------------------------------------------------------------------- |
221 // |
221 // |
222 CCalenController::~CCalenController() |
222 CCalenController::~CCalenController() |
223 { |
223 { |
224 TRACE_ENTRY_POINT; |
224 TRACE_ENTRY_POINT; |
225 |
225 |
|
226 if(iStateMachine) { |
|
227 delete iStateMachine; |
|
228 iStateMachine = NULL; |
|
229 } |
|
230 |
226 if ( iServices ) |
231 if ( iServices ) |
227 { |
232 { |
228 iServices->Release(); |
233 iServices->Release(); |
229 } |
234 } |
230 |
235 |
231 if( iNotifier ) |
236 if( iNotifier ) |
232 { |
237 { |
233 delete iNotifier; |
238 delete iNotifier; |
234 iNotifier = NULL; |
239 iNotifier = NULL; |
235 } |
240 } |
236 |
241 |
|
242 if(mContext) { |
|
243 delete mContext; |
|
244 mContext = NULL; |
|
245 } |
|
246 |
237 if( iActionUi ) |
247 if( iActionUi ) |
238 { |
248 { |
239 delete iActionUi; |
249 delete iActionUi; |
240 iActionUi = NULL; |
250 iActionUi = NULL; |
241 } |
251 } |