diff -r 94b923fa11ed -r 63339781d179 wim/Scard/src/ScardConnector.cpp --- a/wim/Scard/src/ScardConnector.cpp Thu Jul 15 19:36:50 2010 +0300 +++ b/wim/Scard/src/ScardConnector.cpp Thu Aug 19 10:45:23 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -89,17 +89,12 @@ // might leave. // ----------------------------------------------------------------------------- // -CScardConnector::CScardConnector( - CScardConnectionRegistry* aConnRegistry, - RThread& /*aClient*/ ) - : CScardSession(), - iConnectionRegistry( aConnRegistry ), - iState( EActive ) +CScardConnector::CScardConnector( CScardConnectionRegistry* aConnRegistry ) : + CScardSession(), iConnectionRegistry( aConnRegistry ), iState( EActive ) { _WIMTRACE(_L("WIM|Scard|CScardConnector::CScardConnector|Begin")); } - // ----------------------------------------------------------------------------- // CScardConnector::ConstructL // Symbian 2nd phase constructor can leave. @@ -120,14 +115,12 @@ // ----------------------------------------------------------------------------- // CScardConnector* CScardConnector::NewL( - CScardConnectionRegistry* aConnRegistry, - RThread& aClient, + CScardConnectionRegistry* aConnRegistry, const RMessage2& aMessage ) { _WIMTRACE(_L("WIM|Scard|CScardConnector::NewL|Begin")); - CScardConnector* self = new( ELeave ) CScardConnector( aConnRegistry, - aClient ); - + CScardConnector* self = new( ELeave ) CScardConnector( aConnRegistry ); + CleanupStack::PushL( self ); self->ConstructL( aMessage ); CleanupStack::Pop( self );