--- a/mmsharing/mmshavailability/inc/musavanetworkavailability.h Thu Aug 19 09:51:39 2010 +0300
+++ b/mmsharing/mmshavailability/inc/musavanetworkavailability.h Tue Aug 31 15:12:07 2010 +0300
@@ -21,7 +21,6 @@
#include "musavaavailability.h"
#include "muscallmonitorobserver.h"
-#include "musunittesting.h"
#include <sipprofileregistryobserver.h>
#include <e32base.h>
@@ -46,8 +45,6 @@
class CMusAvaNetworkAvailability : public CMusAvaAvailability,
public MMusCallMonitorObserver
{
- MUS_UNITTEST( UT_CMusAvaNetworkAvailability )
-
public:
/**
* Two-phased constructor
@@ -126,7 +123,7 @@
* @since S60 v3.2
* @return
*/
- void CallConnectedL( const TDesC& aTelNumber );
+ void CallConnectedL( const TDesC& aTelNumber, TBool aIsSipUri );
/**
* Call on hold
@@ -134,7 +131,7 @@
* @since S60 v3.2
* @return
*/
- virtual void CallHoldL( const TDesC& aTelNumber );
+ virtual void CallHoldL( const TDesC& aTelNumber, TBool aIsSipUri );
/**
* Call disconnected
@@ -151,15 +148,10 @@
* @return
*/
virtual void ConferenceCallL();
-
-
- /**
- * Call on conf Terminated
- *
- * @since S60 v3.2
- * @return
- */
- virtual void ConferenceCallLTerminated();
+
+private:
+
+ void SetRemoteHostL( const TDesC& aTelNumber, TBool aIsSipUri );
private: // data
@@ -178,8 +170,8 @@
*/
CMusAvaSettingsImp& iSettings;
- TBool iConfcall;
+ MUS_UNITTEST( UT_CMusAvaNetworkAvailability )
};
-#endif // __MUSAVANETWORKAVAILABILITY_H__
\ No newline at end of file
+#endif // __MUSAVANETWORKAVAILABILITY_H__