--- a/appinstaller/AppinstUi/Daemon/Src/programstatus.cpp	Fri Mar 19 09:33:35 2010 +0200
+++ b/appinstaller/AppinstUi/Daemon/Src/programstatus.cpp	Fri Apr 16 15:05:20 2010 +0300
@@ -22,119 +22,119 @@
 #include "programstatus.h"
 #include "SWInstDebug.h"
 
-namespace Swi
+using namespace Swi;
+
+
+// -----------------------------------------------------------------------
+// Two-phased constructor
+// -----------------------------------------------------------------------
+//        
+CProgramStatus* CProgramStatus::NewL( TInt aProcessStatus )
     {
-    // -----------------------------------------------------------------------
-    // Two-phased constructor
-    // -----------------------------------------------------------------------
-    //        
-    CProgramStatus* CProgramStatus::NewL( TInt aProcessStatus )
-        {
-        CProgramStatus* self = NewLC( aProcessStatus );
-        CleanupStack::Pop( self );
-        return self;
-        }
-    
-    
-    // -----------------------------------------------------------------------
-    // Two-phased constructor
-    // -----------------------------------------------------------------------
-    //      
-    CProgramStatus* CProgramStatus::NewLC( TInt aProcessStatus )
-        {
-        CProgramStatus* self = new (ELeave) CProgramStatus;
-        CleanupStack::PushL( self );
-        self->ConstructL( aProcessStatus );
-        return self;    
-        }
-        
-    
-    // -----------------------------------------------------------------------
-    // 2nd phase constructor
-    // -----------------------------------------------------------------------
-    //      
-    void CProgramStatus::ConstructL( TInt aProcessStatus )
-        {                           
-        iGeneralProcessStatus = aProcessStatus;   
-        // Define PS keys for UI. 
-        DefinePSKeyForUI();
-        }
-    
+    CProgramStatus* self = NewLC( aProcessStatus );
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// -----------------------------------------------------------------------
+// Two-phased constructor
+// -----------------------------------------------------------------------
+//      
+CProgramStatus* CProgramStatus::NewLC( TInt aProcessStatus )
+    {
+    CProgramStatus* self = new (ELeave) CProgramStatus;
+    CleanupStack::PushL( self );
+    self->ConstructL( aProcessStatus );
+    return self;    
+    }
     
-    // -----------------------------------------------------------------------
-    // C++ destructor
-    // -----------------------------------------------------------------------
-    //      
-    CProgramStatus::~CProgramStatus()
-        {
-        }
- 
-    
-    // -----------------------------------------------------------------------
-    // Set program status.
-    // -----------------------------------------------------------------------
-    //      
-    void CProgramStatus::SetProgramStatus( TInt aProcessStatus )
-        {
-        iGeneralProcessStatus = aProcessStatus;
-        }
-    
+
+// -----------------------------------------------------------------------
+// 2nd phase constructor
+// -----------------------------------------------------------------------
+//      
+void CProgramStatus::ConstructL( TInt aProcessStatus )
+    {                           
+    iGeneralProcessStatus = aProcessStatus;   
+    // Define PS keys for UI. 
+    DefinePSKeyForUI();
+    }
+
+
+// -----------------------------------------------------------------------
+// C++ destructor
+// -----------------------------------------------------------------------
+//      
+CProgramStatus::~CProgramStatus()
+    {
+    }
+
+
+// -----------------------------------------------------------------------
+// Set program status.
+// -----------------------------------------------------------------------
+//      
+void CProgramStatus::SetProgramStatus( TInt aProcessStatus )
+    {
+    iGeneralProcessStatus = aProcessStatus;
+    }
+
+
+// -----------------------------------------------------------------------
+// Get program status.
+// -----------------------------------------------------------------------
+//      
+TInt CProgramStatus::GetProgramStatus()
+    {
+    return iGeneralProcessStatus;
+    }
+
+
+// -----------------------------------------------------------------------
+// Set program status to idle.
+// -----------------------------------------------------------------------
+//       
+void CProgramStatus::SetProgramStatusToIdle()
+    {
+    iGeneralProcessStatus = EStateIdle;
+    }
+
+// -----------------------------------------------------------------------
+// Define PS key for UI and set the key value. 
+// -----------------------------------------------------------------------
+//      
+void CProgramStatus::DefinePSKeyForUI()
+    {                
+    _LIT_SECURITY_POLICY_C1( KReadProtection, ECapability_None );
+    _LIT_SECURITY_POLICY_C1( KWriteProtection, ECapabilityWriteDeviceData );
     
-    // -----------------------------------------------------------------------
-    // Get program status.
-    // -----------------------------------------------------------------------
-    //      
-    TInt CProgramStatus::GetProgramStatus()
-        {
-        return iGeneralProcessStatus;
-        }
-    
+    // Define the property.
+    TInt err = RProperty::Define( 
+        KPSUidSWInstallerUiNotification, 
+        KSWInstallerDisableDaemonNotes, 
+        RProperty::EInt,
+        KReadProtection,
+        KWriteProtection );
     
-    // -----------------------------------------------------------------------
-    // Set program status to idle.
-    // -----------------------------------------------------------------------
-    //       
-    void CProgramStatus::SetProgramStatusToIdle()
-        {
-        iGeneralProcessStatus = EStateIdle;
-        }
-  
-    // -----------------------------------------------------------------------
-    // Define PS key for UI and set the key value. 
-    // -----------------------------------------------------------------------
-    //      
-    void CProgramStatus::DefinePSKeyForUI()
-        {                
-        _LIT_SECURITY_POLICY_C1( KReadProtection, ECapability_None );
-        _LIT_SECURITY_POLICY_C1( KWriteProtection, ECapabilityWriteDeviceData );
+    FLOG_1( _L("[CProgramStatus] RProperty::Define error = %d "), err );
+           
+    // If key is not set when Daemon starts, set value.
+    if ( err == KErrNone )
+        {  
+        // Key can be set to False at this point. Correct PS key will 
+        // be read in AO's RunL.
+        TInt keyValue = EFalse;
         
-        // Define the property.
-        TInt err = RProperty::Define( 
+        err = RProperty::Set( 
             KPSUidSWInstallerUiNotification, 
             KSWInstallerDisableDaemonNotes, 
-            RProperty::EInt,
-            KReadProtection,
-            KWriteProtection );
+            keyValue );
         
-        FLOG_1( _L("[CProgramStatus] RProperty::Define error = %d "), err );
-               
-        // If key is not set when Daemon starts, set value.
-        if ( err == KErrNone )
-            {  
-            // Key can be set to False at this point. Correct PS key will 
-            // be read in AO's RunL.
-            TInt keyValue = EFalse;
-            
-            err = RProperty::Set( 
-                KPSUidSWInstallerUiNotification, 
-                KSWInstallerDisableDaemonNotes, 
-                keyValue );
-            
-            FLOG_1( _L("[CProgramStatus] RProperty::Set error = %d "), err );
-            }                  
-        }
-    
-    } // namespace
+        FLOG_1( _L("[CProgramStatus] RProperty::Set error = %d "), err );
+        }                  
+    }
 
+  
 //EOF