--- a/mmserv/radioutility/radio_utility/src/RadioRdsUtility.cpp	Tue Aug 31 15:43:02 2010 +0300
+++ b/mmserv/radioutility/radio_utility/src/RadioRdsUtility.cpp	Wed Sep 01 12:23:00 2010 +0100
@@ -17,7 +17,6 @@
 
 
 #include "RadioRdsUtilityBody.h"
-#include "trace.h"
 
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::NewL
@@ -28,7 +27,6 @@
     RRadioSession& aRadioSession,
     MRadioRdsObserver& aObserver)
     {
-    FUNC_LOG;
     CRadioRdsUtility* self = new(ELeave) CRadioRdsUtility;
     CleanupStack::PushL(self);
     self->iBody = CRadioRdsUtility::CBody::NewL(aRadioSession, aObserver);
@@ -43,8 +41,7 @@
 //
 CRadioRdsUtility::~CRadioRdsUtility()
     {
-    FUNC_LOG;
-    delete iBody;
+        delete iBody;
     }
 
 // -----------------------------------------------------------------------------
@@ -54,7 +51,6 @@
 //
 CRadioRdsUtility::CRadioRdsUtility()
     {
-    FUNC_LOG;
     }
 
 // -----------------------------------------------------------------------------
@@ -63,7 +59,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::Close()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->Close();
     }
@@ -75,7 +70,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetCapabilities(
     TRdsCapabilities& aCaps ) const
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetCapabilities(aCaps);
     }
@@ -87,7 +81,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetRdsSignalStatus(
     TBool& aRdsSignal ) const
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetRdsSignalStatus( aRdsSignal );
     }
@@ -99,7 +92,6 @@
 EXPORT_C TInt CRadioRdsUtility::NotifyRdsDataChange(
     TRdsData aRdsData )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->NotifyRdsDataChange( aRdsData );
     }
@@ -110,7 +102,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::CancelNotifyRdsDataChange()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->CancelNotifyRdsDataChange();
     }
@@ -122,7 +113,6 @@
 EXPORT_C TInt CRadioRdsUtility::SetAutomaticSwitching(
     TBool aAuto )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->SetAutomaticSwitching(aAuto);
     }
@@ -134,7 +124,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetAutomaticSwitching(
     TBool& aAuto )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetAutomaticSwitching(aAuto);
     }
@@ -145,7 +134,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::CancelAFSearch()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->CancelAFSearch();
     }
@@ -157,7 +145,6 @@
 EXPORT_C TInt CRadioRdsUtility::SetAutomaticTrafficAnnouncement(
     TBool aAuto )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->SetAutomaticTrafficAnnouncement(aAuto);
     }
@@ -169,7 +156,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetAutomaticTrafficAnnouncement(
     TBool& aAuto )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetAutomaticTrafficAnnouncement(aAuto);
     }
@@ -182,7 +168,6 @@
     TRdsProgrammeType aPty,
     TBool aUpwards )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->StationSeekByPTY(aPty, aUpwards);
     }
@@ -194,7 +179,6 @@
 EXPORT_C void CRadioRdsUtility::StationSeekByTA(
     TBool aSeekUp )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->StationSeekByTA(aSeekUp);
     }
@@ -206,7 +190,6 @@
 EXPORT_C void CRadioRdsUtility::StationSeekByTP(
     TBool aSeekUp )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->StationSeekByTP(aSeekUp);
     }
@@ -217,7 +200,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::CancelRdsStationSeek()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->CancelRdsStationSeek();
     }
@@ -229,7 +211,6 @@
 EXPORT_C void CRadioRdsUtility::GetFreqByPTY(
     TRdsProgrammeType aPty )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->GetFreqByPTY( aPty );
     }
@@ -240,7 +221,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::CancelGetFreqByPTY()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->CancelGetFreqByPTY();
     }
@@ -251,7 +231,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::GetFreqByTA()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->GetFreqByTA();
     }
@@ -262,7 +241,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::CancelGetFreqByTA()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->CancelGetFreqByTA();
     }
@@ -274,7 +252,6 @@
 EXPORT_C void CRadioRdsUtility::GetPSByPTY(
     TRdsProgrammeType aPty )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->GetPSByPTY( aPty );
     }
@@ -285,7 +262,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::CancelGetPSByPTY()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->CancelGetPSByPTY();
     }
@@ -296,7 +272,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::GetPSByTA()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->GetPSByTA();
     }
@@ -307,7 +282,6 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void CRadioRdsUtility::CancelGetPSByTA()
     {
-    FUNC_LOG;
     ASSERT(iBody);
     iBody->CancelGetPSByTA();
     }
@@ -319,7 +293,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetProgrammeIdentification(
     TInt& aPi )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetProgrammeIdentification( aPi );
     }
@@ -331,7 +304,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetProgrammeType(
     TRdsProgrammeType& aPty )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetProgrammeType( aPty );
     }
@@ -343,7 +315,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetProgrammeService(
     TRdsPSName& aPs )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetProgrammeService( aPs );
     }
@@ -355,7 +326,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetRadioText(
     TRdsRadioText& aRt )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetRadioText( aRt );
     }
@@ -368,7 +338,6 @@
     TRdsRTplusClass aRtPlusClass,
     TRdsRadioText& aRtPlusData )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetRadioTextPlus( aRtPlusClass,aRtPlusData );
     }
@@ -380,7 +349,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetClockTime(
     TDateTime& aCt )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetClockTime( aCt );
     }
@@ -392,7 +360,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetTrafficAnnouncementStatus(
     TBool& aTaStatus )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetTrafficAnnouncementStatus( aTaStatus );
     }
@@ -404,7 +371,6 @@
 EXPORT_C TInt CRadioRdsUtility::GetTrafficProgrammeStatus(
     TBool& aTpStatus )
     {
-    FUNC_LOG;
     ASSERT(iBody);
     return iBody->GetTrafficProgrammeStatus( aTpStatus );
     }