--- a/idlehomescreen/nativeuicontroller/src/ainavipanerenderer.cpp	Tue Feb 02 00:04:13 2010 +0200
+++ b/idlehomescreen/nativeuicontroller/src/ainavipanerenderer.cpp	Fri Feb 19 22:42:37 2010 +0200
@@ -15,11 +15,14 @@
 *
 */
 
-
-#include <aipropertyextension.h>
+// System includes
 #include <centralrepository.h>
 #include <ProfileEngineSDKCRKeys.h>
 
+// User includes
+#include <hscontentpublisher.h>
+#include <hspublisherinfo.h>
+
 #include "ainavipanerenderer.h"
 #include "ainavipaneanimator.h"
 #include "aistatuspanel.h"
@@ -31,7 +34,11 @@
 
 using namespace AiNativeUiController;
 
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::ConstructL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiNaviPaneRenderer::ConstructL()
     {
     iAnimator = CAiNaviPaneAnimator::NewL( iStatusPanel, 
@@ -41,17 +48,26 @@
     iSilentIndicator = HBufC::NewL(0);
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::NewLC()
+//
+// ----------------------------------------------------------------------------
+//
 CAiNaviPaneRenderer* CAiNaviPaneRenderer::NewLC( 
         CAiStatusPanel& aStatusPanel )
     {
-    CAiNaviPaneRenderer* self = new( ELeave ) CAiNaviPaneRenderer( aStatusPanel );
+    CAiNaviPaneRenderer* self = 
+        new( ELeave ) CAiNaviPaneRenderer( aStatusPanel );
     CleanupStack::PushL( self );
     self->ConstructL();
     return self;
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::~CAiNaviPaneRenderer()
+//
+// ----------------------------------------------------------------------------
+//
 CAiNaviPaneRenderer::~CAiNaviPaneRenderer()
     { 
     delete iAnimator;
@@ -60,7 +76,11 @@
     delete iTimedProfileIndicator;
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::CAiNaviPaneRenderer()
+//
+// ----------------------------------------------------------------------------
+//
 CAiNaviPaneRenderer::CAiNaviPaneRenderer( CAiStatusPanel& aStatusPanel )
     : iStatusPanel( aStatusPanel ), 
     iRenderingPriorities( AiNativeUiModel::RenderingPriorities( AiNativeUiModel::KNaviPaneId ) ),
@@ -69,13 +89,17 @@
     {
     }
 
-
-void CAiNaviPaneRenderer::DoPublishL( MAiPropertyExtension& aPlugin,
-                                      TInt aContent, 
-                                      const TDesC16& aText,
-                                      TInt /*aIndex*/ )
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::DoPublishL()
+//
+// ----------------------------------------------------------------------------
+//
+void CAiNaviPaneRenderer::DoPublishL( CHsContentPublisher& aPlugin,
+    TInt aContent, const TDesC16& aText, TInt /*aIndex*/ )
     {
-    if( aPlugin.PublisherInfoL()->iUid == KDeviceStatusPluginUid )
+    const THsPublisherInfo& info( aPlugin.PublisherInfo() );
+    
+    if( info.Uid() == KDeviceStatusPluginUid )
            {
         switch( aContent )
             {
@@ -226,6 +250,11 @@
            }
     }
 
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::ConstructProfileTextLC()
+//
+// ----------------------------------------------------------------------------
+//
 HBufC* CAiNaviPaneRenderer::ConstructProfileTextLC()
     {
     TInt bufLen = iProfileText->Length();
@@ -253,9 +282,16 @@
     return temp;
     }
 
-void CAiNaviPaneRenderer::DoCleanL( MAiPropertyExtension& aPlugin, TInt aContent )
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::DoCleanL()
+//
+// ----------------------------------------------------------------------------
+//
+void CAiNaviPaneRenderer::DoCleanL( CHsContentPublisher& aPlugin, TInt aContent )
     {
-    if( aPlugin.PublisherInfoL()->iUid == KDeviceStatusPluginUid )
+    const THsPublisherInfo& info( aPlugin.PublisherInfo() );
+    
+    if( info.Uid() == KDeviceStatusPluginUid )
         {    
 
         switch( aContent )
@@ -305,7 +341,7 @@
                     iStatusPanel.RenderNaviPaneL();
 
                     MAiContentRequest* contentReq = static_cast<MAiContentRequest*>(
-                        aPlugin.GetPropertyL( EAiContentRequest ) );
+                        aPlugin.GetProperty( CHsContentPublisher::EContentRequest ) );
                         
                     if ( contentReq )
                         {
@@ -349,7 +385,11 @@
     
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::FocusObtainedL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiNaviPaneRenderer::FocusObtainedL()
     {
     if( !iStatusPanel.IsKeyLockEnabled() )
@@ -359,7 +399,11 @@
     iFocusObtained = ETrue;    
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::FocusLostL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiNaviPaneRenderer::FocusLostL()
     {
     iAnimator->CancelAnimationL();
@@ -367,19 +411,31 @@
     iCommitted = EFalse;
     }
 
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::KeylockDisabledL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiNaviPaneRenderer::KeylockDisabledL()
     {
     iAnimator->AnimateL();
     }
  
-    
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::KeylockEnabledL()
+//
+// ----------------------------------------------------------------------------
+//    
 void CAiNaviPaneRenderer::KeylockEnabledL()
     {
     iAnimator->CancelAnimationL();
     }
     
-
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::TransactionCommittedL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiNaviPaneRenderer::TransactionCommittedL()
     {
     if( iIsChanged )
@@ -393,7 +449,11 @@
         }
     }
     
-    
+// ----------------------------------------------------------------------------
+// CAiNaviPaneRenderer::AnimationCompleteL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiNaviPaneRenderer::AnimationCompleteL()
     {
     // Navi pane animation is now completed -> show original text
@@ -414,3 +474,4 @@
     CleanupStack::PopAndDestroy( newText );
     }
 
+// End of file