diff -r aa99f2208aad -r b8d18c84f71c localisation/apparchitecture/inc/APAID.H --- a/localisation/apparchitecture/inc/APAID.H Wed Jul 28 16:03:37 2010 +0100 +++ b/localisation/apparchitecture/inc/APAID.H Tue Aug 03 10:20:34 2010 +0100 @@ -1,7 +1,7 @@ // Copyright (c) 1997-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" +// under the terms of "Eclipse Public License v1.0" // which accompanies this distribution, and is available // at the URL "http://www.eclipse.org/legal/epl-v10.html". // @@ -11,34 +11,21 @@ // Contributors: // // Description: +// apaid.h // #ifndef __APAID_H__ #define __APAID_H__ -#if !defined(__E32BASE_H__) #include -#endif -#if !defined(__APADEF_H__) #include -#endif +#include // class TDataTypeWithPriority -#include "apmstd.h" - - -// classes defined: -class TApaAppIdentifier; -class TApaAppEntry; -class CApaAppFinder; -// -// classes referenced: +// classes referenced class RReadStream; class RWriteStream; class RFs; -// - -class TApaAppIdentifier /** The identity of an application. An object of this type contains two pieces of information: @@ -56,52 +43,23 @@ @see CApaProcess::WriteRootStreamL() @see CApaProcess::ReadAppIdentifierL() @see CApaProcess::WriteAppIdentifierL() */ +class TApaAppIdentifier { public: IMPORT_C TApaAppIdentifier(); IMPORT_C TApaAppIdentifier(TUid aAppUidType,const TFileName& aDllName); IMPORT_C void ExternalizeL(RWriteStream& aStream)const; IMPORT_C void InternalizeL(RReadStream& aStream); - public: /** The application-specific UID. */ TUid iAppUid; /** The full path name of the application DLL. */ TFileName iFullName; - private: TInt iTApaAppIdentifier_Reserved1; }; -class TApaAppEntry -/** An application entry. - -An object of this type contains two pieces of information: - -the full path name of the application DLL - -the UID type (or compound identifier) of the application DLL. - -@publishedAll -@released */ - { -public: - IMPORT_C TApaAppEntry(); - IMPORT_C TApaAppEntry(const TUidType& aAppUidType,const TFileName& aDllName); - IMPORT_C void ExternalizeL(RWriteStream& aStream)const; - IMPORT_C void InternalizeL(RReadStream& aStream); -public: - /** The UID type (or compound identifier) of the application DLL. */ - TUidType iUidType; - /** The full path name of the application DLL. */ - TFileName iFullName; -private: - TInt iTApaAppEntry_Reserved1; - }; - - -class TApaAppInfo /** Application information. An object of this type contains four pieces of information: @@ -116,6 +74,7 @@ @publishedAll @released */ +class TApaAppInfo { public: IMPORT_C TApaAppInfo(); @@ -132,13 +91,11 @@ TApaAppCaption iCaption; /** The short caption for the application. */ TApaAppCaption iShortCaption; - private: TInt iTApaAppInfo_Reserved1; }; -class TApaAppViewInfo /** Contains the basic information about an application view. An object of this type contains two pieces of information: @@ -153,6 +110,7 @@ @released @see CApaAppViewArray @see TUid */ +class TApaAppViewInfo { public: IMPORT_C TApaAppViewInfo(); @@ -181,21 +139,17 @@ typedef CArrayFixFlat CApaAppViewArray; -class TApaAppCapability -// expandable class - add new members to the end, add them to the end of int/ext also, and increment the version no. -// default value for all data members must be 0 /** Application capabilities. @publishedAll @released */ +class TApaAppCapability { public: IMPORT_C static void CopyCapability(TDes8& aDest,const TDesC8& aSource); IMPORT_C void InternalizeL(RReadStream& aStream); - IMPORT_C void Internalize7_0L(RReadStream& aStream); // deprecated IMPORT_C void ExternalizeL(RWriteStream& aStream) const; private: - IMPORT_C void Externalize7_0L(RWriteStream& aStream) const; // deprecated void DoInternalizeL(RReadStream& aStream, TBool& aLaunchInBackground, TApaAppGroupName& aGroupName); public: // @@ -214,7 +168,9 @@ /** Defines an application's attributes as a set of bit flags. */ enum TCapabilityAttribute { - /** If set, the application was built as a DLL, otherwise it was built as an EXE. */ + /** This functionality is deprecated from v9.5 onwards. + @deprecated + */ EBuiltAsDll = 0x00000001, /** If set, the application provides control panel functionality. */ EControlPanelItem = 0x00000002, @@ -239,6 +195,8 @@ /** Indicates the application attributes. One or more values from TCapabilityAttribute may be specified. */ TUint iAttributes; private: + // expandable class - add new members to the end, add them to the end of int/ext also, and increment the version no. + // default value for all data members must be 0 enum { EVersion=4 }; private: TInt iTApaAppCapability_Reserved1; @@ -268,27 +226,7 @@ TInt iTApaEmbeddabilityFilter_Reserved1; }; - -class CApaAppFinder : public CBase -/** -@publishedPartner -@deprecated -*/ - { -public: - virtual void FindAllAppsL()=0; // sets up a scan for all apps - virtual TBool NextL(TApaAppEntry& aEntry)=0; // increments a scan for all apps - virtual TFileName FindAppL(const TDesC& aFileName,TUid aFileUid)=0; // searches for a particular app - should support wildcards in aFileName - // - virtual TFileName DefaultAppInfoFileName()const=0; // should return the full name, path and drive of the default icon file -protected: - IMPORT_C CApaAppFinder(); - -private: - IMPORT_C virtual void CApaAppFinder_Reserved1(); - IMPORT_C virtual void CApaAppFinder_Reserved2(); - }; - +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS /** The uid for the Open service. @@ -311,13 +249,12 @@ class TApaAppServiceInfo { public: - TApaAppServiceInfo(); - TApaAppServiceInfo(TUid aUid, CArrayFixFlat* aDataTypes, - HBufC8* aOpaqueData); - void ExternalizeL(RWriteStream& aStream) const; - void InternalizeL(RReadStream& aStream); - void Release(); - CArrayFixFlat& DataTypes(); + IMPORT_C TApaAppServiceInfo(); + IMPORT_C TApaAppServiceInfo(TUid aUid, CArrayFixFlat* aDataTypes, HBufC8* aOpaqueData); + IMPORT_C void ExternalizeL(RWriteStream& aStream) const; + IMPORT_C void InternalizeL(RReadStream& aStream); + IMPORT_C void Release(); + IMPORT_C CArrayFixFlat& DataTypes(); IMPORT_C TUid Uid() const; IMPORT_C const CArrayFixFlat& DataTypes() const; IMPORT_C const TDesC8& OpaqueData() const; @@ -339,20 +276,20 @@ class CApaAppServiceInfoArray : public CBase { protected: - CApaAppServiceInfoArray(); + IMPORT_C CApaAppServiceInfoArray(); public: /** Provides access to the encapsulated array of TApaAppServiceInfo objects. @return A generic array of TApaAppServiceInfo objects. */ virtual TArray Array()=0; - private: IMPORT_C virtual void CApaAppServiceInfoArray_Reserved1(); IMPORT_C virtual void CApaAppServiceInfoArray_Reserved2(); - private: TInt iCApaAppServiceInfoArray_Reserved1; }; +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS + #endif