diff -r 5cc91383ab1e -r 7333d7932ef7 ncdengine/inc/ncdnodeinstall.h --- a/ncdengine/inc/ncdnodeinstall.h Thu Aug 19 10:02:49 2010 +0300 +++ b/ncdengine/inc/ncdnodeinstall.h Tue Aug 31 15:21:33 2010 +0300 @@ -32,18 +32,12 @@ class MDesCArray; class MNcdInstalledContent; -// Forward declaration for SwiUI::TInstallOptions -// SwiUI namespace contains install options -// that are used for the silent install. -// #include -// is required when SwiUI::TInstallOptions is created -// in the implementation code. -namespace SwiUI +// Forward declaration for Usif::TInstallOptions +namespace Usif { - class TInstallOptions; + class COpaqueNamedParams; } - /** * Provides functions that can be used to install the node object. * Before installing, the data should have been downloaded using @@ -83,7 +77,6 @@ */ virtual MNcdInstallOperation* InstallL( MNcdInstallOperationObserver& aObserver ) = 0; - /** * Starts the silent installing operation of the node object. * Because installation is silent, normal installation query dialogs are not shown. @@ -96,7 +89,7 @@ * function of the operation should be called when operation is not needed anymore. * * @note Requires TrustedUI capabilities - * @note Only SIS packages and Java archives are installed silently, other content + * @note Only SIS packages and Java archives and widgets are installed silently, other content * is installed exactly like with InstallL * * @param aObserver Observer for the operation. @@ -109,9 +102,9 @@ * Leaves with KNcdErrorParallelOperationNotAllowed if a parallel client is running * an operation for the same metadata. See MNcdOperation for full explanation. */ - virtual MNcdInstallOperation* SilentInstallL( MNcdInstallOperationObserver& aObserver, - const SwiUI::TInstallOptions& aInstallOptions ) = 0; - + virtual MNcdInstallOperation* SilentInstallL( + MNcdInstallOperationObserver& aObserver, + Usif::COpaqueNamedParams* aInstallOptions ) = 0; /** * Checks if the item content has already been installed and is currently present in the