--- a/ncdengine/engine/accesspointmanager/inc/catalogsaccesspointsettings.h	Tue Aug 31 15:21:33 2010 +0300
+++ b/ncdengine/engine/accesspointmanager/inc/catalogsaccesspointsettings.h	Wed Sep 01 12:22:02 2010 +0100
@@ -20,14 +20,7 @@
 #define C_CATALOGSACCESSPOINTSETTINGS_H
 
 #include <e32base.h>
-
-#ifdef _0
 #include <ApAccessPointItem.h>
-#endif
-
-#include <s32strm.h>
-
-
 #include <badesca.h>
 
 
@@ -39,7 +32,6 @@
     
     virtual ~CCatalogsAccessPointSettings();
     
-#ifdef _0
     void SetLongTextParameterL(const TApMember& aKey, const TDesC16& aValue);
     void SetText16ParameterL(const TApMember& aKey, const TDesC16& aValue);
     void SetText8ParameterL(const TApMember& aKey, const TDesC8& aValue);
@@ -62,7 +54,6 @@
         TInt aIndex, TApMember& aKey, TUint32& aValue) const;
     void BoolParameter(
         TInt aIndex, TApMember& aKey, TBool& aValue) const;
-#endif
     
 protected:
     CCatalogsAccessPointSettings();
@@ -71,13 +62,11 @@
     void InternalizeL(RReadStream& aStream);
 
 private:
-#ifdef _0
     RArray<TApMember> iLongTextMembers;
     RArray<TApMember> iText16Members;
     RArray<TApMember> iText8Members;
     RArray<TApMember> iUintMembers;
     RArray<TApMember> iBoolMembers;
-#endif
     
     CDesC16ArrayFlat* iLongTextData;
     CDesC16ArrayFlat* iText16Data;