--- a/videofeeds/clientapi/inc/CIptvServices.h	Sun Mar 14 13:09:48 2010 +0000
+++ b/videofeeds/clientapi/inc/CIptvServices.h	Sun Mar 28 16:36:31 2010 +0100
@@ -99,7 +99,7 @@
          *               does not contain valid data.
          * @return       Reference to CIptvService class.
          */
-        IMPORT_C CIptvService& CIptvServices::Service( TUint32 aIndex, TInt& aError );        
+        IMPORT_C CIptvService& Service( TUint32 aIndex, TInt& aError );        
         
         /**
          * Adds a service.

--- a/videofeeds/vcnsuiengine/inc/vcxnscontentclienthandler.h	Sun Mar 14 13:09:48 2010 +0000
+++ b/videofeeds/vcnsuiengine/inc/vcxnscontentclienthandler.h	Sun Mar 28 16:36:31 2010 +0100
@@ -53,7 +53,7 @@
      * @param aUiEngine Ui engine
      * @param aConnUtil Connection util
      */
-    static CVcxNsContentClientHandler* CVcxNsContentClientHandler::NewL( 
+    static CVcxNsContentClientHandler* NewL( 
                     CVcxNsUiEngine& aUiEngine, CVcxConnectionUtility& aConnUtil );
     
     virtual ~CVcxNsContentClientHandler();

--- a/videofeeds/vcnsuiengine/inc/vcxnsserviceclienthandler.h	Sun Mar 14 13:09:48 2010 +0000
+++ b/videofeeds/vcnsuiengine/inc/vcxnsserviceclienthandler.h	Sun Mar 28 16:36:31 2010 +0100
@@ -46,7 +46,7 @@
      * 
      * @param aUiEngine Ui engine
      */
-    static CVcxNsServiceClientHandler* CVcxNsServiceClientHandler::NewL( CVcxNsUiEngine& aUiEngine );
+    static CVcxNsServiceClientHandler* NewL( CVcxNsUiEngine& aUiEngine );
     
     virtual ~CVcxNsServiceClientHandler();
 

--- a/videofeeds/vcnsuiengine/inc/vcxnsservicesettings.h	Sun Mar 14 13:09:48 2010 +0000
+++ b/videofeeds/vcnsuiengine/inc/vcxnsservicesettings.h	Sun Mar 28 16:36:31 2010 +0100
@@ -227,7 +227,7 @@
     /**
      * GetServiceManagementClientL
      */    
-    CIptvServiceManagementClient* CVcxNsServiceSettings::GetServiceManagementClientL();
+    CIptvServiceManagementClient* GetServiceManagementClientL();
 
  // Data