--- a/contentstorage/casrv/cawidgetscanner/inc/widgetscannerutils.h	Fri Jun 11 13:58:37 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/inc/widgetscannerutils.h	Wed Jun 23 18:33:40 2010 +0300
@@ -1,20 +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:
+ *
+ */
 
 #ifndef WIDGETSCANNERUTILS_H
 #define WIDGETSCANNERUTILS_H
@@ -22,15 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <driveinfo.h>
-
-// CONSTANTS
-_LIT(KAttrWidgetPath, "widget:path");
-_LIT(KAttrWidgetLibrary, "widget:library");
-_LIT(KAttrWidgetUri, "widget:uri");
-_LIT(KAttrWidgetServiceXml, "widget:servicexml");
-_LIT(KSlash, "/");
-_LIT(KDllExt, ".dll");
-_LIT(KNoLibrary, "NoLibrary");
+#include "cawidgetscannerdef.h"
 
 // FORWARD DECLARATIONS
 class CCaInnerEntry;
@@ -49,8 +40,8 @@
      * @param aDriveLetter drive letter
      * @return ETrue if file is present, EFalse if not
      */
-    static TBool IsFileOnDrive(const TDesC& aFileName,
-        const DriveInfo::TDefaultDrives& aDefaultDrive);
+    static TBool IsFileOnDrive( const TDesC& aFileName,
+            const DriveInfo::TDefaultDrives& aDefaultDrive );
 
     /**
      * Returns current MMC id.