--- a/secureswitools/swisistools/source/interpretsislib/parameterlist.h Tue Aug 31 15:21:33 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/parameterlist.h Wed Sep 01 12:22:02 2010 +0100
@@ -116,11 +116,7 @@
EFlagsSysDriveSet = 0x0010,
EFlagsStubDirectorySet = 0x0020,
EFlagsConfigIniSet = 0x0040,
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- EFlagsResourceFilePathSet = 0x0100,
-#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
EFlagsDisableZDriveChecksSet= 0x0080
-
};
public: // Constructors & destructor
@@ -139,13 +135,6 @@
* @param aError type of error.
*/
static void DisplayError(TParamException aError);
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- /**
- * Set the path which represent the system drive.
- * @param File-system path which represents system drive
- */
- void SetResourceFilePath(const std::string& aFilePath);
-#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/**
* Set the path which represent the system drive.
* @param File-system path which represents system drive
@@ -250,12 +239,6 @@
* Get the system drive path.
*/
inline const std::wstring& SystemDrivePath() const;
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- /**
- * Get the Resource File path.
- */
- inline const std::wstring& ResourceFilePath() const;
-#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/**
* Gets the ROM drive (Z) path in the file-system.
*/
@@ -308,10 +291,7 @@
SISFileList iFileNames;
OptionList iRomLogFiles;
OptionList iPkgUIDs;
- std::wstring iSystemDrivePath;
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- std::wstring iResourceFilePath;
-#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ std::wstring iSystemDrivePath;
std::wstring iZDrive;
std::wstring iConfigFile;
std::wstring iSisStubPath;
@@ -347,13 +327,6 @@
return iSystemDrivePath;
}
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-inline const std::wstring& CParameterList::ResourceFilePath() const
- {
- return iResourceFilePath;
- }
-#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-
inline const std::wstring& CParameterList::RomDrivePath() const
{
return iZDrive;