diff -r 7333d7932ef7 -r 8b7f4e561641 installationservices/swi/inc/swi/sisuihandler.h --- a/installationservices/swi/inc/swi/sisuihandler.h Tue Aug 31 15:21:33 2010 +0300 +++ b/installationservices/swi/inc/swi/sisuihandler.h Wed Sep 01 12:22:02 2010 +0100 @@ -38,6 +38,7 @@ class CWriteStream; class CProgressBarValuePublisher; + /** * RClass which is used to make calls to the UI Support server using * the client-server framework. The ExecuteL() method is passed a @@ -63,12 +64,10 @@ */ IMPORT_C void UpdateProgressBarL(const TAppInfo& aAppInfo, TInt aAmount); -#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK /** Sets a reference to the progress bar value publisher object. The ownership is NOT transferred. */ IMPORT_C void SetProgressBarValuePublisher(CProgressBarValuePublisher* aPublisher); private: CProgressBarValuePublisher* iPublisher; // Owned by the state machine -#endif }; /** @@ -820,7 +819,6 @@ return iAppVersion; } -#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK NONSHARABLE_CLASS(CProgressBarValuePublisher) : public CBase /** * This class is used to publish the percentage value of the installation progress bar. @@ -835,7 +833,7 @@ IMPORT_C void SetFinalProgressBarValue(TInt aValue); /** Updates the value of the progress bar value property by adding the given value to the current value. */ - IMPORT_C TInt UpdateProgressBarValueL(TInt aValue); + IMPORT_C TInt CalculateProgressBarValue(TInt aValue); private: CProgressBarValuePublisher(); @@ -847,7 +845,6 @@ TInt iLastPercentCompletion; TInt iLastProgressValue; }; -#endif } // namespace Swi