1.1 --- a/epoc32/include/cs_subconevents.inl	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/cs_subconevents.inl	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,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 @@ -13,11 +13,10 @@
    1.16  // Description:
    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  #ifndef __CS_SUBCONEVENTS_INL__
    1.28 @@ -31,7 +30,7 @@
    1.29   otherwise leaves with system error code.
    1.30  */
    1.31  	{
    1.32 -	STypeId typeId(KSubConnGenericEventsImplUid, KSubConGenericEventParamsGranted);
    1.33 +	STypeId typeId = STypeId::CreateSTypeId(KSubConnGenericEventsImplUid, KSubConGenericEventParamsGranted);
    1.34  	return static_cast<CSubConGenEventParamsGranted*>(CSubConNotificationEvent::NewL(typeId));
    1.35  	}
    1.36  
    1.37 @@ -114,7 +113,7 @@
    1.38   otherwise leaves with system error code.
    1.39  */
    1.40  	{
    1.41 -	STypeId typeId(KSubConnGenericEventsImplUid, KSubConGenericEventParamsChanged);
    1.42 +	STypeId typeId = STypeId::CreateSTypeId(KSubConnGenericEventsImplUid, KSubConGenericEventParamsChanged);
    1.43  	return static_cast<CSubConGenEventParamsChanged*>(CSubConNotificationEvent::NewL(typeId));
    1.44  	}
    1.45  
    1.46 @@ -144,13 +143,13 @@
    1.47  //====================================
    1.48  
    1.49  CSubConGenEventParamsRejected* CSubConGenEventParamsRejected::NewL()
    1.50 -/** Creates a rejected parameter event sub-connection. 
    1.51 +/** Creates a rejected parameter event sub-connection.
    1.52  
    1.53  @return CSubConGenEventParamsRejected pointer if successful,
    1.54   otherwise leaves with system error code.
    1.55  */
    1.56  	{
    1.57 -	STypeId typeId(KSubConnGenericEventsImplUid, KSubConGenericEventParamsRejected);
    1.58 +	STypeId typeId = STypeId::CreateSTypeId(KSubConnGenericEventsImplUid, KSubConGenericEventParamsRejected);
    1.59  	return static_cast<CSubConGenEventParamsRejected*>(CSubConNotificationEvent::NewL(typeId));
    1.60  	}
    1.61  
    1.62 @@ -191,8 +190,8 @@
    1.63  @param aFamilyId parameter family type. */
    1.64  	{
    1.65  	iFamilyId = aFamilyId;
    1.66 -	}	
    1.67 -	
    1.68 +	}
    1.69 +
    1.70  //====================================
    1.71  CSubConGenEventDataClientBase::CSubConGenEventDataClientBase()
    1.72  	: CSubConNotificationEvent()
    1.73 @@ -251,13 +250,13 @@
    1.74  
    1.75  //====================================
    1.76  CSubConGenEventDataClientJoined* CSubConGenEventDataClientJoined::NewL()
    1.77 -/** Creates a data client joined event sub-connection. 
    1.78 +/** Creates a data client joined event sub-connection.
    1.79  
    1.80  @return CSubConGenEventDataClientJoined pointer if successful,
    1.81   otherwise leaves with system error code.
    1.82  */
    1.83  	{
    1.84 -	STypeId typeId(KSubConnGenericEventsImplUid, KSubConGenericEventDataClientJoined);
    1.85 +	STypeId typeId = STypeId::CreateSTypeId(KSubConnGenericEventsImplUid, KSubConGenericEventDataClientJoined);
    1.86  	return static_cast<CSubConGenEventDataClientJoined*>(CSubConNotificationEvent::NewL(typeId));
    1.87  	}
    1.88  
    1.89 @@ -270,13 +269,13 @@
    1.90  
    1.91  //=====================================
    1.92  CSubConGenEventDataClientLeft* CSubConGenEventDataClientLeft::NewL()
    1.93 -/** Creates a data client left event sub-connection. 
    1.94 +/** Creates a data client left event sub-connection.
    1.95  
    1.96  @return CSubConGenEventDataClientLeft pointer if successful,
    1.97   otherwise leaves with system error code.
    1.98  */
    1.99  	{
   1.100 -	STypeId typeId(KSubConnGenericEventsImplUid, KSubConGenericEventDataClientLeft);
   1.101 +	STypeId typeId = STypeId::CreateSTypeId(KSubConnGenericEventsImplUid, KSubConGenericEventDataClientLeft);
   1.102  	return static_cast<CSubConGenEventDataClientLeft*>(CSubConNotificationEvent::NewL(typeId));
   1.103  	}
   1.104  
   1.105 @@ -289,13 +288,13 @@
   1.106  
   1.107  //====================================
   1.108  CSubConGenEventSubConDown* CSubConGenEventSubConDown::NewL()
   1.109 -/** Creates a sub-connection down event. 
   1.110 +/** Creates a sub-connection down event.
   1.111  
   1.112  @return a CSubConGenEventSubConDown pointer if successful,
   1.113   otherwise leaves with system error code.
   1.114  */
   1.115  	{
   1.116 -	STypeId typeId(KSubConnGenericEventsImplUid, KSubConGenericEventSubConDown);
   1.117 +	STypeId typeId = STypeId::CreateSTypeId(KSubConnGenericEventsImplUid, KSubConGenericEventSubConDown);
   1.118  	return static_cast<CSubConGenEventSubConDown*>(CSubConNotificationEvent::NewL(typeId));
   1.119  	}
   1.120  
   1.121 @@ -323,3 +322,4 @@
   1.122  	}
   1.123  
   1.124  #endif	// __CS_SUBCONEVENTS_INL__
   1.125 +