--- a/idlefw/plugins/devicestatus/src/aidevicestatuspluginengine.cpp	Tue Feb 02 00:23:10 2010 +0200
+++ b/idlefw/plugins/devicestatus/src/aidevicestatuspluginengine.cpp	Fri Feb 19 23:07:29 2010 +0200
@@ -15,31 +15,37 @@
 *
 */
 
+// System includes
 
+// User includes
+#include <aicontentobserver.h>
 #include "aidevicestatuspluginengine.h"
 #include "aipublisherfactory.h"
 #include "aidevicestatuspublisher.h"
 
+// ======== MEMBER FUNCTIONS ========
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::CAiDeviceStatusPluginEngine
+//
+// ----------------------------------------------------------------------------
+//
 CAiDeviceStatusPluginEngine::CAiDeviceStatusPluginEngine( 
-                                            MAiContentObserver& aObserver, 
-											MAiPropertyExtension& aExtension,
-                                            MAiPublishPrioritizer& aPrioritizer )
-    : iContentObserver( &aObserver ), 
-        iExtension( &aExtension ), 
-        iPrioritizer( &aPrioritizer )
+    MAiContentObserver& aObserver, CHsContentPublisher& aExtension,
+    MAiPublishPrioritizer& aPrioritizer )
+    : iContentObserver( &aObserver ), iExtension( &aExtension ),          
+      iPrioritizer( &aPrioritizer )
 	{	
 	}
 
-
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::ConstructL
+//
+// ----------------------------------------------------------------------------
+//
 void CAiDeviceStatusPluginEngine::ConstructL()
     {
     // Instantiate all publishers via factory
-    MAiDeviceStatusPublisher* publisher = AiPublisherFactory::CreateProfilePublisherL();
-    CleanupStack::PushL( publisher );
-    AddPublisherL( publisher );
-    CleanupStack::Pop( publisher );
-
-    publisher = AiPublisherFactory::CreateDatePublisherL();
+    MAiDeviceStatusPublisher* publisher = AiPublisherFactory::CreateDatePublisherL();
     CleanupStack::PushL( publisher );
     AddPublisherL( publisher );
     CleanupStack::Pop( publisher );
@@ -90,44 +96,54 @@
     CleanupStack::Pop( publisher );
 
     // Subscribe all publishers once they are instantiated
-    const TInt count = iPublishers.Count();
+    const TInt count( iPublishers.Count() );
 
-    for( TInt i( 0 ); i < count; i++ )
+    for ( TInt i( 0 ); i < count; i++ )
         {
-        iPublishers[i]->Subscribe( *iContentObserver, 
-                                    *iExtension, 
-                                    *iPrioritizer, 
-                                    *this );
+        iPublishers[i]->Subscribe( 
+            *iContentObserver, *iExtension, *iPrioritizer, *this );
         }    
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::NewL
+//
+// ----------------------------------------------------------------------------
+//
 CAiDeviceStatusPluginEngine* CAiDeviceStatusPluginEngine::NewL( 
-                                            MAiContentObserver& aObserver, 
-											MAiPropertyExtension& aExtension,
-                                            MAiPublishPrioritizer& aPrioritizer)
+    MAiContentObserver& aObserver, CHsContentPublisher& aExtension,
+    MAiPublishPrioritizer& aPrioritizer )											                                           
     {
     CAiDeviceStatusPluginEngine* self = 
-    	new( ELeave ) CAiDeviceStatusPluginEngine( aObserver, 
-											        aExtension,
-                                                    aPrioritizer);
+    	new( ELeave ) CAiDeviceStatusPluginEngine( aObserver, aExtension, aPrioritizer ); 
+    	        											                                                          
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
     return self;
     }
 
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::~CAiDeviceStatusPluginEngine
+//
+// ----------------------------------------------------------------------------
+//
 
 CAiDeviceStatusPluginEngine::~CAiDeviceStatusPluginEngine()
     {
     iPublishers.ResetAndDestroy();
     }
 
-
-void CAiDeviceStatusPluginEngine::AddPublisherL( MAiDeviceStatusPublisher* aPublisher )
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::AddPublisherL
+//
+// ----------------------------------------------------------------------------
+//
+void CAiDeviceStatusPluginEngine::AddPublisherL( 
+    MAiDeviceStatusPublisher* aPublisher )
     {
 	//Add publisher to list.
-    if( aPublisher )
+    if ( aPublisher )
         {
         CleanupDeletePushL( aPublisher );
         User::LeaveIfError( iPublishers.Append( aPublisher ) );
@@ -135,25 +151,33 @@
         }
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::ResumePublishersL
+//
+// ----------------------------------------------------------------------------
+//
 void CAiDeviceStatusPluginEngine::ResumePublishersL()
 	{
-    const TInt count = iPublishers.Count();
+    const TInt count( iPublishers.Count() );
 
-    for( TInt i( 0 ); i < count; i++ )
+    for ( TInt i( 0 ); i < count; i++ )
         {
         iPublishers[i]->ResumeL();
         }    
 	}
 
-
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::RefreshPublishersL
+//
+// ----------------------------------------------------------------------------
+//
 void CAiDeviceStatusPluginEngine::RefreshPublishersL( TBool aClean )
 	{
 	iContentObserver->StartTransaction( KImplUidDevStaPlugin );
 
-    const TInt count = iPublishers.Count();
+    const TInt count( iPublishers.Count() );
 
-    for( TInt i( 0 ); i < count; i++ )
+    for ( TInt i( 0 ); i < count; i++ )
         {
         iPublishers[i]->RefreshL( aClean );
         }    
@@ -161,19 +185,23 @@
 	iContentObserver->Commit( KImplUidDevStaPlugin );
 	}
 
-
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::RefreshPublishersL
+//
+// ----------------------------------------------------------------------------
+//
 TBool CAiDeviceStatusPluginEngine::RefreshPublishersL( TInt aContentId, 
-                                                        TBool aClean )
+    TBool aClean )
 	{
-	TBool success = EFalse;
+	TBool success( EFalse );
 	
 	iContentObserver->StartTransaction( KImplUidDevStaPlugin );
 
-    const TInt count = iPublishers.Count();
+    const TInt count( iPublishers.Count() );
 
-    for( TInt i( 0 ); i < count; i++ )
+    for ( TInt i( 0 ); i < count; i++ )
         {
-        if( iPublishers[i]->RefreshL( aContentId, aClean ) )
+        if ( iPublishers[i]->RefreshL( aContentId, aClean ) )
             {
             success = ETrue;
             }
@@ -191,23 +219,54 @@
     return success;
 	}
 
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::SuspendPublishersL
+//
+// ----------------------------------------------------------------------------
+//
+TBool CAiDeviceStatusPluginEngine::SuspendPublishersL( TInt aContentId, 
+    TBool aClean )
+    {
+    TBool success( EFalse );
+    
+    const TInt count( iPublishers.Count() );
+    
+    for ( TInt i( 0 ); i < count; i++ )
+        {
+        if ( iPublishers[i]->SuspendL( aContentId, aClean ) )
+            {
+            success = ETrue;
+            }
+        }
+    
+    return success;
+    }
 
+// ----------------------------------------------------------------------------
+// CAiDeviceStatusPluginEngine::RefreshPriorizedPublishersL
+//
+// ----------------------------------------------------------------------------
+//
 TBool CAiDeviceStatusPluginEngine::RefreshPriorizedPublishersL( TInt aContentId,
-                                                                TInt aPriority )
+    TInt aPriority )
 	{
 	iContentObserver->StartTransaction( KImplUidDevStaPlugin );
-	TBool success = EFalse;
-    const TInt count = iPublishers.Count();
+	
+	TBool success( EFalse );
+    
+	const TInt count( iPublishers.Count() );
 
-    for( TInt i( 0 ); i < count; i++ )
+    for ( TInt i( 0 ); i < count; i++ )
         {
-        if( iPublishers[i]->RefreshContentWithPriorityL( aContentId,
-                                                            aPriority ) )
+        MAiDeviceStatusPublisher* publisher( iPublishers[i] );
+        
+        if( publisher->RefreshContentWithPriorityL( aContentId, aPriority ) )                                                                           
             {
             success = ETrue;
             break;
             }
         }
+    
     if ( success )
         {
         iContentObserver->Commit( KImplUidDevStaPlugin );
@@ -216,6 +275,8 @@
         {
         iContentObserver->CancelTransaction( KImplUidDevStaPlugin );
         }
+    
     return success;
 	}
 
+// End of file