1.1 --- a/epoc32/include/ip_subconparams.inl Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/ip_subconparams.inl Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -2,9 +2,9 @@
1.4 * Copyright (c) 2004-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 @@ -19,8 +19,6 @@
1.16
1.17
1.18
1.19 -
1.20 -
1.21 /**
1.22 @file ip_subconparams.inl
1.23 */
1.24 @@ -40,9 +38,18 @@
1.25 return obj;
1.26 }
1.27
1.28 +CSubConQosIPLinkR99ParamSet* CSubConQosIPLinkR99ParamSet::NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType)
1.29 + {
1.30 + CSubConQosIPLinkR99ParamSet* obj = NewL();
1.31 + CleanupStack::PushL(obj);
1.32 + aFamily.AddParameterSetL(obj, aType);
1.33 + CleanupStack::Pop(obj);
1.34 + return obj;
1.35 + }
1.36 +
1.37 CSubConQosIPLinkR99ParamSet* CSubConQosIPLinkR99ParamSet::NewL()
1.38 {
1.39 - STypeId typeId(KSubConIPParamsUid, KSubConQosIPLinkR99ParamsType);
1.40 + STypeId typeId = STypeId::CreateSTypeId(KSubConIPParamsUid, KSubConQosIPLinkR99ParamsType);
1.41 return static_cast<CSubConQosIPLinkR99ParamSet*>(CSubConParameterSet::NewL(typeId));
1.42 }
1.43
1.44 @@ -225,9 +232,18 @@
1.45 CleanupStack::Pop(sblpExtn);
1.46 return sblpExtn;
1.47 }
1.48 +
1.49 +CSubConSBLPR5ExtensionParamSet* CSubConSBLPR5ExtensionParamSet::NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType)
1.50 + {
1.51 + CSubConSBLPR5ExtensionParamSet* sblpExtn = NewL();
1.52 + CleanupStack::PushL(sblpExtn);
1.53 + aFamily.AddParameterSetL(sblpExtn, aType);
1.54 + CleanupStack::Pop(sblpExtn);
1.55 + return sblpExtn;
1.56 + }
1.57 CSubConSBLPR5ExtensionParamSet* CSubConSBLPR5ExtensionParamSet::NewL()
1.58 {
1.59 - STypeId typeId (KSubConIPParamsUid, KSubConnSBLPR5ExtensionParamsType);
1.60 + STypeId typeId = STypeId::CreateSTypeId(KSubConIPParamsUid, KSubConnSBLPR5ExtensionParamsType);
1.61 return static_cast<CSubConSBLPR5ExtensionParamSet*>(CSubConParameterSet::NewL(typeId));
1.62 }
1.63
1.64 @@ -260,3 +276,4 @@
1.65
1.66 #endif
1.67 // __IP_SUBCONPARAMS_INL__
1.68 +