--- a/secureswitools/swisistools/source/interpretsislib/sisregistry.h	Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistry.h	Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -81,8 +81,6 @@
 	void GenerateStubRegistry();
 	int GetAugmentationsNumber(TUint32 aUid);
 	CSISController* GetStubController(const TUint32 aUid);
-	CSISController* GetStubControllerUid(const std::wstring& aTarget);
-	const std::wstring& GetRomStubFile() const;
 
 	static const int KSisRegistryMajorVersion;
 	static const int KSisRegistryMinorVersion;
@@ -92,13 +90,11 @@
 	static const std::string KRegistryV52string;
 	static const std::string KRegistryV53string;
 	static const std::string KRegistryV54string;
-	typedef std::multimap<TUint32, SisRegistryObject*> EntryMap;
 
 private: // Internal methods
     void ReadStubs( const std::wstring& aDirectory );
     void ReadRegistry( const std::wstring& aRegistryBasePath );
 	CSISController* GetStubControllerInDir( const std::wstring& aDirectory, const TUint32 aUid);
-	CSISController* GetStubControllerInDir( const std::wstring& aDirectory, const std::wstring& aTarget);
 	CSISController* ReadStubController( const wchar_t* aFilename );
 	void GenerateRegistryEntry(SisRegistryObject& aObj, const SisFile& aSis);
 	void ExtractRegistryFiles(const std::wstring& path);
@@ -108,13 +104,11 @@
 	std::wstring GetRegistryDir( const std::wstring& aDrivePath, TUint32 aUid  ) const;
 	void GenerateRegFile(SisRegistryObject& aObj) const;
 	void GenerateCtlFile(SisRegistryObject& aObj, const SisFile& aSis) const;
-	void SetRomStubFile(const std::wstring& aRomStubFile);
 
 public:
 	TUint32 GetUid(TUint32 aSid) const;
 	TUint32 GetUid(const std::wstring& aSidFile) const;
 	bool GetInRom(TUint32 aUid) const;
-	std::string GetDbPath();
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 	const DbHelper* GetDbHelper() const;	
 #endif
@@ -129,6 +123,9 @@
 private: // Friends
 	friend struct Contains;
 
+private: // Type definitions
+	typedef std::multimap<TUint32, SisRegistryObject*> EntryMap;
+
 private: // Constants
 	static const std::wstring KPathToRegistry;
 	static const std::wstring KPathToRomStubs;
@@ -148,10 +145,10 @@
 	std::wstring	iCDrive;
 	TInt			iSystemDrive;
     CParameterList& iParamList;
-    RomManager& 	iRomManager;
-	ConfigManager& 	iConfigManager;
-	EntryMap 		iEntries;
-	std::wstring	iRomStubFile;
+    RomManager& iRomManager;
+	ConfigManager& iConfigManager;
+	EntryMap iEntries;
+
 
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 private:
@@ -263,6 +260,8 @@
 	
 	void GenerateDbRegistryEntry(const SisRegistryObject& aSisRegistryObject, bool aOriginVerified);
 
+	std::string GetDbPath();
+
 	std::wstring GetGlobalId( TUint32 aUid , TInt aInstallType, std::wstring aPackageName);
 
 	void SetOriginVerification(XmlDetails::TScrPreProvisionDetail::TComponent& aComponent, bool aOriginVerified);