--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.cpp	Tue Aug 31 16:57:14 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.cpp	Wed Sep 01 12:39:58 2010 +0100
@@ -78,8 +78,8 @@
 		  iErrors += Test15L();//CULoggerServer::GetInstalledPlugins
 		  iMediaCount = 0;
 		  iErrors += Test16L();//CULoggerServer::GetOutputPluginSettingsL
-		  iErrors += Test18L();//CULoggerServer::SetBufferSizeL
-		  iErrors += Test19L();//CULoggerServer::SetDataNotificationSizeL
+		  iErrors += Test18L();//CULoggerServer::SetBufferSize
+		  iErrors += Test19L();//CULoggerServer::SetDataNotificationSize
 		  iErrors += Test20L();//CULoggerServer::GetBufferSize
 		  iErrors += Test21L();// CULoggerServer::GetDataNotificationSize
 		  iErrors += Test22L();//CULoggerServer::SetGlobalSecondaryFilters
@@ -315,7 +315,7 @@
 	    	aCategory.Append(194);
 	    	
 	    	TInt e = KErrNone;
-	    	e = server->SetActiveFilterL(aCategory,EPrimaryFilter);
+	    	e = server->SetActiveFilter(aCategory,EPrimaryFilter);
 	    	TBuf<128> buf;
 	    	buf.AppendFormat(_L("Code returned from method - %d"), e);
 	    	INFO_PRINTF1(buf);
@@ -340,7 +340,7 @@
 	    {
 	    	RArray<TUint32> array;
 	    	array.Append(34);
-	    	TInt e = server->SetActiveFilterL(array,ESecondaryFilter);
+	    	TInt e = server->SetActiveFilter(array,ESecondaryFilter);
 	    	TBuf<128> buf;
 	    	buf.AppendFormat(_L("Code returned from method - %d"), e);
 	    	INFO_PRINTF1(buf);
@@ -536,9 +536,9 @@
 
 
 TInt CUloggerServerTest1Step::Test18L()
-{//CULoggerServer::SetBufferSizeL
+{//CULoggerServer::SetBufferSize
 	TInt errors = 0;
-		INFO_PRINTF1(_L("Testing - CULoggerServer::SetBufferSizeL method"));
+		INFO_PRINTF1(_L("Testing - CULoggerServer::SetBufferSize method"));
 	CULoggerServer *server = NULL;
 	server = CULoggerServer::NewLC(EPriorityBackground);
 	if(server == NULL)
@@ -550,38 +550,38 @@
 	    {
 	    	TInt e;
 	    	INFO_PRINTF1(_L("testing value: -1"));
-	    	e = server->SetBufferSizeL(-1);
+	    	e = server->SetBufferSize(-1);
 	    	TBuf<128> buf;
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 0"));
-	    	e = server->SetBufferSizeL(0);
+	    	e = server->SetBufferSize(0);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 100"));
-	    	e = server->SetBufferSizeL(100);
+	    	e = server->SetBufferSize(100);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 65535"));
-	    	e = server->SetBufferSizeL(65535);
+	    	e = server->SetBufferSize(65535);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 65536"));
-	    	e = server->SetBufferSizeL(65536);
+	    	e = server->SetBufferSize(65536);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
     		
     		INFO_PRINTF1(_L("testing value: 165537"));
-	    	e = server->SetBufferSizeL(165537);
+	    	e = server->SetBufferSize(165537);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
@@ -592,9 +592,9 @@
 
 
 TInt CUloggerServerTest1Step::Test19L()
-{//CULoggerServer::SetDataNotificationSizeL
+{//CULoggerServer::SetDataNotificationSize
 	TInt errors = 0;
-		INFO_PRINTF1(_L("Testing - CULoggerServer::SetDataNotificationSizeL method"));
+		INFO_PRINTF1(_L("Testing - CULoggerServer::SetDataNotificationSize method"));
 	CULoggerServer *server = NULL;
 	server = CULoggerServer::NewLC(EPriorityBackground);
 	if(server == NULL)
@@ -606,44 +606,44 @@
 	    {
 	    	TInt e;
 	    	INFO_PRINTF1(_L("testing value: -1"));
-	    	e = server->SetDataNotificationSizeL(-1);
+	    	e = server->SetDataNotificationSize(-1);
 	    	TBuf<128> buf;
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 0"));
-	    	e = server->SetDataNotificationSizeL(0);
+	    	e = server->SetDataNotificationSize(0);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 100"));
-	    	e = server->SetDataNotificationSizeL(100);
+	    	e = server->SetDataNotificationSize(100);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 65535"));
-	    	e = server->SetDataNotificationSizeL(65535);
+	    	e = server->SetDataNotificationSize(65535);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
 
 	    	INFO_PRINTF1(_L("testing value: 65536"));
-	    	e = server->SetDataNotificationSizeL(65536);
+	    	e = server->SetDataNotificationSize(65536);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
     		
     		INFO_PRINTF1(_L("testing value: 85536"));
-	    	e = server->SetDataNotificationSizeL(85536);
+	    	e = server->SetDataNotificationSize(85536);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
     		
     		INFO_PRINTF1(_L("testing value: 165538"));
-	    	e = server->SetDataNotificationSizeL(165538);
+	    	e = server->SetDataNotificationSize(165538);
     		buf.AppendFormat(_L("Code returned from method - %d"), e);
     		INFO_PRINTF1(buf);
     		buf.Zero();
@@ -914,10 +914,10 @@
 	}
 	
 
-TInt CUloggerServerTest1Step::Test29L()//CULoggerServer::GetInstalledInputPluginsL
+TInt CUloggerServerTest1Step::Test29L()//CULoggerServer::GetInstalledInputPlugins
 	{
 	TInt errors = 0;
-	INFO_PRINTF1(_L("Testing - CULoggerServer::GetInstalledInputPluginsL method"));
+	INFO_PRINTF1(_L("Testing - CULoggerServer::GetInstalledInputPlugins method"));
 	CULoggerServer *server = NULL;
 	server = CULoggerServer::NewLC(EPriorityBackground);
 	if(server == NULL)
@@ -928,7 +928,7 @@
 	else
 		{
 		RArray<TPtrC8> list;
-    	server->GetInstalledInputPluginsL(list);
+    	server->GetInstalledInputPlugins(list);
     	list.Close();
     	CleanupStack::PopAndDestroy(); //server
 		}