diff -r 7333d7932ef7 -r 8b7f4e561641 appinstaller/AppinstUi/Daemon/Inc/SilentLauncher.h --- a/appinstaller/AppinstUi/Daemon/Inc/SilentLauncher.h Tue Aug 31 15:21:33 2010 +0300 +++ b/appinstaller/AppinstUi/Daemon/Inc/SilentLauncher.h Wed Sep 01 12:22:02 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2004 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" @@ -23,8 +23,6 @@ #include #include #include -#include -#include namespace Swi { @@ -56,17 +54,7 @@ * @param aFile - Name of the file to install * @param aStatus - Request status */ - // void InstallL( const TDesC& aFile, TRequestStatus& aStatus ); - - /** - * Perform installation with file handle. - * @since 10.1 - * @param aFileHandle - Handle of the file to be installed - * @param aStatus - Request status - */ - void InstallL( RFile& aFileHandle, - const TDesC& aFile, - TRequestStatus& aStatus ); + void InstallL( const TDesC& aFile, TRequestStatus& aStatus ); /** * Cancel the current installation. @@ -85,22 +73,15 @@ * 2nd phase constructor. */ void ConstructL(); - private: // Data - - // SW installer framework - Usif::RSoftwareInstall iSWInstallerFW; - // Install parameters - Usif::COpaqueNamedParams* iSifOptions; - // Result parameters like error codes. - Usif::COpaqueNamedParams* iSifResults; - // File server - RFs& iFs; - // Defines if we have connected to SWI server. - TBool iConnected; - - HBufC* iDrive; + + SwiUI::RSWInstSilentLauncher iLauncher; + SwiUI::TInstallOptions iOptions; + SwiUI::TInstallOptionsPckg iOptionsPckg; + + RFs& iFs; + TBool iConnected; }; }