equal
deleted
inserted
replaced
552 drvAndOp.setOwnerDataType( fmDrvAndOp->ownerDataType() ); |
552 drvAndOp.setOwnerDataType( fmDrvAndOp->ownerDataType() ); |
553 drvAndOp.setDrvCategories( fmDrvAndOp->drvCategories() ); |
553 drvAndOp.setDrvCategories( fmDrvAndOp->drvCategories() ); |
554 iDrvAndOpList->AppendL( drvAndOp ); |
554 iDrvAndOpList->AppendL( drvAndOp ); |
555 } |
555 } |
556 //////// |
556 //////// |
557 |
|
558 FmBackupSettings& bkupSettings( *( q->BackupSettingsL() ) ); |
|
559 |
557 |
560 // Create restore params - ownership is transferred to |
558 // Create restore params - ownership is transferred to |
561 // secure backup engine |
559 // secure backup engine |
562 |
560 |
563 #ifdef RD_FILE_MANAGER_BACKUP |
561 #ifdef RD_FILE_MANAGER_BACKUP |
632 |
630 |
633 CMMCScBkupOpParamsRestoreFull* params = |
631 CMMCScBkupOpParamsRestoreFull* params = |
634 CMMCScBkupOpParamsRestoreFull::NewL( driveReader, EBUCatAllInOne ); |
632 CMMCScBkupOpParamsRestoreFull::NewL( driveReader, EBUCatAllInOne ); |
635 CleanupStack::PopAndDestroy(); // driveReader |
633 CleanupStack::PopAndDestroy(); // driveReader |
636 |
634 |
|
635 FmBackupSettings& bkupSettings( *( q->BackupSettingsL() ) ); |
637 // Get list of all archives |
636 // Get list of all archives |
638 RPointerArray< CMMCScBkupArchiveInfo > archives; |
637 RPointerArray< CMMCScBkupArchiveInfo > archives; |
639 TCleanupItem cleanupItem( ResetAndDestroyArchives, &archives ); |
638 TCleanupItem cleanupItem( ResetAndDestroyArchives, &archives ); |
640 CleanupStack::PushL( cleanupItem ); |
639 CleanupStack::PushL( cleanupItem ); |
641 iBkupEngine->ListArchivesL( |
640 iBkupEngine->ListArchivesL( |
668 |
667 |
669 void FmBkupEnginePrivate::GetRestoreInfoArray( QList<FmBkupDrivesAndOperation* > drivesAndOperationList, |
668 void FmBkupEnginePrivate::GetRestoreInfoArray( QList<FmBkupDrivesAndOperation* > drivesAndOperationList, |
670 QList< FmRestoreInfo > &restoreInfoList, |
669 QList< FmRestoreInfo > &restoreInfoList, |
671 const QString& aDrive ) |
670 const QString& aDrive ) |
672 { |
671 { |
673 int targetDrive = DriverNameToNumber( aDrive ); |
672 int targetDrive = DriverNameToNumber( aDrive ); |
674 FmBackupSettings& settings( *( q->BackupSettingsL() ) ); |
|
675 |
673 |
676 restoreInfoList.clear(); |
674 restoreInfoList.clear(); |
677 |
675 |
678 /////// |
676 /////// |
679 iDrvAndOpList->Reset(); |
677 iDrvAndOpList->Reset(); |