diff -r aa99f2208aad -r b8d18c84f71c localisation/apparchitecture/inc/APADEF.H
--- a/localisation/apparchitecture/inc/APADEF.H	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/inc/APADEF.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,51 +11,13 @@
 // Contributors:
 //
 // Description:
+// apadef.h
 //
 
 #ifndef __APADEF_H__
 #define __APADEF_H__
 
-#if !defined(__E32BASE_H__)
 #include <e32base.h>
-#endif
-
-// comand line tokens
-
-/**
-@internalComponent
-*/
-const TUint KApaCommandLetterOpen='O';
-
-/**
-@internalComponent
-*/
-const TUint KApaCommandLetterCreate='C';
-
-/**
-@internalComponent
-*/
-const TUint KApaCommandLetterRun='R';
-
-/**
-@internalComponent
-*/
-const TUint KApaCommandLetterBackground='B';
-
-/**
-@internalComponent
-*/
-const TUint KApaCommandLetterViewActivate='V';
-
-/**
-@internalComponent
-*/
-const TUint KApaCommandLetterRunWithoutViews='W';
-
-/**
-@internalComponent
-*/
-const TUint KApaCommandLetterBackgroundAndWithoutViews='A';
 
 /** Defines the command codes used to indicate the way an application is to be 
 launched.
@@ -98,6 +60,7 @@
 @released */
 typedef TBuf<KApaMaxAppCaption> TApaAppCaption; 
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /**
 @internalComponent
 */
@@ -108,15 +71,7 @@
 */
 typedef TBuf<KApaMaxCommandLine> TApaCommandLine;
 
-/**
-@internalComponent
-*/
-const TInt KApaMaxAppFileName=0x10;	// Length of App's filename without path or extension (not it's caption)
-
-/**
-@internalComponent
-*/
-typedef TBuf<KApaMaxAppFileName> TApaAppFileName;
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 /** Maximum length of an application group name.
 
@@ -134,20 +89,6 @@
 @released */
 typedef TBuf<KApaMaxAppGroupName> TApaAppGroupName;
 
-/** The hexadecimal value of the 2nd UID that identifies a DLL as being an ASCII UI 
-application. In .mmp files, the hexadecimal number is explicitly inserted 
-as the first value following the UID keyword. 
-
-@publishedAll 
-@deprecated */
-const TInt KAppUidValue8 = 0x1000006c;
-
-/** The 2nd UID that identifies a DLL as being an ASCII UI application. 
-
-@publishedAll 
-@deprecated */
-const TUid KUidApp8={KAppUidValue8};
-
 /** The hexadecimal value of the 2nd UID that defines a DLL as being a Unicode 
 UI application. In .mmp files, the hexadecimal number is explicitly inserted 
 as the first value following the UID keyword.
@@ -168,25 +109,11 @@
 // 2nd Uid for app doc files
 /**
 @publishedAll 
-@deprecated
-*/
-const TUid KUidAppDllDoc8={268435565}; 
-
-/**
-@publishedAll 
 @released
 */
 const TUid KUidAppDllDoc16={0x10003A12};
 
 /** The UID encoded in a TPictureHeader that identifies a picture as a door (for 
-ASCII builds). 
-
-@publishedAll 
-@deprecated
-*/
-const TUid KUidPictureTypeDoor8={268435537};
-
-/** The UID encoded in a TPictureHeader that identifies a picture as a door (for 
 Unicode builds).
 
 @publishedAll 
@@ -196,11 +123,6 @@
 
 //
 // Uid's for streams in stream dictionaries
-/**
-@publishedAll 
-@deprecated
-*/
-const TUid KUidSecurityStream8={268435661};
 
 /**
 @publishedAll 
@@ -210,82 +132,54 @@
 
 /**
 @publishedAll 
-@deprecated
+@released
 */
-const TUid KUidAppIdentifierStream8={268435593}; // stream containing a TApaAppIdentifier
+const TUid KUidAppIdentifierStream16={0x10003A34};
+
+/** The type-independent 2nd UID that identifies a DLL as being a UI application.
+
+@publishedAll 
+@released
+@see KUidApp16 */
+#define KUidApp KUidApp16
+
+/** The type-independent hexadecimal value of the 2nd UID that identifies a DLL as 
+being a UI application.
+
+@publishedAll 
+@released
+@see KAppUidValue16 */
+#define KAppUidValue KAppUidValue16 //lint !e1923 supress could become const variable
 
 /**
 @publishedAll 
 @released
 */
-const TUid KUidAppIdentifierStream16={0x10003A34};
-
-#ifdef _UNICODE
-/** The type-independent 2nd UID that identifies a DLL as being a UI application.
+#define KUidAppDllDoc KUidAppDllDoc16
 
-@publishedAll 
-@released
-@see KUidApp16
-@see KUidApp8 */
-#define KUidApp KUidApp16
-/** The type-independent hexadecimal value of the 2nd UID that identifies a DLL as 
-being a UI application.
-
-@publishedAll 
-@released
-@see KAppUidValue16
-@see KAppUidValue8 */
-#define KAppUidValue KAppUidValue16 //lint !e1923 supress could become const variable
-/**
-@publishedAll 
-@released
-*/
-#define KUidAppDllDoc KUidAppDllDoc16
 /** The type independent UID encoded in a TPictureHeader that identifies a picture 
 as a door.
 
 @publishedAll 
 @released
 @see KUidPictureTypeDoor16
-@see KUidPictureTypeDoor8
 @see TPictureHeader
 @see TApaModelDoorFactory::NewPictureL() */
 #define KUidPictureTypeDoor KUidPictureTypeDoor16
+
 /**
 @publishedAll 
 @released
 */
 #define KUidAppIdentifierStream KUidAppIdentifierStream16
+
 /**
 @publishedAll 
 @released
 */
 #define KUidSecurityStream KUidSecurityStream16
-#else
-/** The type independent 2nd UID that defines a DLL as being a UI application.
 
-@see KUidApp16
-@see KUidApp8 */
-#define KUidApp KUidApp8
-/** The type independent hexadecimal value of the 2nd UID that defines a DLL as 
-being a UI application.
-
-@see KAppUidValue16
-@see KAppUidValue8 */
-#define KAppUidValue KAppUidValue8
-#define KUidAppDllDoc KUidAppDllDoc8
-/** The type independent UID encoded in a TPictureHeader that identifies a picture 
-as a door.
-
-@see KUidPictureTypeDoor16
-@see KUidPictureTypeDoor8
-@see TPictureHeader
-@see TApaModelDoorFactory::NewPictureL() */
-#define KUidPictureTypeDoor KUidPictureTypeDoor8
-#define KUidAppIdentifierStream KUidAppIdentifierStream8
-#define KUidSecurityStream KUidSecurityStream8
-#endif
 
 const TUid KUidFileEmbeddedApplicationInterfaceUid={0x101f8c96};
 
-#endif
+#endif	// __APADEF_H__