--- a/installationservices/swi/test/tuiscriptadaptors/tswisstep.h Tue Aug 31 15:21:33 2010 +0300
+++ b/installationservices/swi/test/tuiscriptadaptors/tswisstep.h Wed Sep 01 12:22:02 2010 +0100
@@ -32,14 +32,11 @@
#include <swi/sistruststatus.h>
#include <e32base.h>
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#ifndef SWI_TEXTSHELL_ROM
#include <apsidchecker.h>
#else
class CAppSidChecker;
#endif
-#endif
namespace Swi
{
@@ -224,7 +221,7 @@
class CSwisInstallStep : public CSwisTestStep
{
public:
- enum TInstallType { EUseFileHandle, EUseMemory, EUseFileName, EUseCAF, EUseOpenFileName, ECheckExitValue, ECheckInstallPerformance};
+ enum TInstallType { EUseFileHandle, EUseMemory, EUseFileName, EUseCAF, EUseOpenFileName, ECheckExitValue};
CSwisInstallStep(TInstallType aInstallType, TBool aDoCancelTest = EFalse);
~CSwisInstallStep();
@@ -234,7 +231,6 @@
private:
TInt DoInstallL(Swi::CInstallPrefs& aInstallPrefs);
void GetFilesToHoldOpenL();
- void PrintPerformanceLog(TTime aTime);
private:
TFileName iSisFileName; // name of the file to install
@@ -336,7 +332,6 @@
#endif
_LIT(KSwisInstallStep, "InstallStep");
-_LIT(KSwisInstallPerformanceStep, "InstallPerformanceStep");
_LIT(KSwisInstallFHStep, "InstallFHStep"); // install using file handles
_LIT(KSwisInstallMemStep, "InstallMemStep"); // install from memory
_LIT(KSwisInstallCAFStep, "InstallCAFStep"); // install from CAF
@@ -492,13 +487,9 @@
TInt iDrive;
TInt iBootMode;
TChar iDriveChar;
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#ifndef SWI_TEXTSHELL_ROM
CAppSidChecker *iSwiSidChecker;
#endif
-#endif
-
};
/**
@@ -530,4 +521,5 @@
~CSwisSetRemoveWithLastDependent();
virtual TVerdict doTestStepL();
};
+
#endif // __TSWISSTEP_H__