diff -r aa99f2208aad -r b8d18c84f71c localisation/apparchitecture/inc/ApSidChecker.h
--- a/localisation/apparchitecture/inc/ApSidChecker.h	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/inc/ApSidChecker.h	Tue Aug 03 10:20:34 2010 +0100
@@ -1,7 +1,7 @@
 // Copyright (c) 2006-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,6 +11,7 @@
 // Contributors:
 //
 // Description:
+// apsidchecker.h
 //
 
 #ifndef __APSIDCHECKER_H__
@@ -20,61 +21,56 @@
 #include <e32hashtab.h>
 class TDriveUnit;
 
-class CAppSidChecker : public CBase
 /** Sid checker.
 
 This is a plugin interface for checking whether a Sid should be
 included in apparc server's list of registered applications.
 
-
 An instance of the CAppSidChecker is used to verify that an application
 may be included in application list.
 There should be one implementation of this
 interface for each application type (native, java midlet, ...)
 
-
-@internalAll */
+@publishedPartner */
+class CAppSidChecker : public CBase
 	{
 public:
 	// Wraps ECom object instantiation
-	static CAppSidChecker* CheckerForAppType(const TUid &aAppTypeUid);
+	static CAppSidChecker* CheckerForAppType(TUid aAppTypeUid);
 	IMPORT_C virtual ~CAppSidChecker();
-
 public:
 	IMPORT_C virtual TBool AppRegisteredAt(const TUid& aSid, TDriveUnit aDrive) = 0;
 	IMPORT_C virtual void SetRescanCallBackL(const TCallBack &aCallback);
-
-private:
+private: // Reserved. Do not override!
 	IMPORT_C virtual void reserved1();
 	IMPORT_C virtual void reserved2();
 	IMPORT_C virtual void reserved3();
-
 private:
 	/** ECOM identifier */
 	TUid iDtor_ID_Key;
-
-	TAny* iReserved1;
-	TAny* iReserved2;
-	TAny* iReserved3;
+	TInt iSpare[3];
 	};
 
-NONSHARABLE_CLASS(RSidCheckerMap) : public RHashMap<TUint,CAppSidChecker*>
-/** Sid checker map
-
-This Maps application type uids to Instances of the CAppSidChecker interface,
-loading them if neccessary.
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 
-@internalComponent */
-	{
-public:	
-	RSidCheckerMap( TCallBack aRescanCallBack );
-	
-	CAppSidChecker& FindSidCheckerL(TUid aAppType);
-	void Close(); //lint !e1511 Member hides non-virtual member
+/** Sid checker map
+ 
+ This Maps application type uids to Instances of the CAppSidChecker interface,
+ loading them if neccessary.
+ 
+ @internalComponent */
+ NONSHARABLE_CLASS(RSidCheckerMap) : public RHashMap<TUint,CAppSidChecker*>
+ 	{
+ public:	
+ 	RSidCheckerMap( TCallBack aRescanCallBack );
+ 	
+ 	CAppSidChecker& FindSidCheckerL(TUid aAppType);
+ 	void Close(); //lint !e1511 Member hides non-virtual member
+ private:
+ 	TCallBack iRescanCallBack;
+ 	};
 
-private:
-	TCallBack iRescanCallBack;
-	};
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
+#endif	// __APSIDCHECKER_H__
 
-#endif