--- a/contentstorage/casrv/cawidgetscanner/inc/cawidgetstoragehandler.h	Tue Jun 01 11:30:17 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/inc/cawidgetstoragehandler.h	Fri Jun 11 16:13:51 2010 +0300
@@ -1,26 +1,26 @@
 /*
-* 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 C_WIDGETSTORAGEHANDLER_H
 #define C_WIDGETSTORAGEHANDLER_H
 
 class CCaStorageProxy;
 class CCaWidgetDescription;
+class CCaWidgetScannerParser;
 
 //  INCLUDES
 #include <e32base.h>
@@ -40,7 +40,7 @@
 class CCaWidgetStorageHandler : public CBase
     {
 public:
-    CA_STORAGE_TEST_FRIEND_CLASS    (T_CaWidgetScanner)
+CA_STORAGE_TEST_FRIEND_CLASS (T_CaWidgetScanner)
 
 public:
     // Constructors and destructor
@@ -59,11 +59,9 @@
     virtual ~CCaWidgetStorageHandler();
 
     /**
-     * Synchronizes widgets
-     * @param aWidgets widgets to synchronize
+     * SynchronizeL - synchronizes widgets on device with database
      */
-    void SynchronizeL( const RWidgetArray& aWidgets );
-
+    void SynchronizeL();
 
 private:
 
@@ -76,6 +74,7 @@
     /**
      * Updates widget in storage.
      * @param aWidget widget to be updated
+     * @param aEntryId entry of widget in db
      */
     void UpdateL( const CCaWidgetDescription* aWidget, TUint aEntryId );
 
@@ -88,12 +87,12 @@
     /**
      * Removes widgets from DB
      */
-    void RemoveWidgetsL( ) ;
+    void RemoveWidgetsL();
 
     /**
      * Fetch widgets from content storage
      */
-    void FetchWidgetsL( );
+    void FetchWidgetsL();
 
     /**
      * Add widget to download collection
@@ -112,14 +111,13 @@
      * @param aWidget widget.
      */
     void ClearVisibleFlagL( const CCaWidgetDescription* aWidget );
-    
+
     /**
-    * Set localizations for widget in db
-    * @param aWidget widget.
-    * @param aEntryId of widget.
-    */    
-    void SetLocalizationsL( const CCaWidgetDescription* aWidget,
-            TInt aEntryId );
+     * Set localizations for widget in db
+     * @param aWidget widget.
+     * @param aEntryId of widget.
+     */
+    void SetLocalizationsL( const CCaWidgetDescription* aWidget, TInt aEntryId );
 
 private:
 
@@ -131,7 +129,7 @@
     /**
      * By default Symbian 2nd phase constructor is private.
      */
-    void ConstructL( );
+    void ConstructL();
 
     /**
      * Check if mass storage is not in use.
@@ -145,9 +143,8 @@
      * is delivered with
      * @param aEntry widget entry being updated with component id attribute.
      */
-    void UpdateComponentIdL( const TDesC& aManifestFilePathName, 
-        CCaInnerEntry& aEntry ) const;
-
+    void UpdateComponentIdL( const TDesC& aManifestFilePathName,
+            CCaInnerEntry& aEntry ) const;
 
 private:
     // Data
@@ -167,11 +164,10 @@
      */
     RWidgetArray iWidgets;
 
-    /*
-     * Indexes updated during last add operation. Own.
+    /**
+     * Pointer to a parser object. Own
      */
-    RArray<TInt> iUpdatedIndexes;
-    
+    CCaWidgetScannerParser* iParser;
 
     Usif::RSoftwareComponentRegistry iSoftwareRegistry;
     };