diff -r 28839de615b4 -r 26645d81f48d traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorclient.cpp --- a/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorclient.cpp Thu Aug 19 11:36:21 2010 +0300 +++ b/traceservices/tracefw/integ_test/ost/TEF/te_ostv2integsuite_functional/src/te_tracecollectorclient.cpp Tue Aug 31 16:57:14 2010 +0300 @@ -103,7 +103,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); INFO_PRINTF2(_L("connect err %d"), result); result=logger.SetPrimaryFiltersEnabled(*setfilter,ETrue);//C.A. previously:result=logger.EnableClassifications(*setfilter); @@ -320,7 +320,7 @@ // ************** Block end **************** - configIni.Clear(logger); + configIni.ClearL(logger); logger.Close(); if(setfilter) delete setfilter; @@ -414,7 +414,7 @@ } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); result = logger.SetSecondaryFiltersEnabled(setfilter,ETrue);//C.A. previously:result = logger.EnableModuleUids(setfilter); INFO_PRINTF2(_L("Secondary filter has been set with single filter, %d, check log"), setfilter[0]); INFO_PRINTF2(_L("code: %d"), result); @@ -600,7 +600,7 @@ } } INFO_PRINTF1(_L("Now call clear config to check removing multiple second filters performance")); - configIni.Clear(logger); + configIni.ClearL(logger); INFO_PRINTF1(_L("after clear config- multiple second filters performance")); if(result==1) @@ -694,7 +694,7 @@ #endif #ifndef SysStartTest CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); #endif CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(22); setprimfilter->AppendL(KGroupId); @@ -993,7 +993,7 @@ { INFO_PRINTF1(_L("Now do some multiple type logging testing.")); //CClearConfig configIni; - //configIni.Clear(logger); + //configIni.ClearL(logger); if(result==0) { @@ -1205,7 +1205,7 @@ multsetprimfilter=NULL; } } - configIni.Clear(logger); + configIni.ClearL(logger); } else INFO_PRINTF1(_L("adding file as output plugin failed")); @@ -1310,7 +1310,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); RArray setsecondfilter; @@ -1580,7 +1580,7 @@ else SetBlockResult(EFail); INFO_PRINTF1(_L("Multiple logging to file with kernel side tracing has been tested - check output log. It should contain four lines of tracing of type, (sec,prim), (sec+2, prim), (sec, prim+2), (sec+2, prim+2)")); - configIni.Clear(logger); + configIni.ClearL(logger); } if(setprimfilter) { @@ -1668,7 +1668,7 @@ } } CClearConfig configIni; - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); RArray setsecondfilter; @@ -1885,7 +1885,7 @@ } } - configIni.Clear(logger); + configIni.ClearL(logger); CArrayFixFlat *setprimfilter = new (ELeave)CArrayFixFlat(1); setprimfilter->AppendL(KGroupId); RArray setsecondfilter; @@ -1977,7 +1977,7 @@ SetBlockResult(EFail); INFO_PRINTF1(_L("Simple printf logging to file has been tested with kernel side tracing- check output log")); - configIni.Clear(logger); + configIni.ClearL(logger); if(setprimfilter) {