diff -r 156f692b1687 -r b99b84bcd2d1 contentstorage/casrv/cawidgetscanner/src/cawidgetscannerinstallnotifier.cpp
--- a/contentstorage/casrv/cawidgetscanner/src/cawidgetscannerinstallnotifier.cpp	Fri Jun 11 13:58:37 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/src/cawidgetscannerinstallnotifier.cpp	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:  Sis package installation event listener
+ * 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:  Sis package installation event listener
+ *
+ */
 
 #include <sacls.h>
 #include "cawidgetscannerinstallnotifier.h"
@@ -23,73 +22,73 @@
 // ============================ MEMBER FUNCTIONS =============================
 
 // -----------------------------------------------------------------------------
-// CCaWidgetScannerInstallNotifier::CCaWidgetScannerInstallNotifier
-// C++ default constructor
+//
 // -----------------------------------------------------------------------------
 //
 CCaWidgetScannerInstallNotifier::CCaWidgetScannerInstallNotifier(
-    CCaWidgetScannerPlugin* aCallback, TUid aCategory, TUint aKey ) :
-    CActive(EPriorityNormal)
+        CCaWidgetScannerPlugin* aCallback, TUid aCategory, TUint aKey ) :
+    CActive( EPriorityNormal )
     {
     CActiveScheduler::Add( this );
 
     iCallback = aCallback;
     iCategory = aCategory;
     iKey = aKey;
-    // Prepare automatically
     iProperty.Attach( iCategory, iKey );
-    SetActive( );
+    SetActive();
     iProperty.Subscribe( iStatus );
+    iHackFlag = EFalse;
     }
 
 // -----------------------------------------------------------------------------
-// CCaWidgetScannerInstallNotifier::ConstructL
-// S2nd phase constructor.
+//
 // -----------------------------------------------------------------------------
 //
 void CCaWidgetScannerInstallNotifier::ConstructL()
     {
-    iHackFlag = EFalse;
     }
 
 // ---------------------------------------------------------------------------
-// CCaWidgetScannerInstallNotifier::NewL
+//
 // ---------------------------------------------------------------------------
 //
 CCaWidgetScannerInstallNotifier* CCaWidgetScannerInstallNotifier::NewL(
-    CCaWidgetScannerPlugin* aCallback, TUid aCategory, TUint aKey )
+        CCaWidgetScannerPlugin* aCallback, TUid aCategory, TUint aKey )
     {
-    CCaWidgetScannerInstallNotifier* self = 
-            new (ELeave) CCaWidgetScannerInstallNotifier( aCallback,
-            aCategory, aKey );
+    CCaWidgetScannerInstallNotifier* self =
+            new ( ELeave ) CCaWidgetScannerInstallNotifier( aCallback,
+                    aCategory, aKey );
     CleanupStack::PushL( self );
-    self->ConstructL( );
+    self->ConstructL();
     CleanupStack::Pop( self );
 
     return self;
     }
 
 // ---------------------------------------------------------------------------
-// CCaWidgetScannerInstallNotifier::~CCaWidgetScannerInstallNotifier
+//
 // ---------------------------------------------------------------------------
 //
 CCaWidgetScannerInstallNotifier::~CCaWidgetScannerInstallNotifier()
     {
-    Cancel( );
-    iProperty.Close( );
+    Cancel();
+    iProperty.Close();
     }
 
 // ---------------------------------------------------------------------------
-// CCaWidgetScannerInstallNotifier::DoCancel
+//
 // ---------------------------------------------------------------------------
 //
 void CCaWidgetScannerInstallNotifier::DoCancel()
     {
-    iProperty.Cancel( );
+    iProperty.Cancel();
     }
 
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT (error is ignored)
 // ---------------------------------------------------------------------------
-// CCaWidgetScannerInstallNotifier::RunError
+//
 // ---------------------------------------------------------------------------
 //
 TInt CCaWidgetScannerInstallNotifier::RunError( TInt /*aError*/)
@@ -97,27 +96,30 @@
     // No need to do anything      
     return KErrNone;
     }
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
 
 // ---------------------------------------------------------------------------
-// CCaWidgetScannerInstallNotifier::RunL
+//
 // ---------------------------------------------------------------------------
 //
 void CCaWidgetScannerInstallNotifier::RunL()
     {
     // Re-issue request before notifying
-    SetActive( );
+    SetActive();
     iProperty.Subscribe( iStatus );
 
     TInt status;
     User::LeaveIfError( iProperty.Get( KUidSystemCategory,
-        KSAUidSoftwareInstallKeyValue, status ) );
-    
-    if( iHackFlag )
+            KSAUidSoftwareInstallKeyValue, status ) );
+
+    if ( iHackFlag )
         {
         iHackFlag = EFalse;
         iCallback->SynchronizeL();
         }
-    else if ( (status & EInstOpInstall )||(status & EInstOpUninstall ) )
+    else if ( ( status & EInstOpInstall ) || ( status & EInstOpUninstall ) )
         {
         iHackFlag = ETrue;
         }