diff -r 92f864ef0288 -r ae54820ef82c ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp --- a/ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp Wed Jun 23 18:20:02 2010 +0300 +++ b/ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp Tue Jul 06 14:23:31 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 // --------------------------------------------------------------------------- @@ -190,7 +189,7 @@ iFileHandle, aFile.MimeType(), aFile.Purpose(), - SilentInstallOptionsPackage() ); + SilentInstallOptions() ); break; } @@ -201,7 +200,7 @@ iFileHandle, aFile.MimeType(), aFile.Data(), - SilentInstallOptionsPackage() ); + SilentInstallOptions() ); break; } @@ -212,7 +211,7 @@ { Installer().SilentInstallWidgetL( iFileHandle, - SilentInstallOptionsPackage() ); + SilentInstallOptions() ); break; } @@ -227,9 +226,8 @@ DLTRACEOUT(("")); } - -const SwiUI::TInstallOptionsPckg& CNcdSilentInstallOperationProxy::SilentInstallOptionsPackage() const +const Usif::COpaqueNamedParams* CNcdSilentInstallOperationProxy::SilentInstallOptions() const { DLTRACEIN(("")); - return iInstallOptionsPackage; + return iInstallOptions; }