83 // ----------------------------------------------------------------------------- |
83 // ----------------------------------------------------------------------------- |
84 // |
84 // |
85 CSConDataOwner* CSConDataOwner::CopyL() |
85 CSConDataOwner* CSConDataOwner::CopyL() |
86 { |
86 { |
87 CSConDataOwner* copy = new (ELeave) CSConDataOwner(); |
87 CSConDataOwner* copy = new (ELeave) CSConDataOwner(); |
|
88 CleanupStack::PushL( copy ); |
88 copy->iType = iType; |
89 copy->iType = iType; |
89 copy->iUid = iUid; |
90 copy->iUid = iUid; |
90 copy->iDriveList.Copy( iDriveList ); |
91 copy->iDriveList.Copy( iDriveList ); |
91 copy->iPackageName = iPackageName; |
92 copy->iPackageName = iPackageName; |
92 copy->iReqReboot = iReqReboot; |
93 copy->iReqReboot = iReqReboot; |
103 if ( copy->iJavaHash ) |
104 if ( copy->iJavaHash ) |
104 { |
105 { |
105 delete copy->iJavaHash; |
106 delete copy->iJavaHash; |
106 copy->iJavaHash = NULL; |
107 copy->iJavaHash = NULL; |
107 } |
108 } |
108 copy->iJavaHash = iJavaHash->Alloc(); |
109 copy->iJavaHash = iJavaHash->AllocL(); |
109 } |
110 } |
110 |
111 CleanupStack::Pop( copy ); |
111 return copy; |
112 return copy; |
112 } |
113 } |
113 |
114 |
114 // ----------------------------------------------------------------------------- |
115 // ----------------------------------------------------------------------------- |
115 // CSConUpdateDeviceInfo::CSConUpdateDeviceInfo() |
116 // CSConUpdateDeviceInfo::CSConUpdateDeviceInfo() |
209 // ----------------------------------------------------------------------------- |
210 // ----------------------------------------------------------------------------- |
210 // |
211 // |
211 CSConListInstApps* CSConListInstApps::CopyL() |
212 CSConListInstApps* CSConListInstApps::CopyL() |
212 { |
213 { |
213 CSConListInstApps* copy = new (ELeave) CSConListInstApps(); |
214 CSConListInstApps* copy = new (ELeave) CSConListInstApps(); |
|
215 CleanupStack::PushL( copy ); |
214 copy->iAllApps = iAllApps; |
216 copy->iAllApps = iAllApps; |
215 copy->iDriveList = iDriveList; |
217 copy->iDriveList = iDriveList; |
216 |
218 |
217 copy->iComplete = iComplete; |
219 copy->iComplete = iComplete; |
218 copy->iProgress = iProgress; |
220 copy->iProgress = iProgress; |
219 |
221 |
220 for( TInt i = 0; i < iApps.Count(); i++ ) |
222 for( TInt i = 0; i < iApps.Count(); i++ ) |
221 { |
223 { |
222 copy->iApps.Append( iApps[i]->CopyL() ); |
224 CSConInstApp* temp = iApps[i]->CopyL(); |
223 } |
225 CleanupStack::PushL( temp ); |
224 |
226 copy->iApps.AppendL( temp ); |
|
227 CleanupStack::Pop( temp ); |
|
228 } |
|
229 CleanupStack::Pop( copy ); |
225 return copy; |
230 return copy; |
226 } |
231 } |
227 |
232 |
228 // ----------------------------------------------------------------------------- |
233 // ----------------------------------------------------------------------------- |
229 // CSConFile::CSConFile |
234 // CSConFile::CSConFile |
362 { |
367 { |
363 CSConListDataOwners* copy = new (ELeave) CSConListDataOwners(); |
368 CSConListDataOwners* copy = new (ELeave) CSConListDataOwners(); |
364 CleanupStack::PushL( copy ); |
369 CleanupStack::PushL( copy ); |
365 for( TInt i = 0; i < iDataOwners.Count(); i++ ) |
370 for( TInt i = 0; i < iDataOwners.Count(); i++ ) |
366 { |
371 { |
367 copy->iDataOwners.Append( iDataOwners[i]->CopyL() ); |
372 CSConDataOwner* temp = iDataOwners[i]->CopyL(); |
|
373 CleanupStack::PushL( temp ); |
|
374 copy->iDataOwners.AppendL( temp ); |
|
375 CleanupStack::Pop( temp ); |
368 } |
376 } |
369 CleanupStack::Pop( copy ); |
377 CleanupStack::Pop( copy ); |
370 |
378 |
371 copy->iComplete = iComplete; |
379 copy->iComplete = iComplete; |
372 copy->iProgress = iProgress; |
380 copy->iProgress = iProgress; |
452 { |
460 { |
453 CSConGetDataSize* copy = new (ELeave) CSConGetDataSize(); |
461 CSConGetDataSize* copy = new (ELeave) CSConGetDataSize(); |
454 CleanupStack::PushL( copy ); |
462 CleanupStack::PushL( copy ); |
455 for( TInt i = 0; i < iDataOwners.Count(); i++ ) |
463 for( TInt i = 0; i < iDataOwners.Count(); i++ ) |
456 { |
464 { |
457 copy->iDataOwners.Append( iDataOwners[i]->CopyL() ); |
465 CSConDataOwner* temp = iDataOwners[i]->CopyL(); |
|
466 CleanupStack::PushL( temp ); |
|
467 copy->iDataOwners.AppendL( temp ); |
|
468 CleanupStack::Pop( temp ); |
458 } |
469 } |
459 CleanupStack::Pop( copy ); |
470 CleanupStack::Pop( copy ); |
460 copy->iComplete = iComplete; |
471 copy->iComplete = iComplete; |
461 copy->iProgress = iProgress; |
472 copy->iProgress = iProgress; |
462 |
473 |
506 { |
517 { |
507 CSConListPublicFiles* copy = new (ELeave) CSConListPublicFiles(); |
518 CSConListPublicFiles* copy = new (ELeave) CSConListPublicFiles(); |
508 CleanupStack::PushL( copy ); |
519 CleanupStack::PushL( copy ); |
509 for( TInt i = 0; i < iFiles.Count(); i++ ) |
520 for( TInt i = 0; i < iFiles.Count(); i++ ) |
510 { |
521 { |
511 copy->iFiles.Append( iFiles[i]->CopyL() ); |
522 CSConFile* temp = iFiles[i]->CopyL(); |
|
523 CleanupStack::PushL( temp ); |
|
524 copy->iFiles.AppendL( temp ); |
|
525 CleanupStack::Pop( temp ); |
512 } |
526 } |
513 |
527 |
514 for( TInt j = 0; j < iDataOwners.Count(); j++ ) |
528 for( TInt j = 0; j < iDataOwners.Count(); j++ ) |
515 { |
529 { |
516 copy->iDataOwners.Append( iDataOwners[j]->CopyL() ); |
530 CSConDataOwner* temp = iDataOwners[j]->CopyL(); |
|
531 CleanupStack::PushL( temp ); |
|
532 copy->iDataOwners.AppendL( temp ); |
|
533 CleanupStack::Pop( temp ); |
517 } |
534 } |
518 CleanupStack::Pop( copy ); |
535 CleanupStack::Pop( copy ); |
519 |
536 |
520 copy->iComplete = iComplete; |
537 copy->iComplete = iComplete; |
521 copy->iProgress = iProgress; |
538 copy->iProgress = iProgress; |
640 { |
657 { |
641 CSConGetDataOwnerStatus* copy = new (ELeave) CSConGetDataOwnerStatus(); |
658 CSConGetDataOwnerStatus* copy = new (ELeave) CSConGetDataOwnerStatus(); |
642 CleanupStack::PushL( copy ); |
659 CleanupStack::PushL( copy ); |
643 for( TInt i = 0; i < iDataOwners.Count(); i++ ) |
660 for( TInt i = 0; i < iDataOwners.Count(); i++ ) |
644 { |
661 { |
645 copy->iDataOwners.Append( iDataOwners[i]->CopyL() ); |
662 CSConDataOwner* temp = iDataOwners[i]->CopyL(); |
|
663 CleanupStack::PushL( temp ); |
|
664 copy->iDataOwners.AppendL( temp ); |
|
665 CleanupStack::Pop( temp ); |
646 } |
666 } |
647 CleanupStack::Pop( copy ); |
667 CleanupStack::Pop( copy ); |
648 |
668 |
649 copy->iComplete = iComplete; |
669 copy->iComplete = iComplete; |
650 copy->iProgress = iProgress; |
670 copy->iProgress = iProgress; |
1510 // ----------------------------------------------------------------------------- |
1530 // ----------------------------------------------------------------------------- |
1511 // |
1531 // |
1512 CSConTaskReply* CSConTaskReply::CopyAndFreeL() |
1532 CSConTaskReply* CSConTaskReply::CopyAndFreeL() |
1513 { |
1533 { |
1514 CSConTaskReply* copy = new (ELeave) CSConTaskReply(); |
1534 CSConTaskReply* copy = new (ELeave) CSConTaskReply(); |
|
1535 CleanupStack::PushL( copy ); |
1515 copy->iTaskId = iTaskId; |
1536 copy->iTaskId = iTaskId; |
1516 copy->iMethod = iMethod; |
1537 copy->iMethod = iMethod; |
1517 |
1538 |
1518 if ( iDevInfoParams ) |
1539 if ( iDevInfoParams ) |
1519 { |
1540 { |
1617 |
1638 |
1618 //free allocated memory |
1639 //free allocated memory |
1619 delete iGetMetadataParams; |
1640 delete iGetMetadataParams; |
1620 iGetMetadataParams = NULL; |
1641 iGetMetadataParams = NULL; |
1621 } |
1642 } |
1622 |
1643 CleanupStack::Pop( copy ); |
1623 return copy; |
1644 return copy; |
1624 } |
1645 } |
1625 |
1646 |
1626 // ----------------------------------------------------------------------------- |
1647 // ----------------------------------------------------------------------------- |
1627 // CSConTaskReply::CleanTaskData() |
1648 // CSConTaskReply::CleanTaskData() |