equal
deleted
inserted
replaced
36 } |
36 } |
37 |
37 |
38 CRenameItem::~CRenameItem() |
38 CRenameItem::~CRenameItem() |
39 { |
39 { |
40 delete iOldName; |
40 delete iOldName; |
|
41 iOldName = NULL; |
41 delete iNewName; |
42 delete iNewName; |
|
43 iNewName = NULL; |
42 iFileEvents.ResetAndDestroy(); |
44 iFileEvents.ResetAndDestroy(); |
43 } |
45 } |
44 |
46 |
45 |
47 |
46 void CRenameItem::ConstructL(const TDesC &aOldName, const TDesC &aNewName) |
48 void CRenameItem::ConstructL(const TDesC &aOldName, const TDesC &aNewName) |
61 |
63 |
62 void CRenameItem::AddFileEvent(TMdsFSPStatus &aEvent) |
64 void CRenameItem::AddFileEvent(TMdsFSPStatus &aEvent) |
63 { |
65 { |
64 TMdsFSPStatus* event = NULL; |
66 TMdsFSPStatus* event = NULL; |
65 event = new TMdsFSPStatus(aEvent); |
67 event = new TMdsFSPStatus(aEvent); |
|
68 |
66 if (event) |
69 if (event) |
67 { |
70 { |
68 iFileEvents.Append(event); |
71 if(iFileEvents.Append(event) != KErrNone) |
|
72 { |
|
73 delete event; |
|
74 event = NULL; |
|
75 } |
69 } |
76 } |
70 } |
77 } |
71 |
78 |
72 void CRenameItem::HandleFileEventsL(CFileEventHandlerAO &aCFileEventHandlerAO) |
79 void CRenameItem::HandleFileEventsL(CFileEventHandlerAO &aCFileEventHandlerAO) |
73 { |
80 { |
155 { |
162 { |
156 CRenameItem *currItem = iRenamedFolders[0]; |
163 CRenameItem *currItem = iRenamedFolders[0]; |
157 iRenamedFolders.Remove(0); |
164 iRenamedFolders.Remove(0); |
158 TRAP_IGNORE(currItem->HandleFileEventsL(iCFileEventHandlerAO)); |
165 TRAP_IGNORE(currItem->HandleFileEventsL(iCFileEventHandlerAO)); |
159 delete currItem; |
166 delete currItem; |
|
167 currItem = NULL; |
|
168 |
160 SetNextRequest(ERenameStateIdle); |
169 SetNextRequest(ERenameStateIdle); |
|
170 |
161 if (iRenamedFolders.Count() == 0) |
171 if (iRenamedFolders.Count() == 0) |
162 { |
172 { |
163 iIsRunning = EFalse; |
173 iIsRunning = EFalse; |
164 iRenamedFolders.Compress(); |
174 iRenamedFolders.Compress(); |
165 } |
175 } |