diff -r 1f3c3f2f5b0a -r c711bdda59f4 webengine/wrtharvester/src/wrtusbhandler.cpp
--- a/webengine/wrtharvester/src/wrtusbhandler.cpp	Mon Mar 15 12:44:50 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  
-*
-*/
-
-// INCLUDE FILES
-#include "wrtusbhandler.h"
-#include "wrtharvester.h"
-#include "wrtusbhandler.h"
-#include <DriveInfo.h>
-
-// CONSTANTS
-
-
-// ============================================================================
-// CWrtUsbHandler::NewL()
-// two-phase constructor
-//
-// @since 3.1
-// @param aRegistry - Widget registry for callback.
-// @param aFs - file session
-// @return pointer to CWrtUsbHandler
-// ============================================================================
-//
-CWrtUsbHandler* CWrtUsbHandler::NewL(
-    CWrtHarvester* aHarvester,
-    RFs& aFs )
-    {
-    CWrtUsbHandler* self =
-        new(ELeave) CWrtUsbHandler( aHarvester , aFs );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ============================================================================
-// CWrtUsbHandler::CWrtUsbHandler()
-// C++ default constructor
-//
-// @since 3.1
-// ============================================================================
-//
-CWrtUsbHandler::CWrtUsbHandler( CWrtHarvester* aHarvester,
-                                      RFs& aFs )
-    : CActive( CActive::EPriorityUserInput ),
-      iHarvester( aHarvester ),
-      iFs( aFs ),
-      iDriveFlags( 0 )
-    {
-    CActiveScheduler::Add( this );
-    }
-
-// ============================================================================
-// CWrtUsbHandler::ConstructL()
-// Symbian default constructor
-//
-// @since 3.1
-// ============================================================================
-//
-void CWrtUsbHandler::ConstructL()
-    {
-    if ( KErrNone != ScanDrives( iDriveFlags ) )
-        {
-        iDriveFlags = 0;
-        }        
-    }
-
-// ============================================================================
-// CWrtUsbHandler::~CWrtUsbHandler()
-// destructor
-//
-// @since 3.1
-// ============================================================================
-CWrtUsbHandler::~CWrtUsbHandler()
-    {
-    Cancel();
-    }
-
-// ============================================================================
-// CWrtUsbHandler::Start()
-// Start monitoring.
-//
-// @since 5.0
-// ============================================================================
-void CWrtUsbHandler::Start()
-    {
-    iFs.NotifyChange( ENotifyDisk, iStatus );
-    SetActive();
-    }
-
-// ============================================================================
-// CWrtUsbHandler::RunL()
-// Handle notifications of MMC events.
-//
-// @since 3.1
-// ============================================================================
-void CWrtUsbHandler::RunL()
-    {
-    TInt status = iStatus.Int();
-    
-    // Restart NotifyChange
-    Start();
-    
-    if ( status == KErrNone )
-      {
-      DoScanAndUpdate();
-      }
-    }
-
-void CWrtUsbHandler::DoScanAndUpdate()
-    {
-    TInt err = 0;
-    TInt driveFlags = 0;
-    TInt deltaDriveFlags = 0;
-    if ( KErrNone == ScanDrives( driveFlags ) )
-        {
-        deltaDriveFlags = iDriveFlags ^ driveFlags;
-        iDriveFlags = driveFlags;
-        }
-    
-    if ( deltaDriveFlags )
-        {
-        TVolumeInfo volInfo;
-        TInt temp = deltaDriveFlags;
-        TBool massMemAltered = EFalse;        
-        TBool massMemAvailable = EFalse;
-        for(TInt DriveNo = EDriveA+1 ; DriveNo<=EDriveY; DriveNo++ )
-            {   
-            temp =  temp >> 1;
-            if( temp & 01)
-                {
-                TUint status(0);
-                err = DriveInfo::GetDriveStatus( iFs, DriveNo , status );
-                if(!err && (status & DriveInfo::EDriveExternallyMountable) && (status & DriveInfo::EDriveInternal ))
-                    {
-                    //Internal Memory
-                    massMemAltered = ETrue;                  
-                    // Check is the internal memory available or not
-                    if(iDriveFlags & (1<<DriveNo))
-                      massMemAvailable = ETrue;
-                    }                     
-                }            
-            }
-            if( massMemAltered )
-              {
-              if(!massMemAvailable)
-                {
-                // Mass storage is plugged
-                iHarvester->SetMSMode(1);
-                }
-              else
-                {
-                // Mass storage was unplugged
-                if(iHarvester->IsInMSMode() == 1)
-                  {
-                  iHarvester->SetMSMode(0);	            
-                  iHarvester->ClearAllOperations();                  
-                  }
-                }
-              }
-        }
-    }
-
-
-// ============================================================================
-// CWrtUsbHandler::RunError()
-// Ignore errors from RunL.
-//
-// @since 5.0
-// ============================================================================
-TInt CWrtUsbHandler::RunError( TInt /* aError */ )
-    {
-    return KErrNone; // indicates error was handled
-    }
-
-// ============================================================================
-// CWrtUsbHandler::DoCancel()
-// Cancel the MMC event handler
-//
-// @since 3.1
-// ============================================================================
-void CWrtUsbHandler::DoCancel()
-    {
-    iFs.NotifyChangeCancel();
-    }
-
-/* Scans drives and records a bit flag for those that exist and are
- * suitable for installing widgets to.
- */
-TInt CWrtUsbHandler::ScanDrives( TInt& aDriveFlags )
-    {
-    // List all drives in the system
-    TDriveList driveList;
-    TInt error = iFs.DriveList( driveList );
-    if ( KErrNone == error )
-        {
-        for ( TInt driveNumber = EDriveY;
-              driveNumber >= EDriveA;
-              driveNumber-- )
-            {
-            // The drives that will be filtered out are the same ones that
-            // WidgetInstaller filters out in CWidgetUIHandler::SelectDriveL()
-            if ( (EDriveD == driveNumber)
-                 || !driveList[driveNumber] )
-                {
-                // EDriveD is a temporary drive usually a RAM disk
-                continue;
-                }
-
-            TVolumeInfo volInfo;
-            if ( iFs.Volume( volInfo, driveNumber ) != KErrNone )
-                {
-                // volume is not usable (e.g. no media card inserted)
-                continue;
-                }
-            if ( (volInfo.iDrive.iType == EMediaNotPresent) ||
-                 (volInfo.iDrive.iType == EMediaRom) ||
-                 (volInfo.iDrive.iType == EMediaRemote) ||
-                 (volInfo.iDrive.iDriveAtt & KDriveAttRom) ||
-                 (volInfo.iDrive.iDriveAtt & KDriveAttSubsted) )
-                {
-                // not a suitable widget install drive
-                continue;
-                }
-
-            // found a usable drive
-            aDriveFlags |= (1 << driveNumber);
-          
-            }
-        }
-
-    return error;
-    }
-