1.1 --- a/epoc32/include/networking/qos3gpp_subconparams.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/networking/qos3gpp_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 @@ -15,11 +15,10 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file
    1.23   @publishedAll
    1.24 + @released
    1.25  */
    1.26  
    1.27  
    1.28 @@ -29,7 +28,13 @@
    1.29  #include <es_sock.h>
    1.30  #include <comms-infras/metadata.h>
    1.31  #include <comms-infras/metatype.h>
    1.32 +
    1.33 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.34  #include <etelqos.h>
    1.35 +#else
    1.36 +#include <eteldefaultqos.h>
    1.37 +#endif
    1.38 +#include <comms-infras/es_parameterfamily.h>
    1.39  
    1.40  const TInt KSubCon3GPPExtParamsFactoryUid = 0x1020D460;
    1.41  const TInt KSubConQosR99ParamsType = 1;
    1.42 @@ -63,6 +68,7 @@
    1.43  		};
    1.44  public:
    1.45  	inline static CSubConQosR99ParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
    1.46 +	inline static CSubConQosR99ParamSet* NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType);
    1.47  	inline static CSubConQosR99ParamSet* NewL();
    1.48  
    1.49  	inline CSubConQosR99ParamSet();
    1.50 @@ -117,6 +123,7 @@
    1.51  #ifdef SYMBIAN_NETWORKING_UMTSR5  
    1.52  
    1.53  /** Extension QoS Parameter Set for UMTS Release 5 */
    1.54 +
    1.55  class CSubConImsExtParamSet : public CSubConExtensionParameterSet
    1.56  	{
    1.57  public:
    1.58 @@ -127,6 +134,7 @@
    1.59  		};
    1.60  public:
    1.61  	inline static CSubConImsExtParamSet* NewL(CSubConParameterFamily& aFamily,CSubConParameterFamily::TParameterSetType aType);
    1.62 +	inline static CSubConImsExtParamSet* NewL(RParameterFamily& aFamily,RParameterFamily::TParameterSetType aType);
    1.63  	inline static CSubConImsExtParamSet* NewL();
    1.64  	inline CSubConImsExtParamSet();
    1.65  	
    1.66 @@ -152,6 +160,7 @@
    1.67  	
    1.68  public:
    1.69  	inline static CSubConQosR5ParamSet* NewL(CSubConParameterFamily& aFamily,CSubConParameterFamily::TParameterSetType aType);
    1.70 +	inline static CSubConQosR5ParamSet* NewL(RParameterFamily& aFamily,RParameterFamily::TParameterSetType aType);
    1.71  	inline static CSubConQosR5ParamSet* NewL();
    1.72  	inline CSubConQosR5ParamSet();
    1.73  
    1.74 @@ -215,6 +224,7 @@
    1.75  
    1.76  public:
    1.77  	inline static CSubConSBLPR5ExtensionParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
    1.78 +	inline static CSubConSBLPR5ExtensionParamSet* NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType);
    1.79  	inline static CSubConSBLPR5ExtensionParamSet* NewL();
    1.80  
    1.81  	/**	Media Authorization Token setter and getter functions. */
    1.82 @@ -242,16 +252,9 @@
    1.83  	RFlowIdentifiers	iFlowIds;
    1.84  	};
    1.85  
    1.86 -/** Factory used to create instances of IP SubConnection Parameters.
    1.87 -
    1.88 -@internalComponent
    1.89 -@released Since 9.3
    1.90 -*/
    1.91 -class CSubCon3GPPExtParamsFactory : public CBase
    1.92 -	{
    1.93 -public:
    1.94 -	static CSubConExtensionParameterSet* NewL(TAny* aConstructionParameters);
    1.95 -	};
    1.96 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.97 +#include <networking/qos3GPP_subconparams_factory.h>
    1.98 +#endif
    1.99  
   1.100  #include <networking/qos3gpp_subconparams.inl>
   1.101