1.1 --- a/epoc32/include/cs_subconparams.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/cs_subconparams.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1997-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,8 +15,6 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file 
    1.23   @publishedAll
    1.24 @@ -30,11 +28,16 @@
    1.25  #include <e32std.h>
    1.26  #include <comms-infras/metadata.h>
    1.27  #include <comms-infras/metatype.h>
    1.28 +#include <comms-infras/es_parameterfamily.h>
    1.29  
    1.30  #include <es_sock.h>
    1.31  
    1.32 +//Parameter Types are defined here and enums defined locally in the class
    1.33  const TInt32 KSubConnQosGenericParamsType = 1;
    1.34  const TInt32 KSubConnAuthorisationGenericParamsType = 2;
    1.35 +const TInt32 KFlowRequestParametersType = 3;
    1.36 +const TInt32 KSubConnProtocolGenericParamsType = 4;
    1.37 +
    1.38  using Meta::SMetaDataECom;
    1.39  
    1.40  class CSubConQosGenericParamSet : public CSubConGenericParameterSet
    1.41 @@ -67,7 +70,14 @@
    1.42  @released since v9.1 */
    1.43  {
    1.44  public:
    1.45 +	enum
    1.46 +		{
    1.47 +		EUid=KSubConnGenericParamsImplUid,
    1.48 +		EType=KSubConnQosGenericParamsType
    1.49 +		};
    1.50 +
    1.51  	inline static CSubConQosGenericParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
    1.52 +	inline static CSubConQosGenericParamSet* NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType);
    1.53  	inline static CSubConQosGenericParamSet* NewL();
    1.54  
    1.55  	inline CSubConQosGenericParamSet();
    1.56 @@ -138,7 +148,14 @@
    1.57  @released since v9.1 */
    1.58  {
    1.59  public:
    1.60 +	enum
    1.61 +		{
    1.62 +		EUid=KSubConnGenericParamsImplUid,
    1.63 +		EType=KSubConnAuthorisationGenericParamsType
    1.64 +		};
    1.65 +
    1.66  	inline static CSubConAuthorisationGenericParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
    1.67 +	inline static CSubConAuthorisationGenericParamSet* NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType);
    1.68  	inline static CSubConAuthorisationGenericParamSet* NewL();
    1.69  
    1.70  	inline CSubConAuthorisationGenericParamSet();
    1.71 @@ -154,15 +171,8 @@
    1.72  	TInt iId;
    1.73  	};
    1.74  
    1.75 -class CSubConGenericParamsFactory : public CBase
    1.76 -/** Sub connection generic parameter set factory.
    1.77 -
    1.78 -@internalComponent
    1.79 -@released since v9.1 */
    1.80 -	{
    1.81 -public:
    1.82 -	static CSubConGenericParameterSet* NewL(TAny* aConstructionParameters);
    1.83 -	};
    1.84  
    1.85  #include <cs_subconparams.inl>
    1.86 +
    1.87  #endif	// __CS_SUBCONPARAMS_H__
    1.88 +