--- a/contentstorage/casrv/cawidgetscanner/src/cawidgetscannerplugin.cpp	Tue Jun 01 11:30:17 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/src/cawidgetscannerplugin.cpp	Fri Jun 11 16:13:51 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
 
@@ -21,63 +21,60 @@
 #include <sacls.h>
 
 #include "cawidgetscannerplugin.h"
-#include "cawidgetscannerparser.h"
 #include "cawidgetstoragehandler.h"
 #include "cawidgetscannerinstallnotifier.h"
 
-
 // Function used to return an instance of the proxy table.
 const TImplementationProxy ImplementationTable[] =
     {
     IMPLEMENTATION_PROXY_ENTRY(0x20028707, CCaWidgetScannerPlugin::NewL)
     };
 
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT (proxy for instantiation)
 // ----------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Exported proxy for instantiation method resolution
+// 
 // ----------------------------------------------------------------------------
 //
 EXPORT_C const TImplementationProxy*
 ImplementationGroupProxy( TInt& aTableCount )
     {
-    aTableCount = sizeof( ImplementationTable ) /
-    sizeof( TImplementationProxy );
+    aTableCount = sizeof( ImplementationTable ) / sizeof(TImplementationProxy);
     return ImplementationTable;
     }
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
 
 // ============================ MEMBER FUNCTIONS ===============================
 
-// -----------------------------------------------------------------------------
-// CCaWidgetScannerPlugin ::CCaWidgetScannerPlugin
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 CCaWidgetScannerPlugin::CCaWidgetScannerPlugin()
     {
     }
 
-// -----------------------------------------------------------------------------
-// CCaWidgetScannerPlugin ::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 void CCaWidgetScannerPlugin::ConstructL( TPluginParams* aPluginParams )
     {
     User::LeaveIfError( iFs.Connect() );
     iMmcWatcher = CCaMmcWatcher::NewL( iFs, this );
     iInstallNotifier = CCaWidgetScannerInstallNotifier::NewL( this,
-        KUidSystemCategory, KSAUidSoftwareInstallKeyValue );
-    iParser = CCaWidgetScannerParser::NewL( iFs );
+            KUidSystemCategory, KSAUidSoftwareInstallKeyValue );
     iStorageHandler = CCaWidgetStorageHandler::NewL(
             aPluginParams->storageProxy, iFs );
     SynchronizeL();
     }
 
-// -----------------------------------------------------------------------------
-// CCaWidgetScannerPlugin ::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 CCaWidgetScannerPlugin * CCaWidgetScannerPlugin::NewL(
         TPluginParams* aPluginParams )
@@ -87,29 +84,27 @@
     return self;
     }
 
-// -----------------------------------------------------------------------------
-// CCaWidgetScannerPlugin ::NewLC
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 CCaWidgetScannerPlugin * CCaWidgetScannerPlugin::NewLC(
         TPluginParams* aPluginParams )
     {
-    CCaWidgetScannerPlugin * self = new( ELeave ) CCaWidgetScannerPlugin ( );
+    CCaWidgetScannerPlugin * self = new ( ELeave ) CCaWidgetScannerPlugin();
     CleanupStack::PushL( self );
     self->ConstructL( aPluginParams );
     return self;
     }
 
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
-CCaWidgetScannerPlugin::~CCaWidgetScannerPlugin ()
+CCaWidgetScannerPlugin::~CCaWidgetScannerPlugin()
     {
     delete iMmcWatcher;
     delete iInstallNotifier;
-    delete iParser;
     delete iStorageHandler;
     iFs.Close();
     }
@@ -120,7 +115,7 @@
 //
 void CCaWidgetScannerPlugin::SynchronizeL()
     {
-    iStorageHandler->SynchronizeL( iParser->WidgetsScanL() );
+    iStorageHandler->SynchronizeL();
     }
 
 // ----------------------------------------------------------------------------