1.1 --- a/epoc32/include/mw/sip_subconparams.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/sip_subconparams.h	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 @@ -16,8 +16,6 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file
    1.23   @publishedAll
    1.24 @@ -28,7 +26,7 @@
    1.25  #define SIP_SUBCONPARAMS_H
    1.26  
    1.27  #include <es_sock.h>
    1.28 -#include <comms-infras/metabuffer.h>
    1.29 +#include <comms-infras/es_parameterfamily.h>
    1.30  
    1.31  /** The numeric value of ECOM plugin identifier for this SubConnection parameter extension.See the assisting *.rss file. */
    1.32  const TInt KSubConSIPParametersUid = 0x10274C18;
    1.33 @@ -59,6 +57,7 @@
    1.34  	 @leave 	KErrArgument if the data is not of type TParameterSetType.
    1.35  	 */   
    1.36  	inline static CSubConSIPInviteParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
    1.37 +	inline static CSubConSIPInviteParamSet* NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType);
    1.38  	inline static CSubConSIPInviteParamSet* NewL();
    1.39  	
    1.40  	/** Constructor. */
    1.41 @@ -273,6 +272,6 @@
    1.42  	static CSubConExtensionParameterSet* NewL(TAny* aConstructionParameters);
    1.43  	};
    1.44  
    1.45 -#include <sip_subconparams.inl>
    1.46 +#include "SIP_subconparams.inl"
    1.47  
    1.48  #endif // SIP_SUBCONPARAMS_H