1.1 --- a/epoc32/include/mw/sip_subconparams.inl	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/sip_subconparams.inl	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -17,12 +17,10 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21 -
    1.22  /**
    1.23   @file
    1.24   @publishedAll
    1.25 + @released
    1.26  */
    1.27  
    1.28  inline CSubConSIPInviteParamSet* CSubConSIPInviteParamSet::NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType)
    1.29 @@ -34,9 +32,18 @@
    1.30  	return obj;
    1.31  	}
    1.32  
    1.33 +inline CSubConSIPInviteParamSet* CSubConSIPInviteParamSet::NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType)
    1.34 +	{
    1.35 +	CSubConSIPInviteParamSet* obj = NewL();
    1.36 +	CleanupStack::PushL(obj);
    1.37 +	aFamily.AddParameterSetL(obj, aType);
    1.38 +	CleanupStack::Pop(obj);
    1.39 +	return obj;
    1.40 +	}
    1.41 +
    1.42  inline CSubConSIPInviteParamSet* CSubConSIPInviteParamSet::NewL()
    1.43  	{
    1.44 -	STypeId typeId(KSubConSIPParametersUid, KSubConSIPInviteParamsType);
    1.45 +	STypeId typeId = STypeId::CreateSTypeId(KSubConSIPParametersUid, KSubConSIPInviteParamsType);
    1.46  	return static_cast<CSubConSIPInviteParamSet*>(CSubConParameterSet::NewL(typeId));
    1.47  	}
    1.48  
    1.49 @@ -145,7 +152,7 @@
    1.50  
    1.51  inline CSubConSIPSubscribeParamSet* CSubConSIPSubscribeParamSet::NewL()
    1.52  	{
    1.53 -	STypeId typeId(KSubConSIPParametersUid, KSubConSIPSubscribeParamsType);
    1.54 +	STypeId typeId = STypeId::CreateSTypeId(KSubConSIPParametersUid, KSubConSIPSubscribeParamsType);
    1.55  	return static_cast<CSubConSIPSubscribeParamSet*>(CSubConParameterSet::NewL(typeId));
    1.56  	}
    1.57  
    1.58 @@ -275,7 +282,7 @@
    1.59  
    1.60  inline CSubConSIPAuthenticateParamSet* CSubConSIPAuthenticateParamSet::NewL()
    1.61  	{
    1.62 -	STypeId typeId(KSubConSIPParametersUid, KSubConSIPAuthenticateParamsType);
    1.63 +	STypeId typeId = STypeId::CreateSTypeId(KSubConSIPParametersUid, KSubConSIPAuthenticateParamsType);
    1.64  	return static_cast<CSubConSIPAuthenticateParamSet*>(CSubConParameterSet::NewL(typeId));
    1.65  	}
    1.66