diff -r c743ef5928ba -r f966699dea19 idlehomescreen/xmluicontroller/src/xmlnodeidgenerator.cpp
--- a/idlehomescreen/xmluicontroller/src/xmlnodeidgenerator.cpp	Tue Feb 02 00:04:13 2010 +0200
+++ b/idlehomescreen/xmluicontroller/src/xmlnodeidgenerator.cpp	Fri Feb 19 22:42:37 2010 +0200
@@ -15,66 +15,104 @@
 *
 */
 
+// System includes
 
-#include "xmlnodeidgenerator.h"
-#include "aipropertyextension.h"
+// User includes
+#include <hscontentpublisher.h>
+#include <hspublisherinfo.h>
 #include "aicontentmodel.h"
 #include "aixmluiutils.h"
 #include "aixmluiconstants.h"
 #include "aistrcnv.h"
 
+#include "xmlnodeidgenerator.h"
+
 using namespace AiXmlUiController;
 
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::CXmlNodeIdGenerator
+// 
+// ----------------------------------------------------------------------------
+//
 CXmlNodeIdGenerator::CXmlNodeIdGenerator()
     {
     }
-    
+
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::NewL
+// 
+// ----------------------------------------------------------------------------
+//
 CXmlNodeIdGenerator* CXmlNodeIdGenerator::NewL()
     {
-    return new(ELeave) CXmlNodeIdGenerator;
+    return new ( ELeave ) CXmlNodeIdGenerator;
     }
-    
+
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::CXmlNodeIdGenerator
+// 
+// ----------------------------------------------------------------------------
+//
 CXmlNodeIdGenerator::~CXmlNodeIdGenerator()
     {
     delete iContentNodeIdBuf;
     }
 
-TPtrC CXmlNodeIdGenerator::SettingsNodeIdL( const TAiPublisherInfo& aPubInfo )
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::SettingsNodeIdL
+// 
+// ----------------------------------------------------------------------------
+//
+TPtrC CXmlNodeIdGenerator::SettingsNodeIdL( 
+    const THsPublisherInfo& aPublisherInfo )
     {
-    const TInt idLength = aPubInfo.iName.Length()
-                          + AiUiDef::xml::id::KSettingsIdSeparator().Length()
-                          + AiUiDef::xml::propertyClass::KSettings().Length();
-    TPtr bufPtr( AiUtility::EnsureBufMaxLengthL( iContentNodeIdBuf, idLength ) );
+    const TInt idLength( aPublisherInfo.Name().Length() +
+      AiUiDef::xml::id::KSettingsIdSeparator().Length() +
+      AiUiDef::xml::propertyClass::KSettings().Length() );
+    
+    TPtr bufPtr( 
+        AiUtility::EnsureBufMaxLengthL( iContentNodeIdBuf, idLength ) );
     
     bufPtr.Copy( AiUiDef::xml::propertyClass::KSettings );
     bufPtr.Append( AiUiDef::xml::id::KSettingsIdSeparator );
-    bufPtr.Append( aPubInfo.iName );
+    bufPtr.Append( aPublisherInfo.Name() );
     
     return bufPtr;
     }
 
-TPtrC CXmlNodeIdGenerator::ContentNodeIdL(MAiPropertyExtension& aPlugin, const TAiContentItem& aContentItem)
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::CXmlNodeIdGenerator
+// 
+// ----------------------------------------------------------------------------
+//
+TPtrC CXmlNodeIdGenerator::ContentNodeIdL( CHsContentPublisher& aPlugin, 
+    const TAiContentItem& aContentItem )
     {
-    TAiPublisherInfo* info = static_cast<TAiPublisherInfo*>( aPlugin.GetPropertyL( EAiPublisherInfo ) );
-    
-    LeaveIfNull( info, KErrNotFound );
-    
-    return ContentNodeIdL(*info, aContentItem);
+    const THsPublisherInfo& info( aPlugin.PublisherInfo() );
+                  
+    return ContentNodeIdL( info, aContentItem );
     }
-    
-TPtrC CXmlNodeIdGenerator::ContentNodeIdL
-        ( const TAiPublisherInfo& aPubInfo, const TAiContentItem& aContentItem )
+  
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::CXmlNodeIdGenerator
+// 
+// ----------------------------------------------------------------------------
+//
+TPtrC CXmlNodeIdGenerator::ContentNodeIdL(
+    const THsPublisherInfo& aPublisherInfo, 
+    const TAiContentItem& aContentItem )
     {
-    const TDesC& contentCid = ContentCid( aContentItem );
+    const TDesC& contentCid( ContentCid( aContentItem ) );
     
     // Calculate buffer size and ensure buffer has enough room
-    const TInt idLength = aPubInfo.iName.Length()
-                          + AiUiDef::xml::id::KContentIdSeparator().Length()
-                          + contentCid.Length();
-    TPtr bufPtr( AiUtility::EnsureBufMaxLengthL( iContentNodeIdBuf, idLength ) );
+    const TInt idLength( aPublisherInfo.Name().Length() + 
+      AiUiDef::xml::id::KContentIdSeparator().Length() + contentCid.Length() );
+          
+    TPtr bufPtr( 
+        AiUtility::EnsureBufMaxLengthL( iContentNodeIdBuf, idLength ) );
     
     // Copy publisher info name to the buffer
-    bufPtr.Copy( aPubInfo.iName );
+    bufPtr.Copy( aPublisherInfo.Name() );
     
     // Append separator
     bufPtr.Append( AiUiDef::xml::id::KContentIdSeparator );
@@ -85,19 +123,30 @@
     return bufPtr;
     }
 
-TPtrC CXmlNodeIdGenerator::ResourceNodeIdL
-        ( MAiPropertyExtension& aPlugin, const TAiContentItem& aContentItem )
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::CXmlNodeIdGenerator
+// 
+// ----------------------------------------------------------------------------
+//
+TPtrC CXmlNodeIdGenerator::ResourceNodeIdL(
+    CHsContentPublisher& aPlugin, const TAiContentItem& aContentItem )
     {
-    TAiPublisherInfo* info = static_cast<TAiPublisherInfo*>( aPlugin.GetPropertyL( EAiPublisherInfo ) );
-    
-    LeaveIfNull( info, KErrNotFound );
-    
-    return ResourceNodeIdL(*info, aContentItem);
+    const THsPublisherInfo& info( aPlugin.PublisherInfo() );
+           
+    return ResourceNodeIdL( info, aContentItem );
     }
 
-TPtrC CXmlNodeIdGenerator::ResourceNodeIdL
-        ( const TAiPublisherInfo& aPubInfo, const TAiContentItem& aContentItem )
+// ----------------------------------------------------------------------------
+// CXmlNodeIdGenerator::CXmlNodeIdGenerator
+// 
+// ----------------------------------------------------------------------------
+//
+TPtrC CXmlNodeIdGenerator::ResourceNodeIdL(
+    const THsPublisherInfo& aPublisherInfo, 
+    const TAiContentItem& aContentItem )
     {
     // Resources node id is similar to content node id
-    return ContentNodeIdL( aPubInfo, aContentItem );
+    return ContentNodeIdL( aPublisherInfo, aContentItem );
     }
+
+// End of file