diff -r 156f692b1687 -r b99b84bcd2d1 contentstorage/casrv/cawidgetscanner/src/widgetscannerutils.cpp
--- a/contentstorage/casrv/cawidgetscanner/src/widgetscannerutils.cpp	Fri Jun 11 13:58:37 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/src/widgetscannerutils.cpp	Wed Jun 23 18:33:40 2010 +0300
@@ -1,19 +1,19 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:
+ * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "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 "widgetscannerutils.h"
@@ -24,23 +24,26 @@
 //
 // -----------------------------------------------------------------------------
 //
-TBool WidgetScannerUtils::IsFileOnDrive(const TDesC& aFileName,
-    const DriveInfo::TDefaultDrives& aDefaultDrive)
-{
-    if (aFileName.Length()) {
+TBool WidgetScannerUtils::IsFileOnDrive( const TDesC& aFileName,
+        const DriveInfo::TDefaultDrives& aDefaultDrive )
+    {
+    TBool result = EFalse;
+    if ( aFileName.Length() )
+        {
         TInt drive;
-        TInt err = DriveInfo::GetDefaultDrive(aDefaultDrive, drive);
-        if (!err) {
+        TInt err = DriveInfo::GetDefaultDrive( aDefaultDrive, drive );
+        if ( !err )
+            {
             TInt fileDrive;
-            err = RFs::CharToDrive(aFileName[0], fileDrive);
-            if (!err && fileDrive == drive) {
-                return ETrue;
+            err = RFs::CharToDrive( aFileName[0], fileDrive );
+            if ( !err && fileDrive == drive )
+                {
+                result = ETrue;
+                }
             }
         }
+    return result;
     }
-    return EFalse;
-}
-
 
 // -----------------------------------------------------------------------------
 //
@@ -49,11 +52,11 @@
 void WidgetScannerUtils::CurrentMmcId( const RFs& aFs, TDes& aMmcId )
     {
     TInt mmcDrive;
-    if ( DriveInfo::GetDefaultDrive(
-            DriveInfo::EDefaultRemovableMassStorage, mmcDrive ) == KErrNone )
+    if ( DriveInfo::GetDefaultDrive( DriveInfo::EDefaultRemovableMassStorage,
+            mmcDrive ) == KErrNone )
         {
         TVolumeInfo volumeInfo;
-        if( aFs.Volume( volumeInfo, mmcDrive ) == KErrNone )
+        if ( aFs.Volume( volumeInfo, mmcDrive ) == KErrNone )
             {
             aMmcId.Zero();
             aMmcId.AppendNum( volumeInfo.iUniqueID );