1.1 --- a/epoc32/include/mw/apadef.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/mw/apadef.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
1.5 // All rights reserved.
1.6 // This component and the accompanying materials are made available
1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
1.8 +// under the terms of "Eclipse Public License v1.0"
1.9 // which accompanies this distribution, and is available
1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.12 //
1.13 // Initial Contributors:
1.14 // Nokia Corporation - initial contribution.
1.15 @@ -11,51 +11,13 @@
1.16 // Contributors:
1.17 //
1.18 // Description:
1.19 +// apadef.h
1.20 //
1.21
1.22 #ifndef __APADEF_H__
1.23 #define __APADEF_H__
1.24
1.25 -#if !defined(__E32BASE_H__)
1.26 #include <e32base.h>
1.27 -#endif
1.28 -
1.29 -// comand line tokens
1.30 -
1.31 -/**
1.32 -@internalComponent
1.33 -*/
1.34 -const TUint KApaCommandLetterOpen='O';
1.35 -
1.36 -/**
1.37 -@internalComponent
1.38 -*/
1.39 -const TUint KApaCommandLetterCreate='C';
1.40 -
1.41 -/**
1.42 -@internalComponent
1.43 -*/
1.44 -const TUint KApaCommandLetterRun='R';
1.45 -
1.46 -/**
1.47 -@internalComponent
1.48 -*/
1.49 -const TUint KApaCommandLetterBackground='B';
1.50 -
1.51 -/**
1.52 -@internalComponent
1.53 -*/
1.54 -const TUint KApaCommandLetterViewActivate='V';
1.55 -
1.56 -/**
1.57 -@internalComponent
1.58 -*/
1.59 -const TUint KApaCommandLetterRunWithoutViews='W';
1.60 -
1.61 -/**
1.62 -@internalComponent
1.63 -*/
1.64 -const TUint KApaCommandLetterBackgroundAndWithoutViews='A';
1.65
1.66 /** Defines the command codes used to indicate the way an application is to be
1.67 launched.
1.68 @@ -98,6 +60,7 @@
1.69 @released */
1.70 typedef TBuf<KApaMaxAppCaption> TApaAppCaption;
1.71
1.72 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.73 /**
1.74 @internalComponent
1.75 */
1.76 @@ -108,15 +71,7 @@
1.77 */
1.78 typedef TBuf<KApaMaxCommandLine> TApaCommandLine;
1.79
1.80 -/**
1.81 -@internalComponent
1.82 -*/
1.83 -const TInt KApaMaxAppFileName=0x10; // Length of App's filename without path or extension (not it's caption)
1.84 -
1.85 -/**
1.86 -@internalComponent
1.87 -*/
1.88 -typedef TBuf<KApaMaxAppFileName> TApaAppFileName;
1.89 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
1.90
1.91 /** Maximum length of an application group name.
1.92
1.93 @@ -134,20 +89,6 @@
1.94 @released */
1.95 typedef TBuf<KApaMaxAppGroupName> TApaAppGroupName;
1.96
1.97 -/** The hexadecimal value of the 2nd UID that identifies a DLL as being an ASCII UI
1.98 -application. In .mmp files, the hexadecimal number is explicitly inserted
1.99 -as the first value following the UID keyword.
1.100 -
1.101 -@publishedAll
1.102 -@deprecated */
1.103 -const TInt KAppUidValue8 = 0x1000006c;
1.104 -
1.105 -/** The 2nd UID that identifies a DLL as being an ASCII UI application.
1.106 -
1.107 -@publishedAll
1.108 -@deprecated */
1.109 -const TUid KUidApp8={KAppUidValue8};
1.110 -
1.111 /** The hexadecimal value of the 2nd UID that defines a DLL as being a Unicode
1.112 UI application. In .mmp files, the hexadecimal number is explicitly inserted
1.113 as the first value following the UID keyword.
1.114 @@ -168,25 +109,11 @@
1.115 // 2nd Uid for app doc files
1.116 /**
1.117 @publishedAll
1.118 -@deprecated
1.119 -*/
1.120 -const TUid KUidAppDllDoc8={268435565};
1.121 -
1.122 -/**
1.123 -@publishedAll
1.124 @released
1.125 */
1.126 const TUid KUidAppDllDoc16={0x10003A12};
1.127
1.128 /** The UID encoded in a TPictureHeader that identifies a picture as a door (for
1.129 -ASCII builds).
1.130 -
1.131 -@publishedAll
1.132 -@deprecated
1.133 -*/
1.134 -const TUid KUidPictureTypeDoor8={268435537};
1.135 -
1.136 -/** The UID encoded in a TPictureHeader that identifies a picture as a door (for
1.137 Unicode builds).
1.138
1.139 @publishedAll
1.140 @@ -196,11 +123,6 @@
1.141
1.142 //
1.143 // Uid's for streams in stream dictionaries
1.144 -/**
1.145 -@publishedAll
1.146 -@deprecated
1.147 -*/
1.148 -const TUid KUidSecurityStream8={268435661};
1.149
1.150 /**
1.151 @publishedAll
1.152 @@ -210,82 +132,54 @@
1.153
1.154 /**
1.155 @publishedAll
1.156 -@deprecated
1.157 +@released
1.158 */
1.159 -const TUid KUidAppIdentifierStream8={268435593}; // stream containing a TApaAppIdentifier
1.160 +const TUid KUidAppIdentifierStream16={0x10003A34};
1.161 +
1.162 +/** The type-independent 2nd UID that identifies a DLL as being a UI application.
1.163 +
1.164 +@publishedAll
1.165 +@released
1.166 +@see KUidApp16 */
1.167 +#define KUidApp KUidApp16
1.168 +
1.169 +/** The type-independent hexadecimal value of the 2nd UID that identifies a DLL as
1.170 +being a UI application.
1.171 +
1.172 +@publishedAll
1.173 +@released
1.174 +@see KAppUidValue16 */
1.175 +#define KAppUidValue KAppUidValue16 //lint !e1923 supress could become const variable
1.176
1.177 /**
1.178 @publishedAll
1.179 @released
1.180 */
1.181 -const TUid KUidAppIdentifierStream16={0x10003A34};
1.182 +#define KUidAppDllDoc KUidAppDllDoc16
1.183
1.184 -#ifdef _UNICODE
1.185 -/** The type-independent 2nd UID that identifies a DLL as being a UI application.
1.186 -
1.187 -@publishedAll
1.188 -@released
1.189 -@see KUidApp16
1.190 -@see KUidApp8 */
1.191 -#define KUidApp KUidApp16
1.192 -/** The type-independent hexadecimal value of the 2nd UID that identifies a DLL as
1.193 -being a UI application.
1.194 -
1.195 -@publishedAll
1.196 -@released
1.197 -@see KAppUidValue16
1.198 -@see KAppUidValue8 */
1.199 -#define KAppUidValue KAppUidValue16 //lint !e1923 supress could become const variable
1.200 -/**
1.201 -@publishedAll
1.202 -@released
1.203 -*/
1.204 -#define KUidAppDllDoc KUidAppDllDoc16
1.205 /** The type independent UID encoded in a TPictureHeader that identifies a picture
1.206 as a door.
1.207
1.208 @publishedAll
1.209 @released
1.210 @see KUidPictureTypeDoor16
1.211 -@see KUidPictureTypeDoor8
1.212 @see TPictureHeader
1.213 @see TApaModelDoorFactory::NewPictureL() */
1.214 #define KUidPictureTypeDoor KUidPictureTypeDoor16
1.215 +
1.216 /**
1.217 @publishedAll
1.218 @released
1.219 */
1.220 #define KUidAppIdentifierStream KUidAppIdentifierStream16
1.221 +
1.222 /**
1.223 @publishedAll
1.224 @released
1.225 */
1.226 #define KUidSecurityStream KUidSecurityStream16
1.227 -#else
1.228 -/** The type independent 2nd UID that defines a DLL as being a UI application.
1.229
1.230 -@see KUidApp16
1.231 -@see KUidApp8 */
1.232 -#define KUidApp KUidApp8
1.233 -/** The type independent hexadecimal value of the 2nd UID that defines a DLL as
1.234 -being a UI application.
1.235 -
1.236 -@see KAppUidValue16
1.237 -@see KAppUidValue8 */
1.238 -#define KAppUidValue KAppUidValue8
1.239 -#define KUidAppDllDoc KUidAppDllDoc8
1.240 -/** The type independent UID encoded in a TPictureHeader that identifies a picture
1.241 -as a door.
1.242 -
1.243 -@see KUidPictureTypeDoor16
1.244 -@see KUidPictureTypeDoor8
1.245 -@see TPictureHeader
1.246 -@see TApaModelDoorFactory::NewPictureL() */
1.247 -#define KUidPictureTypeDoor KUidPictureTypeDoor8
1.248 -#define KUidAppIdentifierStream KUidAppIdentifierStream8
1.249 -#define KUidSecurityStream KUidSecurityStream8
1.250 -#endif
1.251
1.252 const TUid KUidFileEmbeddedApplicationInterfaceUid={0x101f8c96};
1.253
1.254 -#endif
1.255 +#endif // __APADEF_H__