diff -r cd189dac02f7 -r 5cc91383ab1e secureswitools/swisistools/source/interpretsislib/sisregistry.h --- a/secureswitools/swisistools/source/interpretsislib/sisregistry.h Thu Jul 15 18:47:04 2010 +0300 +++ b/secureswitools/swisistools/source/interpretsislib/sisregistry.h Thu Aug 19 10:02:49 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 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" @@ -90,6 +90,7 @@ static const std::string KRegistryV52string; static const std::string KRegistryV53string; static const std::string KRegistryV54string; + typedef std::multimap EntryMap; private: // Internal methods void ReadStubs( const std::wstring& aDirectory ); @@ -109,6 +110,7 @@ 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 @@ -123,9 +125,6 @@ private: // Friends friend struct Contains; -private: // Type definitions - typedef std::multimap EntryMap; - private: // Constants static const std::wstring KPathToRegistry; static const std::wstring KPathToRomStubs; @@ -260,8 +259,6 @@ 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);