equal
deleted
inserted
replaced
20 // INCLUDE FILES |
20 // INCLUDE FILES |
21 #include <StringLoader.h> |
21 #include <StringLoader.h> |
22 #include <pathinfo.h> |
22 #include <pathinfo.h> |
23 #include <data_caging_path_literals.hrh> |
23 #include <data_caging_path_literals.hrh> |
24 #include <SWInstCommonUI.rsg> |
24 #include <SWInstCommonUI.rsg> |
25 #include <AknCommonDialogs.h> |
25 //#include <AknCommonDialogs.h> // Removed since CR 548 |
26 #include <CAknMemorySelectionDialog.h> |
26 //#include <CAknMemorySelectionDialog.h> // Removed since CR 548 |
27 #ifdef RD_MULTIPLE_DRIVE |
27 #ifdef RD_MULTIPLE_DRIVE |
28 #include <CAknMemorySelectionDialogMultiDrive.h> |
28 //#include <CAknMemorySelectionDialogMultiDrive.h> // Removed since CR 548 |
29 #include <AknCommonDialogsDynMem.h> |
29 //#include <AknCommonDialogsDynMem.h> // Removed since CR 548 |
30 #else |
30 #else |
31 #include <CAknMemorySelectionDialog.h> |
31 //#include <CAknMemorySelectionDialog.h> // Removed since CR 548 |
32 #endif //RD_MULTIPLE_DRIVE |
32 #endif //RD_MULTIPLE_DRIVE |
33 |
33 |
34 #include "CUIDriveUtils.h" |
34 #include "CUIDriveUtils.h" |
35 |
35 |
36 |
36 |
117 // Set callback for the wait dialog. |
117 // Set callback for the wait dialog. |
118 // (other items were commented in a header). |
118 // (other items were commented in a header). |
119 // ----------------------------------------------------------------------------- |
119 // ----------------------------------------------------------------------------- |
120 // |
120 // |
121 TBool CCUIDriveUtils::ShowSelectionDialogL( TInt& aSelectedDrive ) |
121 TBool CCUIDriveUtils::ShowSelectionDialogL( TInt& aSelectedDrive ) |
122 { |
122 { |
|
123 |
123 TBool result( EFalse ); |
124 TBool result( EFalse ); |
124 |
125 |
|
126 // Removed since CR 548 |
|
127 /* |
125 aSelectedDrive = 0; |
128 aSelectedDrive = 0; |
126 |
129 |
127 #ifdef RD_MULTIPLE_DRIVE |
130 #ifdef RD_MULTIPLE_DRIVE |
128 TBool externalDriveFound = EFalse; |
131 TBool externalDriveFound = EFalse; |
129 RFs fs; |
132 RFs fs; |
228 aSelectedDrive = GetCardDriveIndex(); |
231 aSelectedDrive = GetCardDriveIndex(); |
229 } |
232 } |
230 |
233 |
231 #endif //RD_MULTIPLE_DRIVE |
234 #endif //RD_MULTIPLE_DRIVE |
232 CleanupStack::PopAndDestroy( 2 ); // header, memoryDialog |
235 CleanupStack::PopAndDestroy( 2 ); // header, memoryDialog |
233 |
236 */ |
234 return result; |
237 return result; |
235 } |
238 } |
236 |
239 |
237 // ----------------------------------------------------------------------------- |
240 // ----------------------------------------------------------------------------- |
238 // CCUIDriveUtils::IsInternalDrivePresent |
241 // CCUIDriveUtils::IsInternalDrivePresent |