diff -r e16d72588c28 -r 8a03a285ab14 omadrm/drmengine/roap/src/RoapResponse.cpp
--- a/omadrm/drmengine/roap/src/RoapResponse.cpp	Fri Mar 12 15:43:46 2010 +0200
+++ b/omadrm/drmengine/roap/src/RoapResponse.cpp	Mon Mar 15 12:41:43 2010 +0200
@@ -19,7 +19,7 @@
 #undef _ROAP_TESTING
 
 #ifdef RD_MULTIPLE_DRIVE
-#include <DriveInfo.h>
+#include <driveinfo.h>
 #endif
 
 // INCLUDE FILES
@@ -30,7 +30,7 @@
 
 // EXTERNAL DATA STRUCTURES
 
-// EXTERNAL FUNCTION PROTOTYPES  
+// EXTERNAL FUNCTION PROTOTYPES
 
 // CONSTANTS
 
@@ -68,7 +68,7 @@
     iPdu = HBufC8::NewL( 0 );
     iMultipartState = EOther;
     iMaxSize = -1;
-    }    
+    }
 
 // -----------------------------------------------------------------------------
 // CRoapResponse::NewL()
@@ -101,7 +101,7 @@
     {
     return *iPdu;
     }
-    
+
 // -----------------------------------------------------------------------------
 // CRoapResponse::PduFileName()
 // -----------------------------------------------------------------------------
@@ -110,7 +110,7 @@
     {
     return iDcfFileName;
     }
-    
+
 // -----------------------------------------------------------------------------
 // CRoapResponse::SetPduFileName()
 // -----------------------------------------------------------------------------
@@ -119,48 +119,48 @@
     const TPath& aPath )
     {
     LOG( _L("CRoapResponse::SetDcfPathL->") );
-    
+
     RFs fs;
     RFile file;
     User::LeaveIfError( fs.Connect() );
     CleanupClosePushL( fs );
-    
+
     if ( aPath.Length() > 3 )
         {
         User::LeaveIfError( file.Temp( fs, aPath, iDcfFileName,
                             EFileShareExclusive | EFileWrite ) );
         }
-    else 
+    else
         {
-        
+
 #ifndef RD_MULTIPLE_DRIVE
-        
+
         User::LeaveIfError( file.Temp( fs, KMultipartPduTempPath(), iDcfFileName,
                             EFileShareExclusive | EFileWrite ) );
-    
+
 #else //RD_MULTIPLE_DRIVE
-    
+
         _LIT( KDriveRoot, "%c:\\");
         TInt driveNumber( -1 );
         TChar driveLetter;
         DriveInfo::GetDefaultDrive( DriveInfo::EDefaultSystem, driveNumber );
-	    fs.DriveToChar( driveNumber, driveLetter );
-    
-	    TFileName multipartTemp;
-	    multipartTemp.Format( KDriveRoot, (TUint)driveLetter );
-        
+        fs.DriveToChar( driveNumber, driveLetter );
+
+        TFileName multipartTemp;
+        multipartTemp.Format( KDriveRoot, (TUint)driveLetter );
+
         User::LeaveIfError( file.Temp( fs, multipartTemp, iDcfFileName,
                             EFileShareExclusive | EFileWrite ) );
-    
+
 #endif
         }
-    LOG2( _L("iDcfFileName: %S"), &iDcfFileName );    
-        
+    LOG2( _L("iDcfFileName: %S"), &iDcfFileName );
+
     file.Close();
     CleanupStack::PopAndDestroy();
     LOG( _L("CRoapResponse::SetDcfFileName <-") );
     }
-    
+
 // -----------------------------------------------------------------------------
 // CRoapResponse::AppendPduFileDataL()
 // -----------------------------------------------------------------------------
@@ -170,7 +170,7 @@
     {
     WriteL( aData );
     }
-    
+
 // ---------------------------------------------------------
 // CRoapResponse::DataType()
 // ---------------------------------------------------------
@@ -182,7 +182,7 @@
 
 // -----------------------------------------------------------------------------
 // CRoapResponse::HandleBodyDataL
-// 
+//
 // -----------------------------------------------------------------------------
 //
 void CRoapResponse::HandleBodyDataL(
@@ -200,7 +200,7 @@
         {
         RFs fs;
         RFile file;
-        
+
         LOG( _L("  saving DCF data") );
         User::LeaveIfError( fs.Connect() );
         CleanupClosePushL( fs );
@@ -215,7 +215,7 @@
 
 // -----------------------------------------------------------------------------
 // CRoapResponse::StartBodyPartL
-// 
+//
 // -----------------------------------------------------------------------------
 //
 void CRoapResponse::StartBodyPartL()
@@ -240,7 +240,7 @@
 
 // -----------------------------------------------------------------------------
 // CRoapResponse::EndBodyPartL
-// 
+//
 // -----------------------------------------------------------------------------
 //
 void CRoapResponse::EndBodyPartL()
@@ -248,32 +248,32 @@
     LOG( _L("CRoapResponse::EndBodyPartL ->") );
     LOG( _L("CRoapResponse::EndBodyPartL <-") );
     }
-    
+
 // -----------------------------------------------------------------------------
 // CRoapResponse::SetContentNameL
-// 
+//
 // -----------------------------------------------------------------------------
-//    
+//
 void CRoapResponse::SetContentNameL( const TDes& aName )
     {
     LOG( _L("CRoapResponse::SetContentNameL") );
-    
+
     delete iContentName;
     iContentName = NULL;
-    
+
     iContentName = aName.AllocL();
     }
 
 
 // -----------------------------------------------------------------------------
 // CRoapResponse::GetContentNameLC
-// 
+//
 // -----------------------------------------------------------------------------
 //
 void CRoapResponse::GetContentNameLC( HBufC*& aName ) const
     {
     LOG( _L("CRoapResponse::GetContentName") );
-        
+
     if ( iContentName )
         aName = iContentName->AllocLC();
     else
@@ -281,25 +281,25 @@
     }
 // -----------------------------------------------------------------------------
 // CRoapResponse::SetMaxSize
-// 
+//
 // -----------------------------------------------------------------------------
-//    
+//
 void CRoapResponse::SetMaxSize( const TInt& aSize )
     {
     LOG( _L("CRoapResponse::SetMaxSize") );
-    
+
     iMaxSize = aSize;
     }
 
 
 // -----------------------------------------------------------------------------
 // CRoapResponse::MaxSize
-// 
+//
 // -----------------------------------------------------------------------------
 //
 TInt CRoapResponse::MaxSize() const
     {
     LOG( _L("CRoapResponse::MaxSize") );
-        
+
     return iMaxSize;
     }