equal
deleted
inserted
replaced
277 // A helper function of MoveObjectL |
277 // A helper function of MoveObjectL |
278 // ----------------------------------------------------------------------------- |
278 // ----------------------------------------------------------------------------- |
279 // |
279 // |
280 void CMoveObject::MoveFileL( const TDesC& aNewFileName ) |
280 void CMoveObject::MoveFileL( const TDesC& aNewFileName ) |
281 { |
281 { |
282 TFileName oldFileName = iObjectInfo->DesC( CMTPObjectMetaData::ESuid ); |
282 HBufC* oldFileName = iObjectInfo->DesC( CMTPObjectMetaData::ESuid ).AllocLC(); // + oldFileName |
283 PRINT2( _L( "MM MTP => CMoveObject::MoveFileL old name = %S, aNewFileName = %S" ), |
283 PRINT2( _L( "MM MTP => CMoveObject::MoveFileL old name = %S, aNewFileName = %S" ), |
284 &oldFileName, |
284 oldFileName, |
285 &aNewFileName ); |
285 &aNewFileName ); |
286 |
286 |
287 if ( iStorageId == iObjectInfo->Uint( CMTPObjectMetaData::EStorageId ) ) |
287 if ( iStorageId == iObjectInfo->Uint( CMTPObjectMetaData::EStorageId ) ) |
288 iSameStorage = ETrue; |
288 iSameStorage = ETrue; |
289 else |
289 else |
293 // Already trapped inside |
293 // Already trapped inside |
294 GetPreviousPropertiesL( *iObjectInfo ); |
294 GetPreviousPropertiesL( *iObjectInfo ); |
295 TRAPD( err, SetPropertiesL( aNewFileName ) ); |
295 TRAPD( err, SetPropertiesL( aNewFileName ) ); |
296 |
296 |
297 CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() ); |
297 CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() ); |
298 err = fileMan->Move( oldFileName, aNewFileName ); |
298 err = fileMan->Move( *oldFileName, aNewFileName ); |
|
299 |
|
300 CleanupStack::PopAndDestroy( oldFileName ); // - oldFileName |
299 |
301 |
300 if ( err != KErrNone ) |
302 if ( err != KErrNone ) |
301 PRINT1( _L( "MM MTP <> CMoveObject::MoveFileL err = %d" ), err ); |
303 PRINT1( _L( "MM MTP <> CMoveObject::MoveFileL err = %d" ), err ); |
302 |
304 |
303 PRINT( _L( "MM MTP <= CMoveObject::MoveFileL" ) ); |
305 PRINT( _L( "MM MTP <= CMoveObject::MoveFileL" ) ); |