diff -r 73a1feb507fb -r bc78a40cd63c mmsharing/mmshengine/inc/mussipprofilehandler.h --- a/mmsharing/mmshengine/inc/mussipprofilehandler.h Tue Aug 31 15:12:07 2010 +0300 +++ b/mmsharing/mmshengine/inc/mussipprofilehandler.h Wed Sep 01 12:31:01 2010 +0100 @@ -12,12 +12,10 @@ * Contributors: * * Description: -* Version : %version: 6.1.4 % << Don't touch! Updated by Synergy at check-out. * */ - #ifndef MUSSIPPROFILEHANDLER_H #define MUSSIPPROFILEHANDLER_H @@ -47,13 +45,14 @@ public MSIPProfileRegistryObserver, public MSIPObserver, public MSIPConnectionObserver, - public MSipProfileAlrObserver + public MSipProfileAlrObserver + { MUS_UNITTEST( UT_CMusEngSipProfileHandler ) public: - /** + /** * Creates new instance of CMusSipProfileHandler * @param aSipProfileId profile id of requested profile */ @@ -67,8 +66,8 @@ public: // API - - /** + + /** * Creates the SIP profile used. * @param aSipProfileId profile ID of requested SIP profile */ @@ -95,25 +94,22 @@ * Should be called when a MuS session terminates. */ void RefreshIapAvailabilities(); - - /** - * @return ETrue if SIP profile returned by Profile() is registered - */ - TBool IsRegistered(); - private: /** * Constructor + * */ CMusSipProfileHandler( MMusSipProfileUser& aUser ); /** * Second-phase constructor + * */ void ConstructL(); + private: // From MSIPProfileRegistryObserver /** @@ -138,15 +134,15 @@ TUint32 aProfileId, TInt aError ); - private: // From MSIPObserver - + private: // From MSIPObserver + void IncomingRequest( TUint32 aIapId, CSIPServerTransaction* aTransaction ); void TimedOut( CSIPServerTransaction& aTransaction ); - private: // MSIPConnectionObserver must be implemented to enable SIP profile - + private: // MSIPConnectionObserver must be implemented to enable SIP profile + void IncomingRequest (CSIPServerTransaction* aTransaction ); void IncomingRequest (CSIPServerTransaction* aTransaction, @@ -172,10 +168,10 @@ void ErrorOccured( TInt aError, CSIPTransactionBase& aTransaction, CSIPDialogAssocBase& aDialogAssoc ); - + void ErrorOccured( TInt aError, CSIPRefresh& aSIPRefresh ); - void ErrorOccured( TInt aError, + void ErrorOccured( TInt aError, CSIPRegistrationBinding& aRegistration ); void ErrorOccured( TInt aError, CSIPDialogAssocBase& aDialogAssoc ); @@ -183,10 +179,10 @@ void InviteCompleted( CSIPClientTransaction& aTransaction ); void InviteCanceled( CSIPServerTransaction& aTransaction ); - - void ConnectionStateChanged( CSIPConnection::TState aState ); - - private: // From MSipProfileAlrObserver + + void ConnectionStateChanged( CSIPConnection::TState aState ); + + private: // From MSipProfileAlrObserver void AlrEvent( MSipProfileAlrObserver::TEvent aEvent, TUint32 aProfileId, @@ -196,20 +192,19 @@ void AlrError( TInt aError, TUint32 aProfileId, TUint32 aSnapId, - TUint32 aIapId ); - - private: // New functions + TUint32 aIapId ); + + private: // New functions TUint32 ProfileId() const; - + private: // DATA - - MMusSipProfileUser& iUser; + + MMusSipProfileUser& iUser; CSIP* iSip; CSIPProfileRegistry* iProfileRegistry; CSipProfileAlrController* iProfileAlrController; CSIPProfile* iSipProfile; }; - #endif // MUSSIPPROFILEHANDLER_H