diff -r 7333d7932ef7 -r 8b7f4e561641 appinstaller/AppinstUi/Daemon/Inc/silentuninstaller.h --- a/appinstaller/AppinstUi/Daemon/Inc/silentuninstaller.h Tue Aug 31 15:21:33 2010 +0300 +++ b/appinstaller/AppinstUi/Daemon/Inc/silentuninstaller.h Wed Sep 01 12:22:02 2010 +0100 @@ -23,10 +23,6 @@ #include #include #include -#include -#include - -#include "sisregistrysession.h" namespace Swi { @@ -62,7 +58,7 @@ void UninstallL( TUid& aUid, TRequestStatus& aReqStatus, - TDesC& aMIME ); + TDesC8& aMIME ); /** * Cancel the current installation. @@ -85,14 +81,12 @@ private: // Data - // SW installer framework - Usif::RSoftwareInstall iSWInstallerFW; - // Install parameters - Usif::COpaqueNamedParams* iSifOptions; - // Result parameters like error codes. - Usif::COpaqueNamedParams* iSifResults; - // SisRegister for native install packages. - RSisRegistrySession iRegistrySession; + // Silent uninstaller + SwiUI::RSWInstSilentLauncher iLauncher; + // Uninstall options + SwiUI::TUninstallOptions iOptions; + // Uninstall options package + SwiUI::TUninstallOptionsPckg iOptionsPckg; // File server RFs& iFs; // Defines need of connection to install server.