diff -r 5cc91383ab1e -r 7333d7932ef7 ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp --- a/ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp Thu Aug 19 10:02:49 2010 +0300 +++ b/ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp Tue Aug 31 15:21:33 2010 +0300 @@ -39,7 +39,7 @@ CNcdNodeManagerProxy* aNodeManager, MNcdInstallOperationObserver* aObserver, MNcdInstallationService& aInstallationService, - const SwiUI::TInstallOptions& aInstallOptions ) + Usif::COpaqueNamedParams* aInstallOptions ) { CNcdSilentInstallOperationProxy* self = new( ELeave ) CNcdSilentInstallOperationProxy( aInstallationService, @@ -59,15 +59,14 @@ // CNcdSilentInstallOperationProxy::CNcdSilentInstallOperationProxy( MNcdInstallationService& aInstallationService, - const SwiUI::TInstallOptions& aInstallOptions ) + /*const*/ Usif::COpaqueNamedParams* aInstallOptions ) : CNcdInstallOperationProxy( aInstallationService ) { // Copy all the install options into the buffer that will be used // when silent installation is delegated to the installer. - iInstallOptionsPackage = aInstallOptions; + iInstallOptions = aInstallOptions; } - // --------------------------------------------------------------------------- // Destructor // --------------------------------------------------------------------------- @@ -75,6 +74,9 @@ CNcdSilentInstallOperationProxy::~CNcdSilentInstallOperationProxy() { DLTRACEIN(( "" )); + + delete iInstallOptions; + // Cancel must be called here because base class will only call its own // DoCancel() Cancel(); @@ -190,7 +192,7 @@ iFileHandle, aFile.MimeType(), aFile.Purpose(), - SilentInstallOptionsPackage() ); + SilentInstallOptions() ); break; } @@ -201,7 +203,7 @@ iFileHandle, aFile.MimeType(), aFile.Data(), - SilentInstallOptionsPackage() ); + SilentInstallOptions() ); break; } @@ -212,7 +214,7 @@ { Installer().SilentInstallWidgetL( iFileHandle, - SilentInstallOptionsPackage() ); + SilentInstallOptions() ); break; } @@ -227,9 +229,8 @@ DLTRACEOUT(("")); } - -const SwiUI::TInstallOptionsPckg& CNcdSilentInstallOperationProxy::SilentInstallOptionsPackage() const +const Usif::COpaqueNamedParams* CNcdSilentInstallOperationProxy::SilentInstallOptions() const { DLTRACEIN(("")); - return iInstallOptionsPackage; + return iInstallOptions; }