--- a/mmserv/radioutility/radio_utility/src/RadioRdsUtilityBody.cpp	Mon May 03 12:59:52 2010 +0300
+++ b/mmserv/radioutility/radio_utility/src/RadioRdsUtilityBody.cpp	Fri May 14 16:22:35 2010 +0300
@@ -19,6 +19,7 @@
 #include "RadioRdsUtilityBody.h"
 #include "RadioServerData.h"
 #include "RadioSession.h"
+#include "trace.h"
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -31,9 +32,8 @@
     RRadioSession& aRadioSession,
     MRadioRdsObserver& aObserver )
     {
-    CRadioRdsUtility::CBody* s = new(ELeave) CRadioRdsUtility::CBody();
-    s->iRadioRdsUtilityClient = &aObserver;
-    s->iRadioSession = &aRadioSession;
+    FUNC_LOG;
+    CRadioRdsUtility::CBody* s = new(ELeave) CRadioRdsUtility::CBody( aRadioSession, aObserver );
     CleanupStack::PushL(s);
     s->ConstructL();
     CleanupStack::Pop();
@@ -47,14 +47,20 @@
 //
 void CRadioRdsUtility::CBody::ConstructL()
     {
+    FUNC_LOG;
     }
 
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CBody
 // -----------------------------------------------------------------------------
 //
-CRadioRdsUtility::CBody::CBody()
+CRadioRdsUtility::CBody::CBody(
+        RRadioSession& aRadioSession,
+        MRadioRdsObserver& aObserver )
+    :iRadioSession(aRadioSession),
+    iRadioRdsUtilityClient(aObserver)
     {
+    FUNC_LOG;
     }
 
 // -----------------------------------------------------------------------------
@@ -63,6 +69,7 @@
 //
 CRadioRdsUtility::CBody::~CBody()
     {
+    FUNC_LOG;
     }
 
 // -----------------------------------------------------------------------------
@@ -73,10 +80,11 @@
 //
 void CRadioRdsUtility::CBody::Close()
     {
+    FUNC_LOG;
     if ( iRdsDataReq.iRdsFunctions || iRdsDataReq.iAdditionalFunctions1 ||
          iRdsDataReq.iAdditionalFunctions2 )
         {
-        iRadioSession->CancelNotifyRdsDataChange();
+        iRadioSession.CancelNotifyRdsDataChange();
         }
     }
 
@@ -88,8 +96,9 @@
 TInt CRadioRdsUtility::CBody::GetCapabilities(
     TRdsCapabilities& aCaps ) const
     {
+    FUNC_LOG;
     TRsRdsCapabilities Caps;
-    TInt error = iRadioSession->GetRdsCapabilities(Caps);
+    TInt error = iRadioSession.GetRdsCapabilities(Caps);
     if ( !error )
         {
         aCaps.iRdsFunctions = Caps.iRdsFunctions;
@@ -107,7 +116,8 @@
 TInt CRadioRdsUtility::CBody::GetRdsSignalStatus(
     TBool& aRdsSignal ) const
     {
-    return iRadioSession->GetRdsSignalStatus( aRdsSignal );
+    FUNC_LOG;
+    return iRadioSession.GetRdsSignalStatus( aRdsSignal );
     }
 
 // -----------------------------------------------------------------------------
@@ -118,10 +128,11 @@
 TInt CRadioRdsUtility::CBody::NotifyRdsDataChange(
     TRdsData aRdsData )
     {
+    FUNC_LOG;
     iRdsDataReq.iRdsFunctions = aRdsData.iRdsFunctions;
     iRdsDataReq.iAdditionalFunctions1 = aRdsData.iAdditionalFunctions1;
     iRdsDataReq.iAdditionalFunctions2 = aRdsData.iAdditionalFunctions2;
-    return iRadioSession->NotifyRdsDataChange( iRdsDataReq );
+    return iRadioSession.NotifyRdsDataChange( iRdsDataReq );
     }
 
 // -----------------------------------------------------------------------------
@@ -131,7 +142,8 @@
 //
 void CRadioRdsUtility::CBody::CancelNotifyRdsDataChange()
     {
-    iRadioSession->CancelNotifyRdsDataChange();
+    FUNC_LOG;
+    iRadioSession.CancelNotifyRdsDataChange();
     }
 
 // -----------------------------------------------------------------------------
@@ -142,7 +154,8 @@
 TInt CRadioRdsUtility::CBody::SetAutomaticSwitching(
     TBool aAuto )
     {
-    return iRadioSession->SetAutomaticSwitching( aAuto );
+    FUNC_LOG;
+    return iRadioSession.SetAutomaticSwitching( aAuto );
     }
 
 // -----------------------------------------------------------------------------
@@ -153,7 +166,8 @@
 TInt CRadioRdsUtility::CBody::GetAutomaticSwitching(
     TBool& aAuto )
     {
-    return iRadioSession->GetAutomaticSwitching( aAuto );
+    FUNC_LOG;
+    return iRadioSession.GetAutomaticSwitching( aAuto );
     }
 
 // -----------------------------------------------------------------------------
@@ -163,7 +177,8 @@
 //
 void CRadioRdsUtility::CBody::CancelAFSearch()
     {
-    iRadioSession->CancelAFSearch();
+    FUNC_LOG;
+    iRadioSession.CancelAFSearch();
     }
 
 // -----------------------------------------------------------------------------
@@ -174,7 +189,8 @@
 TInt CRadioRdsUtility::CBody::SetAutomaticTrafficAnnouncement(
     TBool aAuto )
     {
-    return iRadioSession->SetAutomaticTrafficAnnouncement( aAuto );
+    FUNC_LOG;
+    return iRadioSession.SetAutomaticTrafficAnnouncement( aAuto );
     }
 
 // -----------------------------------------------------------------------------
@@ -185,7 +201,8 @@
 TInt CRadioRdsUtility::CBody::GetAutomaticTrafficAnnouncement(
     TBool& aAuto )
     {
-    return iRadioSession->GetAutomaticTrafficAnnouncement( aAuto );
+    FUNC_LOG;
+    return iRadioSession.GetAutomaticTrafficAnnouncement( aAuto );
     }
 
 // -----------------------------------------------------------------------------
@@ -197,7 +214,8 @@
     TRdsProgrammeType aPty,
     TBool aUpwards )
     {
-    iRadioSession->StationSeekByPTY( aPty, aUpwards );
+    FUNC_LOG;
+    iRadioSession.StationSeekByPTY( aPty, aUpwards );
     }
 
 // -----------------------------------------------------------------------------
@@ -208,7 +226,8 @@
 void CRadioRdsUtility::CBody::StationSeekByTA(
     TBool aSeekUp )
     {
-    iRadioSession->StationSeekByTA( aSeekUp );
+    FUNC_LOG;
+    iRadioSession.StationSeekByTA( aSeekUp );
     }
 
 // -----------------------------------------------------------------------------
@@ -219,7 +238,8 @@
 void CRadioRdsUtility::CBody::StationSeekByTP(
     TBool aSeekUp )
     {
-    iRadioSession->StationSeekByTP( aSeekUp );
+    FUNC_LOG;
+    iRadioSession.StationSeekByTP( aSeekUp );
     }
 
 // -----------------------------------------------------------------------------
@@ -229,7 +249,8 @@
 //
 void CRadioRdsUtility::CBody::CancelRdsStationSeek()
     {
-    iRadioSession->CancelRdsStationSeek();
+    FUNC_LOG;
+    iRadioSession.CancelRdsStationSeek();
     }
 
 // -----------------------------------------------------------------------------
@@ -240,7 +261,8 @@
 void CRadioRdsUtility::CBody::GetFreqByPTY(
     TRdsProgrammeType aPty )
     {
-    iRadioSession->GetFreqByPTY( aPty );
+    FUNC_LOG;
+    iRadioSession.GetFreqByPTY( aPty );
     }
 
 // -----------------------------------------------------------------------------
@@ -250,7 +272,8 @@
 //
 void CRadioRdsUtility::CBody::CancelGetFreqByPTY()
     {
-    iRadioSession->CancelGetFreqByPTY();
+    FUNC_LOG;
+    iRadioSession.CancelGetFreqByPTY();
     }
 
 // -----------------------------------------------------------------------------
@@ -260,7 +283,8 @@
 //
 void CRadioRdsUtility::CBody::GetFreqByTA()
     {
-    iRadioSession->GetFreqByTA();
+    FUNC_LOG;
+    iRadioSession.GetFreqByTA();
     }
 
 // -----------------------------------------------------------------------------
@@ -270,7 +294,8 @@
 //
 void CRadioRdsUtility::CBody::CancelGetFreqByTA()
     {
-    iRadioSession->CancelGetFreqByTA();
+    FUNC_LOG;
+    iRadioSession.CancelGetFreqByTA();
     }
 
 // -----------------------------------------------------------------------------
@@ -281,7 +306,8 @@
 void CRadioRdsUtility::CBody::GetPSByPTY(
     TRdsProgrammeType aPty )
     {
-    iRadioSession->GetPSByPTY( aPty );
+    FUNC_LOG;
+    iRadioSession.GetPSByPTY( aPty );
     }
 
 // -----------------------------------------------------------------------------
@@ -291,7 +317,8 @@
 //
 void CRadioRdsUtility::CBody::CancelGetPSByPTY()
     {
-    iRadioSession->CancelGetPSByPTY();
+    FUNC_LOG;
+    iRadioSession.CancelGetPSByPTY();
     }
 
 // -----------------------------------------------------------------------------
@@ -301,7 +328,8 @@
 //
 void CRadioRdsUtility::CBody::GetPSByTA()
     {
-    iRadioSession->GetPSByTA();
+    FUNC_LOG;
+    iRadioSession.GetPSByTA();
     }
 
 // -----------------------------------------------------------------------------
@@ -311,7 +339,8 @@
 //
 void CRadioRdsUtility::CBody::CancelGetPSByTA()
     {
-    iRadioSession->CancelGetPSByTA();
+    FUNC_LOG;
+    iRadioSession.CancelGetPSByTA();
     }
 
 // -----------------------------------------------------------------------------
@@ -322,7 +351,8 @@
 TInt CRadioRdsUtility::CBody::GetProgrammeIdentification(
     TInt& aPi )
     {
-    return iRadioSession->GetProgrammeIdentification( aPi );
+    FUNC_LOG;
+    return iRadioSession.GetProgrammeIdentification( aPi );
     }
 
 // -----------------------------------------------------------------------------
@@ -333,7 +363,8 @@
 TInt CRadioRdsUtility::CBody::GetProgrammeType(
     TRdsProgrammeType& aPty )
     {
-    return iRadioSession->GetProgrammeType( aPty );
+    FUNC_LOG;
+    return iRadioSession.GetProgrammeType( aPty );
     }
 
 // -----------------------------------------------------------------------------
@@ -344,8 +375,9 @@
 TInt CRadioRdsUtility::CBody::GetProgrammeService(
     TRdsPSName& aPs )
     {
+    FUNC_LOG;
     TRsRdsPSName ps;
-    TInt error = iRadioSession->GetProgrammeService( ps );
+    TInt error = iRadioSession.GetProgrammeService( ps );
 
     if ( aPs.Length() )
         {
@@ -363,8 +395,9 @@
 TInt CRadioRdsUtility::CBody::GetRadioText(
     TRdsRadioText& aRt )
     {
+    FUNC_LOG;
     TRsRdsRadioText rt;
-    TInt error = iRadioSession->GetRadioText( rt );
+    TInt error = iRadioSession.GetRadioText( rt );
 
     if ( rt.Length() )
        {
@@ -383,10 +416,11 @@
     TRdsRTplusClass aRtPlusClass,
     TRdsRadioText& aRtPlusData )
     {
+    FUNC_LOG;
     aRtPlusClass = aRtPlusClass; // for compiler warning
     TRsRdsRadioText rt;
     TRsRdsRTplusClass rtPlusClass = ERsRTplusItemDummy;
-    TInt error = iRadioSession->GetRadioTextPlus( rtPlusClass, rt );
+    TInt error = iRadioSession.GetRadioTextPlus( rtPlusClass, rt );
 
     if ( rt.Length() )
         {
@@ -405,7 +439,8 @@
 TInt CRadioRdsUtility::CBody::GetClockTime(
     TDateTime& aCt )
     {
-    return iRadioSession->GetClockTime( aCt );
+    FUNC_LOG;
+    return iRadioSession.GetClockTime( aCt );
     }
 
 // -----------------------------------------------------------------------------
@@ -416,7 +451,8 @@
 TInt CRadioRdsUtility::CBody::GetTrafficAnnouncementStatus(
     TBool& aTaStatus )
     {
-    return iRadioSession->GetTrafficAnnouncementStatus( aTaStatus );
+    FUNC_LOG;
+    return iRadioSession.GetTrafficAnnouncementStatus( aTaStatus );
     }
 
 // -----------------------------------------------------------------------------
@@ -427,7 +463,8 @@
 TInt CRadioRdsUtility::CBody::GetTrafficProgrammeStatus(
     TBool& aTpStatus )
     {
-    return iRadioSession->GetTrafficProgrammeStatus( aTpStatus );
+    FUNC_LOG;
+    return iRadioSession.GetTrafficProgrammeStatus( aTpStatus );
     }