--- a/idlehomescreen/nativeuicontroller/inc/aisoftkeyrenderer.h	Tue Feb 02 00:04:13 2010 +0200
+++ b/idlehomescreen/nativeuicontroller/inc/aisoftkeyrenderer.h	Fri Feb 19 22:42:37 2010 +0200
@@ -19,12 +19,16 @@
 #ifndef C_AISOFTKEYRENDERER_H
 #define C_AISOFTKEYRENDERER_H
 
-
+// System includes
 #include <e32base.h>
 #include <coeaui.h> //ECoeStackPriorityDefault
+
+// User includes
 #include "ainativerenderer.h"
 #include "ainativeuimodel.h"
 
+// Forward declarations
+class CHsContentPublisher;
 
 namespace AiNativeUiController
 {
@@ -48,7 +52,7 @@
  *
  *  @since S60 3.2
  */
-class CAiSoftKeyRenderer : public CAiNativeRenderer
+NONSHARABLE_CLASS( CAiSoftKeyRenderer ) : public CAiNativeRenderer
     {
 public:
 
@@ -58,15 +62,15 @@
 
 // from base class CAiNativeRenderer
 
-    void DoPublishL( MAiPropertyExtension& aPlugin,
+    void DoPublishL( CHsContentPublisher& aPlugin,
                         TInt aContent,
                         const TDesC16& aText,
                         TInt aIndex );
-    void DoPublishL( MAiPropertyExtension& aPlugin,
+    void DoPublishL( CHsContentPublisher& aPlugin,
                         TInt aContent,
                         TInt aResource,
                         TInt aIndex );
-    void DoPublishL( MAiPropertyExtension& aPlugin,
+    void DoPublishL( CHsContentPublisher& aPlugin,
                         TInt aContent,
                         const TDesC8& aBuf,
                         TInt aIndex );