--- a/appfw/apparchitecture/aplist/aplappinforeader.h	Tue Aug 31 15:24:25 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplappinforeader.h	Wed Sep 01 12:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -26,11 +26,6 @@
 #include <barsread.h>
 #include <apgicnfl.h>
 
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-#include <usif/scr/scr.h>
-#include <usif/scr/appregentries.h>
-#endif
-
 class TEntry;
 class RFs;
 class CResourceFile;
@@ -39,7 +34,6 @@
 class CApaAppIconArray;
 class CApaAppViewData;
 
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 /**
 @internalComponent
 */
@@ -48,7 +42,7 @@
 public:
 	static TBool TypeUidIsForRegistrationFile(const TUidType& aUidType);
 	};
-#endif
+
 
 /**
 @internalComponent
@@ -132,16 +126,8 @@
 class CApaAppInfoReader : public CBase
 	{
 public:
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-    static CApaAppInfoReader* NewL(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr); 
-#else
-    static CApaAppInfoReader* NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
-    HBufC* LocalisableResourceFileName();
-    TTime LocalisableResourceFileTimeStamp() const; 
-    TTime TimeStamp() const;
-    TTime IconFileTimeStamp() const;   
-#endif
-    TBool ReadL();    
+	static CApaAppInfoReader* NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
+	TBool ReadL();
     static TBool FileIsMbmWithGenericExtensionL(const TDesC& aFileName);
 	~CApaAppInfoReader();
 public:
@@ -159,41 +145,35 @@
 	HBufC* IconFileName();
 	TBool NonMbmIconFile() const;
 	CApaIconLoader* IconLoader();
+	
+	TTime TimeStamp() const;
+	TTime IconFileTimeStamp() const;
+	
+	HBufC* LocalisableResourceFileName();
+	TTime LocalisableResourceFileTimeStamp() const;
 	TLanguage AppLanguage() const;
 	CArrayFixFlat<TApaAppServiceInfo>* ServiceArray(TInt& aIndexOfFirstOpenService);
 	HBufC8* OpaqueData();
-	
 private:
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-	CApaAppInfoReader(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr);
-    void ReadAppRegistrationInfoL();
-    void ReadServiceInfoL(const RPointerArray<Usif::CServiceInfo>& aServiceInfo);    
-    void ReadOwnedFilesInfoL(const RPointerArray<HBufC>& aOwnedFiles);
-    void ReadMimeTypesSupportedL(const RPointerArray<Usif::CDataType>& dataTypes, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported);    
-    void ReadLocalisationInfoL();
-    void ReadViewInfoL(const RPointerArray<Usif::CAppViewData>& aViewData);    
-#ifdef APPARC_SHOW_TRACE   
-    void DisplayAppInfo();
-#endif
-    
-#else
-    CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
-    void ReadMandatoryInfoL(RResourceReader& aResourceReader);
-    void ReadNonLocalisableInfoL(RResourceReader& aResourceReader, CResourceFile*& aLocalisableResourceFile, TUint& aLocalisableResourceId);
-    void ReadNonLocalisableOptionalInfoL(RResourceReader& aResourceReader, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile);
-    void ReadMimeTypesSupportedL(RResourceReader& aResourceReader, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported);       
-    void ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons);
-    HBufC* CreateFullIconFileNameL(const TDesC& aIconFileName) const;    
-#endif
+	CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
 	void ConstructL();
+	void ReadMandatoryInfoL(RResourceReader& aResourceReader);
+	void ReadNonLocalisableInfoL(RResourceReader& aResourceReader, CResourceFile*& aLocalisableResourceFile, TUint& aLocalisableResourceId);
+	void ReadNonLocalisableOptionalInfoL(RResourceReader& aResourceReader, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile);
+	void ReadMimeTypesSupportedL(RResourceReader& aResourceReader, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported);
+	void ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons);
+	HBufC* CreateFullIconFileNameL(const TDesC& aIconFileName) const;
 	TBool HasWriteDeviceDataCap();
     void ReadAppSecurityInfo();
+	
 	static HBufC8* ReadOpaqueDataL(TUint aResourceId, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile);
 private:
 	RFs& iFs;
 	TUid iAppUid;
 	HBufC* iAppBinaryFullName;
 	TUidType iAppBinaryUidType;
+	TTime iTimeStamp;
+	TTime iIconFileTimeStamp;
 	TApaAppCapability iCapability;
 	TUint iDefaultScreenNumber;
 	HBufC* iCaption;
@@ -204,28 +184,20 @@
 	CDesCArray* iOwnedFileArray;
 	HBufC* iIconFileName;
 	TBool iNonMbmIconFile; // ETrue if icon filename is not an MBM file, however, EFalse does not necessarily mean it is an MBM file
+	HBufC* iLocalisableResourceFileName;
+	TTime iLocalisableResourceFileTimeStamp;
 	TLanguage iApplicationLanguage;
 	CArrayFixFlat<TApaAppServiceInfo>* iServiceArray;
-    TInt iIndexOfFirstOpenService; 	
+	TInt iIndexOfFirstOpenService;
+	TBool iOpenServiceIsLegacy;
 	HBufC8* iOpaqueData;
 private:
+	const TDesC& iRegistrationFileName;
 	TBool iHasWriteDeviceDataCap;
     TBool iIsSidTrusted;
     // This flag is used to determine if app security info was allready read
     TBool iSecurityInfoHasBeenRead;
-	CApaIconLoader* iIconLoader;
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-	const Usif::CApplicationRegistrationData& iAppInfo; //The ownership is not taken	
-	const Usif::RSoftwareComponentRegistry& iScr; //The ownership is not taken	
-#else
-    const TDesC& iRegistrationFileName;
-    TTime iTimeStamp;
-    TTime iIconFileTimeStamp;   
-    HBufC* iLocalisableResourceFileName;
-    TTime iLocalisableResourceFileTimeStamp; 
-    TBool iOpenServiceIsLegacy;   
-#endif
-	
+	CApaIconLoader* iIconLoader;	
 	};