FCL/sf/mw/mmmw: comparison mmserv/radioutility/radio_utility/src/RadioRdsUtilityBody.cpp

equal deleted inserted replaced

-:095bea5f582e
+:0ac9a5310753
 #include "RadioRdsUtilityBody.h"
 #include "RadioServerData.h"
 #include "RadioSession.h"
-#include "trace.h"
 // ======== MEMBER FUNCTIONS ========
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::NewL
 //
 CRadioRdsUtility::CBody* CRadioRdsUtility::CBody::NewL(
 RRadioSession& aRadioSession,
 MRadioRdsObserver& aObserver )
 {
-FUNC_LOG;
+CRadioRdsUtility::CBody* s = new(ELeave) CRadioRdsUtility::CBody();
-CRadioRdsUtility::CBody* s = new(ELeave) CRadioRdsUtility::CBody( aRadioSession, aObserver );
+s->iRadioRdsUtilityClient = &aObserver;
+s->iRadioSession = &aRadioSession;
 CleanupStack::PushL(s);
 s->ConstructL();
 CleanupStack::Pop();
 return s;
 }
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
 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;
 }
 // -----------------------------------------------------------------------------
 // Destructor.
 // -----------------------------------------------------------------------------
 //
 CRadioRdsUtility::CBody::~CBody()
 {
-FUNC_LOG;
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::Close
 // Cancel all requested RDS notifications if any were requested.
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::Close()
 {
-FUNC_LOG;
 if ( iRdsDataReq.iRdsFunctions || iRdsDataReq.iAdditionalFunctions1 ||
 iRdsDataReq.iAdditionalFunctions2 )
 {
-iRadioSession.CancelNotifyRdsDataChange();
+iRadioSession->CancelNotifyRdsDataChange();
 }
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetCapabilities
 // -----------------------------------------------------------------------------
 //
 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;
 aCaps.iAdditionalFunctions1 = Caps.iAdditionalFunctions1;
 aCaps.iAdditionalFunctions2 = Caps.iAdditionalFunctions2;
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetRdsSignalStatus(
 TBool& aRdsSignal ) const
 {
-FUNC_LOG;
+return iRadioSession->GetRdsSignalStatus( aRdsSignal );
-return iRadioSession.GetRdsSignalStatus( aRdsSignal );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::NotifyRdsDataChange
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 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 );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CancelNotifyRdsDataChange
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::CancelNotifyRdsDataChange()
 {
-FUNC_LOG;
+iRadioSession->CancelNotifyRdsDataChange();
-iRadioSession.CancelNotifyRdsDataChange();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::SetAutomaticSwitching
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::SetAutomaticSwitching(
 TBool aAuto )
 {
-FUNC_LOG;
+return iRadioSession->SetAutomaticSwitching( aAuto );
-return iRadioSession.SetAutomaticSwitching( aAuto );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetAutomaticSwitching
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetAutomaticSwitching(
 TBool& aAuto )
 {
-FUNC_LOG;
+return iRadioSession->GetAutomaticSwitching( aAuto );
-return iRadioSession.GetAutomaticSwitching( aAuto );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CancelAFSearch
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::CancelAFSearch()
 {
-FUNC_LOG;
+iRadioSession->CancelAFSearch();
-iRadioSession.CancelAFSearch();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::SetAutomaticTrafficAnnouncement
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::SetAutomaticTrafficAnnouncement(
 TBool aAuto )
 {
-FUNC_LOG;
+return iRadioSession->SetAutomaticTrafficAnnouncement( aAuto );
-return iRadioSession.SetAutomaticTrafficAnnouncement( aAuto );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetAutomaticTrafficAnnouncement
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetAutomaticTrafficAnnouncement(
 TBool& aAuto )
 {
-FUNC_LOG;
+return iRadioSession->GetAutomaticTrafficAnnouncement( aAuto );
-return iRadioSession.GetAutomaticTrafficAnnouncement( aAuto );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::StationSeekByPTY
 // (other items were commented in a header).
 //
 void CRadioRdsUtility::CBody::StationSeekByPTY(
 TRdsProgrammeType aPty,
 TBool aUpwards )
 {
-FUNC_LOG;
+iRadioSession->StationSeekByPTY( aPty, aUpwards );
-iRadioSession.StationSeekByPTY( aPty, aUpwards );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::StationSeekByTA
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::StationSeekByTA(
 TBool aSeekUp )
 {
-FUNC_LOG;
+iRadioSession->StationSeekByTA( aSeekUp );
-iRadioSession.StationSeekByTA( aSeekUp );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::StationSeekByTP
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::StationSeekByTP(
 TBool aSeekUp )
 {
-FUNC_LOG;
+iRadioSession->StationSeekByTP( aSeekUp );
-iRadioSession.StationSeekByTP( aSeekUp );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CancelRdsStationSeek
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::CancelRdsStationSeek()
 {
-FUNC_LOG;
+iRadioSession->CancelRdsStationSeek();
-iRadioSession.CancelRdsStationSeek();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetFreqByPTY
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::GetFreqByPTY(
 TRdsProgrammeType aPty )
 {
-FUNC_LOG;
+iRadioSession->GetFreqByPTY( aPty );
-iRadioSession.GetFreqByPTY( aPty );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CancelGetFreqByPTY
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::CancelGetFreqByPTY()
 {
-FUNC_LOG;
+iRadioSession->CancelGetFreqByPTY();
-iRadioSession.CancelGetFreqByPTY();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetFreqByTA
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::GetFreqByTA()
 {
-FUNC_LOG;
+iRadioSession->GetFreqByTA();
-iRadioSession.GetFreqByTA();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CancelGetFreqByTA
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::CancelGetFreqByTA()
 {
-FUNC_LOG;
+iRadioSession->CancelGetFreqByTA();
-iRadioSession.CancelGetFreqByTA();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetPSByPTY
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::GetPSByPTY(
 TRdsProgrammeType aPty )
 {
-FUNC_LOG;
+iRadioSession->GetPSByPTY( aPty );
-iRadioSession.GetPSByPTY( aPty );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CancelGetPSByPTY
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::CancelGetPSByPTY()
 {
-FUNC_LOG;
+iRadioSession->CancelGetPSByPTY();
-iRadioSession.CancelGetPSByPTY();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetPSByTA
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::GetPSByTA()
 {
-FUNC_LOG;
+iRadioSession->GetPSByTA();
-iRadioSession.GetPSByTA();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::CancelGetPSByTA
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioRdsUtility::CBody::CancelGetPSByTA()
 {
-FUNC_LOG;
+iRadioSession->CancelGetPSByTA();
-iRadioSession.CancelGetPSByTA();
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetProgrammeIdentification
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetProgrammeIdentification(
 TInt& aPi )
 {
-FUNC_LOG;
+return iRadioSession->GetProgrammeIdentification( aPi );
-return iRadioSession.GetProgrammeIdentification( aPi );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetProgrammeType
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetProgrammeType(
 TRdsProgrammeType& aPty )
 {
-FUNC_LOG;
+return iRadioSession->GetProgrammeType( aPty );
-return iRadioSession.GetProgrammeType( aPty );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetProgrammeService
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetProgrammeService(
 TRdsPSName& aPs )
 {
-FUNC_LOG;
 TRsRdsPSName ps;
-TInt error = iRadioSession.GetProgrammeService( ps );
+TInt error = iRadioSession->GetProgrammeService( ps );
 if ( aPs.Length() )
 {
 aPs.Copy( ps );
 }
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetRadioText(
 TRdsRadioText& aRt )
 {
-FUNC_LOG;
 TRsRdsRadioText rt;
-TInt error = iRadioSession.GetRadioText( rt );
+TInt error = iRadioSession->GetRadioText( rt );
 if ( rt.Length() )
 {
 aRt.Copy( rt );
 }
 //
 TInt CRadioRdsUtility::CBody::GetRadioTextPlus(
 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() )
 {
 aRtPlusData.Copy( rt );
 aRtPlusClass = (TRdsRTplusClass)rtPlusClass;
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetClockTime(
 TDateTime& aCt )
 {
-FUNC_LOG;
+return iRadioSession->GetClockTime( aCt );
-return iRadioSession.GetClockTime( aCt );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetTrafficAnnouncementStatus
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetTrafficAnnouncementStatus(
 TBool& aTaStatus )
 {
-FUNC_LOG;
+return iRadioSession->GetTrafficAnnouncementStatus( aTaStatus );
-return iRadioSession.GetTrafficAnnouncementStatus( aTaStatus );
 }
 // -----------------------------------------------------------------------------
 // CRadioRdsUtility::CBody::GetTrafficProgrammeStatus
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioRdsUtility::CBody::GetTrafficProgrammeStatus(
 TBool& aTpStatus )
 {
-FUNC_LOG;
+return iRadioSession->GetTrafficProgrammeStatus( aTpStatus );
-return iRadioSession.GetTrafficProgrammeStatus( aTpStatus );
 }
 //End of File

branch	RCL_3
changeset 46	0ac9a5310753
parent 45	095bea5f582e