--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contacts_plat/contacts_ui_api/inc/cntcenrepkeys.h	Thu May 27 12:45:19 2010 +0300
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * 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".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef CNTCENREPKEYS_H
+#define CNTCENREPKEYS_H
+
+#include <e32def.h>
+
+const TUid KCRUiContacts = {0x2002FF54};
+
+const TUint32 KNameOrdering = 0x00000001;
+
+#endif // CNTCENREPKEYS_H

--- a/contacts_plat/contacts_ui_api/inc/cntviewparams.h	Fri May 14 15:42:23 2010 +0300
+++ b/contacts_plat/contacts_ui_api/inc/cntviewparams.h	Thu May 27 12:45:19 2010 +0300
@@ -74,6 +74,7 @@
     groupActionsView,
     historyView,
     importsView,
+    settingsView,
     customPhonebookView = 100, // reserved for internal view plugins, DO NOT USE THESE
     customView = 200 // for all other view plugins
 };

--- a/contacts_plat/contacts_ui_extensions_api/inc/cnteditviewitem.h	Fri May 14 15:42:23 2010 +0300
+++ b/contacts_plat/contacts_ui_extensions_api/inc/cnteditviewitem.h	Thu May 27 12:45:19 2010 +0300
@@ -22,6 +22,7 @@
 #include <QVariant>
 #include <QPointF>
 #include <hbnamespace.h>
+#include <cnteditviewitemcallback.h>
 
 // Value enum for EditViewItemRole::ERoleItemType
 enum EditViewItemType
@@ -52,22 +53,29 @@
      * Returns data for a given role.
      * ETypeUiExtension must be returned for ERoleItemType
      *
+     * Other supported roles and restrictions:
+     * Qt::DisplayRole -> QStringList with 1-2 QStrings
+     * Qt::DecorationRole -> 0-1 HbIcon
+     *
      * @param int, role
      * @return QVariant, data for the given role
-     */   
+     */
     virtual QVariant data(int role) const = 0;
 
     /**
      * Called when this item is activated (tapped) in the list.
+     *
+     * @param CntEditViewItemCallback*, callback interface for possible view switching and list refreshing requests, ownership NOT given
      */   
-    virtual void activated() = 0;
+    virtual void activated(CntEditViewItemCallback* interface) = 0;
 
     /**
      * Called when this item is longpressed in the list.
      *
      * @param QPointF&, coordinates from where the longpress was initiated
+     * @param CntEditViewItemCallback*, callback interface for possible view switching and list refreshing requests, ownership NOT given
      */   
-    virtual void longPressed(const QPointF& coords) = 0;
+    virtual void longPressed(const QPointF& coords, CntEditViewItemCallback* interface) = 0;
 };
 
 #endif // CNTEDITVIEWITEM_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contacts_plat/contacts_ui_extensions_api/inc/cnteditviewitemcallback.h	Thu May 27 12:45:19 2010 +0300
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * 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".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef CNTEDITVIEWITEMCALLBACK_H
+#define CNTEDITVIEWITEMCALLBACK_H
+
+#include <cntviewparams.h>
+
+/**
+ * Class for asynchronously handling action callbacks from cnteditviewitems
+ */
+class CntEditViewItemCallback
+{
+public:
+
+    /**
+     * Handles the possibly needed view switching callbacks from CntEditViewItem::activated(...)
+     * and longPressed(...)
+     *
+     * @param CntViewParameters&, callback for view switching
+     */
+    virtual void openView(CntViewParameters& viewParams) = 0;
+
+    /**
+     * Handles the refresh requests from editviewitems
+     */
+    virtual void requestRefresh() = 0;
+
+protected:
+    // prevent deleting by client
+    virtual ~CntEditViewItemCallback() {}
+};
+
+#endif //CNTEDITVIEWITEMCALLBACK_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contacts_plat/contacts_ui_extensions_api/inc/cntextensiongroupcallback.h	Thu May 27 12:45:19 2010 +0300
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * 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".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef CNTEXTENSIONGROUPCALLBACK_H
+#define CNTEXTENSIONGROUPCALLBACK_H
+
+#include <cntviewparams.h>
+
+/**
+ * Class for asynchronously handling action callbacks from cntuiextensiongroup longPressed method
+ */
+class CntExtensionGroupCallback
+{
+public:
+
+    /**
+     * Handles the view switching callback from CntUiExtensionGroup::longPressed(...)
+     *
+     * @param CntViewParameters&, callback for view switching
+     */
+    virtual void openView(CntViewParameters& viewParams) = 0;
+
+protected:
+    // prevent deleting by client
+    virtual ~CntExtensionGroupCallback() {}
+};
+
+#endif //CNTEXTENSIONGROUPCALLBACK_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contacts_plat/contacts_ui_extensions_api/inc/cntuiactionextension.h	Thu May 27 12:45:19 2010 +0300
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * 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".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Tags for contact card UI control. Use these in mobility plugin metaData() to specify 
+ *              which action details UI should show.
+ *
+ */
+
+#ifndef CNTUIEXTENSIONGROUP_H
+#define CNTUIEXTENSIONGROUP_H
+
+/*
+ * Tags for QContactAction metaData call. Tags describe which UI element they are affecting to.
+ * Action can be visualised with UI item that has three customised areas: icon, title text and value text.
+ * Icon reserves small space from left edge of item, title text fills top part of free space from item and 
+ * value text fills lower part of free space from item.
+ * 
+ * You can create generic contact or my card action(detail independent) by checking if
+ * QContactDetail in isDetailSupported is null. These items are created only once for view.
+ * You cannot use KCntUiActionMetaTitleTextDetail or KCntUiActionMetaValueTextDetail with this
+ * action UI item, since it's detail independent.
+ * 
+ * If you want to create action only to "My card" view, you have to create QContactManager instance and
+ * and compare its "cm->selfContactId()" to local id of QContact parameter in isDetailSupported 
+ * (contact.localId()). You cannot use KCntUiActionMetaTitleTextDetail or KCntUiActionMetaValueTextDetail
+ * with this action UI item, since it's detail independent.
+ */
+
+// Default Symbian database, use this as uri parameter for QContactManager::fromUri.
+const QString SYMBIAN_BACKEND = "qtcontacts:symbian:";
+
+// First line in UI item
+// This tag is used to specify localized freetext(QString) description for action, eg. "Send message". This
+// or KCntUiActionMetaTitleTextDetail tag must be specified if UI should show action. If both set
+// this is used.
+const QString KCntUiActionMetaTitleText = "titleText";
+
+// First line in UI item
+// This tag is used to specify data field to be shown from detail, eg. QContactPhoneNumber::FieldNumber. 
+// This or KCntUiActionMetaTitleText tag must be specified if UI should show action. If both set
+// KCntUiActionMetaTitleText is used.
+// Note: Does not work with general contact actions(isDetailSupported has empty detail parameter)
+const QString KCntUiActionMetaTitleTextDetail = "titleTextDetail";
+
+
+// Second line in UI item
+// This tag is used to specify which field to show from detail in UI, eg. QContactPhoneNumber::FieldNumber.
+// UI can show either this or KCntUiActionMetaValueText tag. If both set this is used.
+// Note: Does not work with general contact actions(isDetailSupported has empty detail parameter)
+const QString KCntUiActionMetaValueTextDetail = "valueTextDetail";
+
+// Second line in UI item
+// This tag can be used to specify localized freetext(QString) to UI.
+// UI can show either this or KCntUiActionMetaValueTextDetail tag. If both set KCntUiActionMetaValueTextDetail
+// is used.
+const QString KCntUiActionMetaValueText = "valueText";
+
+// Text for long press menu in UI
+// This tag can be used to specify localized freetext(QString) to UI.
+const QString KCntUiActionMetaValueTextLongPress = "longPressText";
+
+
+// This tag is used to specify custom icon for action
+// Icon must be QIcon.
+// TODO Supported icon dimension?
+const QString KCntUiActionMetaIcon = "icon";
+
+#endif

--- a/contacts_plat/contacts_ui_extensions_api/inc/cntuiextensionfactory.h	Fri May 14 15:42:23 2010 +0300
+++ b/contacts_plat/contacts_ui_extensions_api/inc/cntuiextensionfactory.h	Thu May 27 12:45:19 2010 +0300
@@ -47,6 +47,8 @@
  * A factory which gives access to UI extension interfaces.
  * The plugin can extend the needed extensions and return null for the
  * unsupported extension types.
+ *
+ * Plugins must be exported to /resource/qt/plugins/contacts/extensions
  */
 class CntUiExtensionFactory
 {
@@ -54,12 +56,6 @@
     virtual ~CntUiExtensionFactory() {}
 
     /**
-     * Gives access to an interface for extending UI action buttons.
-     * @return Returns null if not supported. Ownership is not given.
-     */
-    virtual CntContactCardActionSupplier* contactCardActionSupplier() = 0;
-
-    /**
      * Gives access to an interface for extending UI with new groups.
      * @return Returns null if not supported. Ownership is not given.
      */

--- a/contacts_plat/contacts_ui_extensions_api/inc/cntuiextensiongroup.h	Fri May 14 15:42:23 2010 +0300
+++ b/contacts_plat/contacts_ui_extensions_api/inc/cntuiextensiongroup.h	Thu May 27 12:45:19 2010 +0300
@@ -20,11 +20,21 @@
 
 #include <QObject>
 #include <cntviewparams.h>
+#include <cntextensiongroupcallback.h>
 
 class QPointF;
 
 /**
  * Handle to specific group provided by the group supplier
+ *
+ * Example usage for CntViewParameters callbacks:
+ *
+ * MyExtensionGroup::activated(CntViewParameters& callBack) const {
+ *     callBack.insert(EViewId, customView); <- when item is tapped, it opens the view specified here
+ *     callBack.insert(ECustomParam, myCustomParam); <- custom parameters can also be used if needed
+ * }
+ * 
+ * see cntviewparams.h for more information on view parameters
  */
 class CntUiExtensionGroup
 {
@@ -80,19 +90,21 @@
     virtual int serviceId() const = 0;
 
     /**
-     * Called when this item is activated (tapped) in the list.
+     * Called when this item is activated (tapped) in the list. The callback is handled 
+     * synchronously and therefore it is assumed that this should be used for
+     * opening a new view.
      *
      * @param CntViewParameters&, callback for view switching
      */   
-    virtual void activated(CntViewParameters& callBack) const = 0;
+    virtual void activated(CntViewParameters& callBack) = 0;
 
     /**
      * Called when this item is longpressed in the list.
      *
      * @param QPointF&, coordinates from where the longpress was initiated
-     * @param CntViewParameters&, callback for view switching
+     * @param CntExtensionGroupCallback*, callback interface for view switching, ownership NOT given
      */   
-    virtual void longPressed(const QPointF& coords, CntViewParameters &callBack) const = 0;
+    virtual void longPressed(const QPointF& coords, CntExtensionGroupCallback *interface) = 0;
 
     virtual void* GroupExtension(
             int /*aExtensionId*/ )

--- a/contacts_plat/contacts_ui_extensions_api/inc/cntuigroupsupplier.h	Fri May 14 15:42:23 2010 +0300
+++ b/contacts_plat/contacts_ui_extensions_api/inc/cntuigroupsupplier.h	Thu May 27 12:45:19 2010 +0300
@@ -42,7 +42,7 @@
      * @param int, group index 
      * @return CntUiExtensionGroup&, group handle
      */      
-    virtual const CntUiExtensionGroup& groupAt( int aIndex ) const = 0;
+    virtual CntUiExtensionGroup& groupAt( int aIndex ) const = 0;
 
     virtual void* GroupSupplierExtension(
             int /*aExtensionId*/ )

--- a/layers.sysdef.xml	Fri May 14 15:42:23 2010 +0300
+++ b/layers.sysdef.xml	Thu May 27 12:45:19 2010 +0300
@@ -9,6 +9,9 @@
     
       <module name="contacts">
         <unit unitID="contacts" bldFile="&layer_real_source_path;" name="contacts" mrp="" proFile="contacts.pro"/>
+        <unit unitID="phonebooksync" bldFile="&layer_real_source_path;/pimprotocols/phonebooksync/group" name="phonebooksync" mrp=""/>
+        <unit unitID="pbap" bldFile="&layer_real_source_path;/pimprotocols/pbap/group" name="pbap" mrp=""/>
+        <unit unitID="mtpcontactdp" bldFile="&layer_real_source_path;/pimprotocols/mtpcontactdp/group" name="mtpcontactdp" mrp="" filter="!sf_build"/>
       </module>
       
     </layer>

--- a/phonebookengines/CntSortPlugin/src/CCntSortPlugin.h	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/CntSortPlugin/src/CCntSortPlugin.h	Thu May 27 12:45:19 2010 +0300
@@ -22,6 +22,9 @@
 
 // INCLUDES
 #include <cntviewsortplugin.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif 
 
 // FORWARD DECLARATIONS
 class CSortUtil;

--- a/phonebookengines/bwins/mobcntmodelu.def	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/bwins/mobcntmodelu.def	Thu May 27 12:45:19 2010 +0300
@@ -12,26 +12,26 @@
 	?updateContactIdsArray@MobCntModel@@AAEXXZ @ 11 NONAME ; void MobCntModel::updateContactIdsArray(void)
 	?doConstruct@MobCntModel@@AAEHXZ @ 12 NONAME ; int MobCntModel::doConstruct(void)
 	?tr@MobCntModel@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString MobCntModel::tr(char const *, char const *, int)
-	?data@MobCntModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 14 NONAME ; class QVariant MobCntModel::data(class QModelIndex const &, int) const
-	?trUtf8@MobCntModel@@SA?AVQString@@PBD0H@Z @ 15 NONAME ; class QString MobCntModel::trUtf8(char const *, char const *, int)
-	?validRowId@MobCntModel@@ABE_NH@Z @ 16 NONAME ; bool MobCntModel::validRowId(int) const
-	??_EMobCntModel@@UAE@I@Z @ 17 NONAME ; MobCntModel::~MobCntModel(unsigned int)
-	?rowCount@MobCntModel@@UBEHABVQModelIndex@@@Z @ 18 NONAME ; int MobCntModel::rowCount(class QModelIndex const &) const
-	?contact@MobCntModel@@ABE?AVQContact@QtMobility@@H@Z @ 19 NONAME ; class QtMobility::QContact MobCntModel::contact(int) const
-	?tr@MobCntModel@@SA?AVQString@@PBD0@Z @ 20 NONAME ; class QString MobCntModel::tr(char const *, char const *)
-	??0MobCntModel@@QAE@PAVQContactManager@QtMobility@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@_NPAVQObject@@@Z @ 21 NONAME ; MobCntModel::MobCntModel(class QtMobility::QContactManager *, class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, bool, class QObject *)
-	?dataForDisplayRole@MobCntModel@@ABE?AVQVariant@@H@Z @ 22 NONAME ; class QVariant MobCntModel::dataForDisplayRole(int) const
-	?qt_metacall@MobCntModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 23 NONAME ; int MobCntModel::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?handleRemoved@MobCntModel@@IAEXABV?$QList@I@@@Z @ 24 NONAME ; void MobCntModel::handleRemoved(class QList<unsigned int> const &)
-	?myCardStatus@MobCntModel@@QBE_NXZ @ 25 NONAME ; bool MobCntModel::myCardStatus(void) const
-	?qt_metacast@MobCntModel@@UAEPAXPBD@Z @ 26 NONAME ; void * MobCntModel::qt_metacast(char const *)
-	?setFilterAndSortOrder@MobCntModel@@QAEXABVQContactFilter@QtMobility@@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 27 NONAME ; void MobCntModel::setFilterAndSortOrder(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &)
-	?staticMetaObject@MobCntModel@@2UQMetaObject@@B @ 28 NONAME ; struct QMetaObject const MobCntModel::staticMetaObject
-	?handleAdded@MobCntModel@@IAEXABV?$QList@I@@@Z @ 29 NONAME ; void MobCntModel::handleAdded(class QList<unsigned int> const &)
-	?handleChanged@MobCntModel@@IAEXABV?$QList@I@@@Z @ 30 NONAME ; void MobCntModel::handleChanged(class QList<unsigned int> const &)
-	?indexOfContact@MobCntModel@@QBE?AVQModelIndex@@ABVQContact@QtMobility@@@Z @ 31 NONAME ; class QModelIndex MobCntModel::indexOfContact(class QtMobility::QContact const &) const
-	?findIndexes@MobCntModel@@AAE?AV?$QList@V?$QList@H@@@@ABV?$QList@I@@@Z @ 32 NONAME ; class QList<class QList<int> > MobCntModel::findIndexes(class QList<unsigned int> const &)
-	?contactManager@MobCntModel@@QBEAAVQContactManager@QtMobility@@XZ @ 33 NONAME ; class QtMobility::QContactManager & MobCntModel::contactManager(void) const
-	?updateContactIcon@MobCntModel@@QAEXH@Z @ 34 NONAME ; void MobCntModel::updateContactIcon(int)
-	?myCardId@MobCntModel@@QBEIXZ @ 35 NONAME ; unsigned int MobCntModel::myCardId(void) const
+	?handleContactInfoUpdated@MobCntModel@@IAEXI@Z @ 14 NONAME ; void MobCntModel::handleContactInfoUpdated(unsigned int)
+	?data@MobCntModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 15 NONAME ; class QVariant MobCntModel::data(class QModelIndex const &, int) const
+	?trUtf8@MobCntModel@@SA?AVQString@@PBD0H@Z @ 16 NONAME ; class QString MobCntModel::trUtf8(char const *, char const *, int)
+	?validRowId@MobCntModel@@ABE_NH@Z @ 17 NONAME ; bool MobCntModel::validRowId(int) const
+	?myCardId@MobCntModel@@QBEIXZ @ 18 NONAME ; unsigned int MobCntModel::myCardId(void) const
+	??_EMobCntModel@@UAE@I@Z @ 19 NONAME ; MobCntModel::~MobCntModel(unsigned int)
+	?rowCount@MobCntModel@@UBEHABVQModelIndex@@@Z @ 20 NONAME ; int MobCntModel::rowCount(class QModelIndex const &) const
+	?contact@MobCntModel@@ABE?AVQContact@QtMobility@@H@Z @ 21 NONAME ; class QtMobility::QContact MobCntModel::contact(int) const
+	?tr@MobCntModel@@SA?AVQString@@PBD0@Z @ 22 NONAME ; class QString MobCntModel::tr(char const *, char const *)
+	??0MobCntModel@@QAE@PAVQContactManager@QtMobility@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@_NPAVQObject@@@Z @ 23 NONAME ; MobCntModel::MobCntModel(class QtMobility::QContactManager *, class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, bool, class QObject *)
+	?dataForDisplayRole@MobCntModel@@ABE?AVQVariant@@H@Z @ 24 NONAME ; class QVariant MobCntModel::dataForDisplayRole(int) const
+	?qt_metacall@MobCntModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 25 NONAME ; int MobCntModel::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?handleRemoved@MobCntModel@@IAEXABV?$QList@I@@@Z @ 26 NONAME ; void MobCntModel::handleRemoved(class QList<unsigned int> const &)
+	?myCardStatus@MobCntModel@@QBE_NXZ @ 27 NONAME ; bool MobCntModel::myCardStatus(void) const
+	?qt_metacast@MobCntModel@@UAEPAXPBD@Z @ 28 NONAME ; void * MobCntModel::qt_metacast(char const *)
+	?setFilterAndSortOrder@MobCntModel@@QAEXABVQContactFilter@QtMobility@@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 29 NONAME ; void MobCntModel::setFilterAndSortOrder(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &)
+	?staticMetaObject@MobCntModel@@2UQMetaObject@@B @ 30 NONAME ; struct QMetaObject const MobCntModel::staticMetaObject
+	?handleAdded@MobCntModel@@IAEXABV?$QList@I@@@Z @ 31 NONAME ; void MobCntModel::handleAdded(class QList<unsigned int> const &)
+	?handleChanged@MobCntModel@@IAEXABV?$QList@I@@@Z @ 32 NONAME ; void MobCntModel::handleChanged(class QList<unsigned int> const &)
+	?indexOfContact@MobCntModel@@QBE?AVQModelIndex@@ABVQContact@QtMobility@@@Z @ 33 NONAME ; class QModelIndex MobCntModel::indexOfContact(class QtMobility::QContact const &) const
+	?findIndexes@MobCntModel@@AAE?AV?$QList@V?$QList@H@@@@ABV?$QList@I@@@Z @ 34 NONAME ; class QList<class QList<int> > MobCntModel::findIndexes(class QList<unsigned int> const &)
+	?contactManager@MobCntModel@@QBEAAVQContactManager@QtMobility@@XZ @ 35 NONAME ; class QtMobility::QContactManager & MobCntModel::contactManager(void) const
 

--- a/phonebookengines/contactsmodel/cntdbdumper/group/dbsqldumper.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntdbdumper/group/dbsqldumper.mmp	Thu May 27 12:45:19 2010 +0300
@@ -24,7 +24,7 @@
 SOURCEPATH		../src
 
 
-systeminclude   	/EPOC32/INCLUDE 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 userinclude			../src ../../src ../../cntplsql/inc
 source 				dbsqldumper.CPP
 

--- a/phonebookengines/contactsmodel/cntmatchlog/group/cntmatchlog.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntmatchlog/group/cntmatchlog.mmp	Thu May 27 12:45:19 2010 +0300
@@ -29,8 +29,7 @@
 SOURCE				CntMatchLog.cpp
 
 USERINCLUDE			../inc
-SYSTEMINCLUDE		/epoc32/include 
-SYSTEMINCLUDE		/epoc32/include/ecom
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 START RESOURCE		../src/2000862D.rss
 	TARGET 				cntmatchlog.rsc

--- a/phonebookengines/contactsmodel/cntmodel/src/ccontactdatabase.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntmodel/src/ccontactdatabase.cpp	Thu May 27 12:45:19 2010 +0300
@@ -27,6 +27,16 @@
 #include "ccontactprivate.h"
 
 #include "clplproxyfactory.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntdb_internal.h"
+#include "cntsyncecom.h"
+
+const TInt KMajorVersion=1;
+
+const TInt KMinorVersion=0;
+
+const TInt KBuildNumber=40;
+#endif
 
 CContactDatabase::CContactDatabase():
 		iDbConnectionState(EDbConnectionNotReady),
@@ -4165,6 +4175,7 @@
 	iCntSvr->RemoveObserver(aChangeNotifier);
 	}
 	
+
 void CContactDatabase::CancelNotifyRequestL()
 	{
 	}

--- a/phonebookengines/contactsmodel/cntmodel/src/ccontactprivate.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntmodel/src/ccontactprivate.cpp	Thu May 27 12:45:19 2010 +0300
@@ -28,6 +28,10 @@
 #include "rcntmodel.h"
 #include "ccontactprivate.h"
 #include "cntviewprivate.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntdb_internal.h"
+#include "cntsyncecom.h"
+#endif
 
 
 const TInt KMaxItemsInTemplateCache = 8; // Maximum number of cached templates.

--- a/phonebookengines/contactsmodel/cntphone/cntphone.h	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntphone/cntphone.h	Thu May 27 12:45:19 2010 +0300
@@ -1,26 +1,26 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #ifndef __CNTPHONE_H__
 #define __CNTPHONE_H__
 
 #include <e32std.h>
 #include <cntdb.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntphonenumparser.h>
+#endif
 
 /**
  * Default implementation of a phone number parser

--- a/phonebookengines/contactsmodel/cntphone/cntphone.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntphone/cntphone.mmp	Thu May 27 12:45:19 2010 +0300
@@ -21,7 +21,7 @@
 target cntphone.dll
 
   targettype plugin
-  SYSTEMINCLUDE	/epoc32/include/ecom
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
   UID			0x10009D8D 0x102035FB
 
   start resource 102035FB.RSS
@@ -34,7 +34,6 @@
 sourcepath		.
 userinclude		../cntphone
 userinclude		../inc
-systeminclude   /epoc32/include
 source          cntphone.cpp
 library         euser.lib
 

--- a/phonebookengines/contactsmodel/cntplsql/inc/plplugins.h	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/inc/plplugins.h	Thu May 27 12:45:19 2010 +0300
@@ -30,6 +30,8 @@
 
 #include "persistencelayer.h"
 
+//Forward declarations
+class CContactPhoneNumberParser;
 
 /** 
 Base class for Contacts Model plugins.

--- a/phonebookengines/contactsmodel/cntplsql/src/clplcontactproperties.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/src/clplcontactproperties.cpp	Thu May 27 12:45:19 2010 +0300
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 /**
  @file
@@ -23,10 +20,14 @@
 */
 
 
-#include <barsc.h> // for resource reading.
+#include <barsc.h> // For resource reading.
 #include <bautils.h>
-#include <cntmodel.rsg> // for system template resources.
-#include <phbksync.h> // for kuidiccglobaladnphonebook.
+#include <cntmodel.rsg> // For System template resources.
+#include <phbksync.h> // For KUidIccGlobalAdnPhonebook.
+
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntsyncecom.h"
+#endif
 
 #include "persistencelayerimpl.h"
 #include "clplcontactproperties.h" 
@@ -52,7 +53,6 @@
 	delete iSyncDummy;
 	delete iSystemTemplate;
 	delete iGroupIdList;
-
 	}
 
 

--- a/phonebookengines/contactsmodel/cntplsql/src/clplproxyfactory.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/src/clplproxyfactory.cpp	Thu May 27 12:45:19 2010 +0300
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 /**
  @file
@@ -27,6 +24,11 @@
 #include "rcntmodel.h"
 #include <ecom/ecom.h>
 #include <cntsync.h>
+
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntsyncecom.h"
+#endif
+
 #include "cntviewprivate.h"
 
 

--- a/phonebookengines/contactsmodel/cntplsql/src/cplplugins.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/src/cplplugins.cpp	Thu May 27 12:45:19 2010 +0300
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 /**
  @file
@@ -22,9 +19,13 @@
  @released
 */
 
-
 #include "plplugins.h"
 #include "cntviewprivate.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntphonenumparser.h>
+#include "cntdb_internal.h"
+#include "cntsyncecom.h"
+#endif
 
 
 // The name of the test phone book sync plugin.  This plugin will be used in the

--- a/phonebookengines/contactsmodel/cntplsql/src/cpplcommaddrtable.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/src/cpplcommaddrtable.cpp	Thu May 27 12:45:19 2010 +0300
@@ -1,25 +1,25 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "pltables.h"
 #include "dbsqlconstants.h"
 #include "plplugins.h"
 #include <cntdb.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntphonenumparser.h>
+#endif
 
 /**
 @param aDatabase A handle to the database.

--- a/phonebookengines/contactsmodel/cntplsql/src/csqlitelocalview.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/src/csqlitelocalview.cpp	Thu May 27 12:45:19 2010 +0300
@@ -30,6 +30,9 @@
 #include "cviewcontactmanager.h"
 #include "cntstd.h"
 #include <phbksync.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif
 //uncomment to test
 //#define __PROFILE_SORT__
 
@@ -607,23 +610,23 @@
 #endif
 			iOutstandingEvents.AppendL(aEvent);
 			
-			// The view state is set to ENotReady when a recovery takes place, and also when the tables
-			// are closed, so set ready here.
-			if (iState == ENotReady && (aEvent.iType
-			        == EContactDbObserverEventRecover || aEvent.iType
-			        == EContactDbObserverEventTablesOpened))
-			    {
+            // The view state is set to ENotReady when a recovery takes place, and also when the tables
+            // are closed, so set ready here.
+            if (iState == ENotReady && (aEvent.iType
+                    == EContactDbObserverEventRecover || aEvent.iType
+                    == EContactDbObserverEventTablesOpened))
+                {
                 SetState(EReady);
-			    }
-			// view was Initializing (sorting) before recovery or compression started! 
-			if (iState == EInitializing && (aEvent.iType
-			        == EContactDbObserverEventRecover || aEvent.iType
-			        == EContactDbObserverEventCompress))
-			    {
+                }
+            // view was Initializing (sorting) before recovery or compression started!  
+            if (iState == EInitializing && (aEvent.iType
+                    == EContactDbObserverEventRecover || aEvent.iType
+                    == EContactDbObserverEventCompress))
+                {
                 // re-read database and sort
                 SafeResort();
-			    }
-			
+                }
+                
 			}		
 			
 			

--- a/phonebookengines/contactsmodel/cntplsql/src/cviewcontactmanager.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/src/cviewcontactmanager.cpp	Thu May 27 12:45:19 2010 +0300
@@ -1,20 +1,17 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 /**
  @file
@@ -27,6 +24,9 @@
 #include "cviewcontactmanager.h"
 
 #include <cntviewbase.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif
 
 const TInt KContactsArrayGranularity = 100;
 const TInt KUnsortedArrayGranularity = 16;

--- a/phonebookengines/contactsmodel/cntvcard/CNTVCARD.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntvcard/CNTVCARD.MMP	Thu May 27 12:45:19 2010 +0300
@@ -32,8 +32,9 @@
 
 userinclude     ../cntvcard ../src
 userinclude		../inc
+USERINCLUDE     ../../../../organizer/pimappsupport/vcardandvcal/inc
 
-APP_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 source cntvcardstd.cpp cntvcardconverter.cpp
 source cntvcardimport.cpp cntvcardexport.cpp

--- a/phonebookengines/contactsmodel/cntvcard/cntvcardconverter.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntvcard/cntvcardconverter.cpp	Thu May 27 12:45:19 2010 +0300
@@ -32,6 +32,10 @@
 #include <cntdef.h>
 #include <cntitem.h>
 
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntconvertercallback.h"
+#endif
+
 
 
 /** 
@@ -183,7 +187,7 @@
 		HandleAgentsInVCardL(aConverter, agentPropertyList, *mainItem, aDb, aOption, aIncAccessCount, aDecAccessCount, aContactItems, EFalse);
 		}
 	
-	if	(mainItem->CardFields().Count()) /// checks vcard is not empty
+	if	(mainItem->CardFields().Count()) // checks vcard is not empty
 		{
 		ModifyAccessCountL(*mainItem, aIncAccessCount, aDecAccessCount);
 		if	(aOption & ENullTemplateId)

--- a/phonebookengines/contactsmodel/cntvcard/cntvcardexport.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntvcard/cntvcardexport.cpp	Thu May 27 12:45:19 2010 +0300
@@ -1,20 +1,17 @@
-/*
-* 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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// 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 "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include <badesca.h>
 #include <vtoken.h>
@@ -23,6 +20,10 @@
 #include "cntvcardutils.h"
 #include <cntdef.h>
 #include <cntitem.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "vcard3.h"
+#include "cntdb_internal.h"
+#endif
 
 
 

--- a/phonebookengines/contactsmodel/cntvcard/cntvcardimport.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntvcard/cntvcardimport.cpp	Thu May 27 12:45:19 2010 +0300
@@ -1,20 +1,17 @@
-/*
-* 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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// 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 "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #include "cntvcardutils.h"
 
@@ -30,6 +27,7 @@
 #include <cntdef.h>
 #include <cntitem.h>
 
+
 // Constants
 const TInt KVCardImportAddressArrayGranularity = 4;
 const TInt KContactGivenName = 1;
@@ -45,6 +43,10 @@
 const TInt KContactPostcode = 5;
 const TInt KContactCountry = 6;
 
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+const TInt KContactMaxFieldNumber = 32;
+#endif
+
 /**
  * Delete name fields from a contact
  *
@@ -1439,7 +1441,7 @@
     		mapping=KUidContactFieldVCardMapNotRequired;
     		}
     	break;
-//////////////
+//
     default:	// aka case KVersitPropertyHBufCUid:
     	aStorageType=KStorageTypeText;
 		mapping = KUidContactFieldVCardMapUnknown; // Initialize to something sensible

--- a/phonebookengines/contactsmodel/cntview/Groupview.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntview/Groupview.cpp	Thu May 27 12:45:19 2010 +0300
@@ -19,6 +19,9 @@
 #include <cntview.h>
 #include "cntstd.h"
 #include <cntitem.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cnthint.h"
+#endif
 
 
 //#define CNTVIEW_API_PROFILING

--- a/phonebookengines/contactsmodel/cntview/LocalView.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntview/LocalView.cpp	Thu May 27 12:45:19 2010 +0300
@@ -24,6 +24,9 @@
 #include <cntviewsortplugin.h>
 #include "persistencelayer.h"
 #include "cviewiterator.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif
 //uncomment to test
 //#define __PROFILE_SORT__
 

--- a/phonebookengines/contactsmodel/cntview/RemoteView.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntview/RemoteView.cpp	Thu May 27 12:45:19 2010 +0300
@@ -19,6 +19,9 @@
 #include <cntviewbase.h>
 #include "cntviewprivate.h"
 #include <cntviewsortplugin.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif
 
 #include "ccntserver.h" //for kslot1 and kslot2
 #include "rcntmodel.h"

--- a/phonebookengines/contactsmodel/cntview/ViewBase.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntview/ViewBase.cpp	Thu May 27 12:45:19 2010 +0300
@@ -15,7 +15,8 @@
 *
 */
 
-#include "ecom/ecom.h"		// for recomsession
+// System includess
+#include "ecom/ecom.h"		// For REComSession
 #include <ecom/ecomresolverparams.h>
 
 // User includes
@@ -25,6 +26,9 @@
 #include "cviewcontactextension.h"
 #include <cntviewsortplugin.h>
 #include "cntviewprivate.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif
 
 extern void DebugLogViewNotification(const TDesC& aMethod, const TContactViewEvent& aEvent);
 

--- a/phonebookengines/contactsmodel/cntview/cntview.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntview/cntview.mmp	Thu May 27 12:45:19 2010 +0300
@@ -28,7 +28,7 @@
 userinclude     ../cntview	
 userinclude	../inc ../src
 
-APP_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 source		../cntview/ConcView.cpp
 source		../cntview/FilteredView.cpp

--- a/phonebookengines/contactsmodel/cntview/findview.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/cntview/findview.cpp	Thu May 27 12:45:19 2010 +0300
@@ -19,6 +19,9 @@
 #include <cntview.h>
 #include "cntstd.h"
 #include <cntviewsortplugin.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif
 
 //#define CNTVIEW_API_PROFILING
 // To see the diferences between class versions check the in source documentation of TContactViewEvent

--- a/phonebookengines/contactsmodel/group/CNTMODEL.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/group/CNTMODEL.MMP	Thu May 27 12:45:19 2010 +0300
@@ -22,11 +22,12 @@
 target          cntmodel.dll
 targettype      DLL
 
-APP_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 userinclude 	../inc
 userinclude 	../cntmodel/inc 
 userinclude 	../cntsrv/inc
+USERINCLUDE     ../cntplsql/inc
 userinclude    ../src			//for Panic code
 
 SOURCEPATH	.	

--- a/phonebookengines/contactsmodel/group/CNTMODEL.RSS	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/group/CNTMODEL.RSS	Thu May 27 12:45:19 2010 +0300
@@ -17,11 +17,15 @@
 */
 
 
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "../inc/cntdef_internal.hrh"
+#endif
 #include "cntmodel.rls"
 #include <cntdef.hrh> // as existing version, but see below
 #include <cntmodel.rh>
 
 
+
 //  
 // There are two ways of defining custom filterable fields.  The two methods cannot be mixed.
 //

--- a/phonebookengines/contactsmodel/group/CNTSRV.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/group/CNTSRV.MMP	Thu May 27 12:45:19 2010 +0300
@@ -31,9 +31,7 @@
 //MACRO __STATE_MACHINE_DEBUG__
 //MACRO __PROFILE_DEBUG__
 
-APP_LAYER_SYSTEMINCLUDE
-
-systeminclude /epoc32/include/connect 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 USERINCLUDE ../src
 USERINCLUDE ../cntmodel/inc // For CCntPackager.h

--- a/phonebookengines/contactsmodel/group/COMMON.INF	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/group/COMMON.INF	Thu May 27 12:45:19 2010 +0300
@@ -22,31 +22,36 @@
 */
 
 PRJ_EXPORTS
-../inc/CNTDEF.H /epoc32/include/cntdef.h
-../inc/CNTDB.H /epoc32/include/cntdb.h         
-../inc/CNTDBOBS.H /epoc32/include/cntdbobs.h      
-../inc/CNTFIELD.H /epoc32/include/cntfield.h      
-../inc/CNTFLDST.H /epoc32/include/cntfldst.h	
-../inc/CNTFILT.H /epoc32/include/cntfilt.h	
-../inc/CNTITEM.H /epoc32/include/cntitem.h       
-../inc/cntview.h
-../inc/cntviewbase.h
-../inc/cntsync.h
+../inc/CNTDEF.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntdef.h)
+../inc/CNTDB.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntdb.h)         
+../inc/CNTDBOBS.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntdbobs.h)      
+../inc/CNTFIELD.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntfield.h)      
+../inc/CNTFLDST.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntfldst.h)	
+../inc/CNTFILT.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntfilt.h)	
+../inc/CNTITEM.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntitem.h)       
+../inc/cntview.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntview.h)
+../inc/cntviewbase.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntviewbase.h)
+../inc/cntsync.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntsync.h)
 //Cntmodel Find configuration Implementation definition header.
-../inc/cntviewfindconfig.h	
-../inc/cntviewfindconfig.inl
+../inc/cntviewfindconfig.h	 SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(cntviewfindconfig.h)
+../inc/cntviewfindconfig.inl SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(cntviewfindconfig.inl)
 //CntModel Sort Plug-in implementation definition header
-../inc/cntviewsortplugin.h
+../inc/cntviewsortplugin.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntviewsortplugin.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/cntphonenumparser.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(cntphonenumparser.h)
+../inc/cntviewsortpluginbase.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(cntviewsortpluginbase.h)
+../inc/cntsyncecom.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(cntsyncecom.h)
+#endif
 
-../inc/CNTMODEL.RH /epoc32/include/cntmodel.rh
+../inc/CNTMODEL.RH SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(cntmodel.rh)
 ../inc/CNTDEF.HRH /epoc32/include/cntdef.hrh
 
  
 // VCard Converter Plugin
-../cntvcard/CNTVCARD.H /epoc32/include/cntvcard.h
+../cntvcard/CNTVCARD.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(cntvcard.h)
 
 // Default View Definition store
-../inc/cntviewstore.h
+../inc/cntviewstore.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(cntviewstore.h)
 
 // Documentation
 ../documentation/contacts_connectivityapi.doc	/epoc32/engdoc/cntmodel/contacts_connectivityapi.doc

--- a/phonebookengines/contactsmodel/group/cntview.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/group/cntview.mmp	Thu May 27 12:45:19 2010 +0300
@@ -29,6 +29,7 @@
 
 userinclude     ../cntview	
 userinclude	../inc ../src
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 APP_LAYER_SYSTEMINCLUDE
 

--- a/phonebookengines/contactsmodel/group/template.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/group/template.mmp	Thu May 27 12:45:19 2010 +0300
@@ -20,7 +20,7 @@
 TARGETTYPE	NONE
 
 USERINCLUDE   .
-SYSTEMINCLUDE /epoc32/include
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 START RESOURCE cntmodel.rss
 HEADERONLY

--- a/phonebookengines/contactsmodel/groupsql/cntplsql.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/groupsql/cntplsql.mmp	Thu May 27 12:45:19 2010 +0300
@@ -38,10 +38,12 @@
 SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore
 SYSTEMINCLUDE		/epoc32/include/mw/hb/hbinput
 
-USERINCLUDE	 		../src //for cntstd.h 
-USERINCLUDE	 		../cntsrv/inc //for persistencelayer.h
-USERINCLUDE	 		../cntplsql/inc 
-USERINCLUDE	 		../inc	//for ccontactprivate.h
+userinclude ../src //for cntstd.h 
+userinclude ../cntsrv/inc //for persistencelayer.h 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+userinclude 	../cntplsql/inc 
+userinclude 	../inc			//for ccontactprivate.h
 
 // Qt Macros
 MACRO		UNICODE
@@ -103,3 +105,5 @@
 EPOCALLOWDLLDATA
 STDCPP
 SMPSAFE
+
+

--- a/phonebookengines/contactsmodel/inc/CNTDB.H	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/CNTDB.H	Thu May 27 12:45:19 2010 +0300
@@ -1,20 +1,17 @@
-/*
-* 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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// 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 "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #ifndef __CNTDB_H__
 #define __CNTDB_H__
@@ -60,6 +57,10 @@
 class CDataBaseChangeObserver;
 class CContactConverter;
 
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+class CContactSynchroniser;
+#endif
+
 // Constants
 
 /** 
@@ -82,6 +83,8 @@
 */
 const TInt KMaxCustomFilterableFields=4;
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+
 /** @internalComponent */
 const TInt KMajorVersion=1;
 /** @internalComponent */
@@ -89,6 +92,7 @@
 /** @internalComponent */
 const TInt KBuildNumber=41;
 
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 //
 // Classes used for compact
@@ -135,7 +139,8 @@
 
 class CContactActiveBase : public CBase, public MContactUiActive
 /**
-@internalTechnology
+@publishedAll
+@released
 */
 	{
 public:
@@ -526,6 +531,7 @@
 	virtual void HandleSortEventL(TInt aContactsSorted, TInt aContactsTotal)=0;
 	};
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 class MConverterCallBack
 /**
 Interface class for providing Intra-Contact Properties during a PBAP specific contacts export.
@@ -540,13 +546,16 @@
 	*/
 	virtual	void AddIntraContactPropertiesL(const TContactItemId& aContactId, CArrayPtr<CParserProperty>* aPropertyList) = 0;
 };
+#else
+class MConverterCallBack;
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 enum TVCardVersion
 /**
 Specifies type of export of contact items.
 PBAP clients should use EPBAPVCard21 and EPBAPVCard30.
+@publishedAll
 @released
-@internalTechnology
 */
 	{
 	EVCardUDEF = -1,
@@ -733,6 +742,8 @@
 		for such use. */
 		EMultiThread
 		};
+		
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /**
 @internalComponent
 */
@@ -743,6 +754,7 @@
 		EUsesAllTables,
 		EIdentityTableNotUsed //Not used
 		};
+#endif
 public:
 	IMPORT_C static CContactDatabase* OpenL(TThreadAccess aAccess=ESingleThread);
 	IMPORT_C static CContactDatabase* OpenL(const TDesC& aFileName,TThreadAccess aAccess=ESingleThread);
@@ -996,7 +1008,7 @@
 public:
 	void CancelNotifyRequestL();
 	TBool IsICCSynchronisedL();
-	
+
 	void OpenDatabaseAsyncL(TRequestStatus& aStatus, const TDesC& aFileName = KNullDesC);
 	static void CleanupLastLockedContact(TAny *aDatabase);
 
@@ -1155,7 +1167,8 @@
 
 
 /** The UID of the default vCard converter implemented by an ECom plugin.
-@internalComponent
+@publishedAll
+@released
 */
 #define KUidEComCntVCardConverterDefaultImplementation  0x102035F9
 /** The UID of the default vCard converter plugin implementation. This
@@ -1165,24 +1178,34 @@
 */
 #define KUidVCardConvDefaultImpl 	KUidEComCntVCardConverterDefaultImplementation
 
-/** The UID of the vCard converter ECom plugin interface. */
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+
+/** The UID of the vCard converter ECom plugin interface. 
+@released
+@internalTechnology
+*/
 const TUid KUidEcomCntVCardConverterInterface = {0x102035F7};
 
-/** The UID of the phone number parser ECom plugin interface. */
+/** The UID of the phone number parser ECom plugin interface. 
+@released
+@internalTechnology
+*/
 const TUid KUidEcomCntPhoneNumberParserInterface = {0x102035FA};
 
 /** The UID of PBAP vCard Converter plugin Implementation.
+@internalTechnology
 @released
-@internalTechnology
 */
 #define KUidPBAPVCardConvImpl 0xA00015C1
 
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+
 class TPluginParameters
 /**
 Class used to pack the extra arguments required for a PBAP conveter,
 PBAP client provides these arguments using overloaded CContactDatabase::ExportSelectedContacts.
+@publishedAll
 @released
-@internalComponent
 */
 {
 public:
@@ -1225,8 +1248,7 @@
 /** Provides functionality to import and export vCards.
 One or more vCards can be imported from a read stream (the vCards are converted 
 into contact items and added to the database). Also, contact items can be exported as vCards.
-
-@publishedPartner
+@publishedAll
 @released
 */
 	{
@@ -1240,7 +1262,7 @@
 /**
 It provides Ecom Framework based facilities to resolve and load the appropriate implementations at run-time.
 The framework supplies a default resolver for selecting appropriate implementations.
-@publishedPartner
+@publishedAll
 @released
 */
 	{
@@ -1287,7 +1309,7 @@
 	REComSession::DestroyedImplementation(iDtor_ID_Key);
 	}
 
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 class CContactPhoneNumberParser : public CBase
 /** Provides functionality to extract the real phone number from a contact's phone number field.
 @publishedPartner
@@ -1329,7 +1351,7 @@
 	{
 	REComSession::DestroyedImplementation(iDtor_ID_Key);
 	}
-
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 inline TInt CContactDatabase::TemplateCount() const
 /** Gets the number of contact card templates that exist in the database.

--- a/phonebookengines/contactsmodel/inc/CNTFIELD.H	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/CNTFIELD.H	Thu May 27 12:45:19 2010 +0300
@@ -1,21 +1,19 @@
-/*
-* 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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Persistence layer exports
-*
-*/
-
+// 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 "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Persistence layer exports
+// 
+//
 
 
 
@@ -25,12 +23,14 @@
 #include <cntdef.h>
 
 
+
 /** Null field ID.
 @publishedAll
 @released
 */
 const TInt KNullFieldId=-1;
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /** @internalComponent */
 const TInt KIntContactHintIsPhone=0x02;
 /** @internalComponent */
@@ -91,7 +91,7 @@
 const TInt KHintIdMask = 0xFFC00000;
 
 #endif //_SYMBIAN_USE_SQLITE__
-
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 class RWriteStream;
 class RReadStream;
@@ -206,6 +206,9 @@
 	friend class CContactTables;
 	friend class RPplContactTable;
 	friend class CPackagerTests;
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+    class THint;
+#else
 	class THint
 	/**
 	@internalComponent
@@ -272,6 +275,7 @@
 		TInt iHintValue;
 
 		};
+#endif
 		
 public:
 	IMPORT_C static CContactItemField* NewLC();
@@ -434,7 +438,7 @@
 	/** Constructs the CContactItemFieldDef object, with an array granularity of 8. */
 		{};
 	};
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 class TContactFieldAtts
 /**
 @internalComponent
@@ -512,6 +516,7 @@
 inline TFieldHeader::TFieldHeader(TStreamId aId,TContactFieldAtts aAtts)
 	{ iStreamId=aId; iAtts=aAtts; }
 #endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 inline TBool CContactItemField::IsHidden() const
 /** Gets the value of the field's hidden attribute.
@@ -560,7 +565,7 @@
 
 @return ETrue if the field is deleted, otherwise EFalse.                            */
 	{ return iAttributes&EDeleted; }
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 inline void CContactItemField::THint::SetIsPhone()
 	{iHintValue|=KIntContactHintIsPhone;}
 inline void CContactItemField::THint::SetIsMsg()
@@ -625,7 +630,7 @@
 #endif //__SYMBIAN_CNTMODEL_USE_SQLITE__ 
 inline TBool CContactItemField::THint::Contains(const THint& aHint) const
 	{return (iHintValue&aHint.iHintValue);}
-
+#endif
 inline TBool CContactItemField::OverRidesLabel() const
 /** Tests whether the field's label (as set by SetLabel()) overrides the label 
 specified in the field's template.

--- a/phonebookengines/contactsmodel/inc/CNTITEM.H	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/CNTITEM.H	Thu May 27 12:45:19 2010 +0300
@@ -1,21 +1,19 @@
-/*
-* 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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Persistence layer exports
-*
-*/
-
+// 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 "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Persistence layer exports
+// 
+//
 
 #if !defined(__CNTITEM_H__)
 #define __CNTITEM_H__
@@ -46,10 +44,12 @@
 */
 #define KUidStringSeparator '-'
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /** Constant used by vCard import/export.
 @internalComponent
 */
 #define KContactMaxFieldNumber 32
+#endif
 
 class CContactItemField;
 class CContactItemViewDef;

--- a/phonebookengines/contactsmodel/inc/cntsync.h	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/cntsync.h	Thu May 27 12:45:19 2010 +0300
@@ -1,25 +1,21 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #ifndef __CNTSYNC_H__
 #define __CNTSYNC_H__
 
-
 #include <e32base.h>
 #include <cntdef.h>
 
@@ -32,12 +28,13 @@
 synchroniser API. The plug-in should have a second UID of 
 0x101F4A6E (KUidContactSynchroniserDll).
 
-@internalAll
+@publishedAll
 */
 	{
 public:
 	/**
-	@internalAll
+	@publishedAll
+	@released
 	*/
 	enum TValidateOperation
 		{
@@ -99,10 +96,11 @@
 private:
 	IMPORT_C virtual void MContactSynchroniser_Reserved_1();
 	};
-	
+
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 
 /** The UID for the default phone book synchroniser ECom plugin interface.
-@internalComponent
+@publishedPartner
 */
 const TUid KUidEcomCntPhBkSyncInterface = {0x102035FD};
 	
@@ -113,7 +111,7 @@
 It should be inherited by classes which implement the phonebook 
 synchroniser API in a platform secured environment. The ECom plug-in interface uid is 
 KUidEcomCntPhBkSyncInterface
-@internalAll
+@publishedPartner
 */
 	{
 public:
@@ -137,3 +135,5 @@
 	};
 
 #endif
+	
+#endif

--- a/phonebookengines/contactsmodel/inc/cntviewsortplugin.h	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/cntviewsortplugin.h	Thu May 27 12:45:19 2010 +0300
@@ -1,26 +1,23 @@
-/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
 
 #ifndef __CNTVIEWSORTPLUGIN_H__
 #define __CNTVIEWSORTPLUGIN_H__
 
 #include <e32base.h>
-#include "ecom/ecom.h"		// for recomsession
+#include "ecom/ecom.h"		// For REComSession
 #include <cntviewbase.h>
 
 
@@ -37,6 +34,7 @@
 */
 _LIT8(KViewSortPluginDefaultName, "/default");
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 
 //********************************************************************************************
 //
@@ -252,6 +250,6 @@
 	{
 	REComSession::DestroyedImplementation(iDtor_ID_Key);
 	}
-
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 #endif

--- a/phonebookengines/contactsmodel/src/CNTFIELD.CPP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/src/CNTFIELD.CPP	Thu May 27 12:45:19 2010 +0300
@@ -26,6 +26,11 @@
 #include <cntitem.h>
 #include <versit.h>
 #include "cntprof.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntfieldheader.h"
+#include "cnthint.h"
+#include "cntfield_internal.h"
+#endif
 
 //
 // class TContactFieldAtts
@@ -1845,8 +1850,72 @@
     {
     iHintValue |= ((aNumber << KHintAdditionalMaskShift) & KHintAdditionalMask);       
     }
-
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS	
+inline void CContactItemField::THint::SetIsPhone()
+	{iHintValue|=KIntContactHintIsPhone;}
+inline void CContactItemField::THint::SetIsMsg()
+	{iHintValue|=KIntContactHintIsMsg;}
+// turn off Pronunciation bit too?
+inline void CContactItemField::THint::SetIsCompanyName()
+	{iHintValue|=KIntContactHintIsCompanyName;}
+inline void CContactItemField::THint::SetIsFamilyName()
+	{iHintValue|=KIntContactHintIsFamilyName;}
+inline void CContactItemField::THint::SetIsGivenName()
+	{iHintValue|=KIntContactHintIsGivenName;}
+inline void CContactItemField::THint::SetIsCompanyNamePronunciation()
+	{iHintValue|=KIntContactHintIsCompanyName|KIntContactHintIsPronunciation;}
+inline void CContactItemField::THint::SetIsFamilyNamePronunciation()
+	{iHintValue|=KIntContactHintIsFamilyName|KIntContactHintIsPronunciation;}
+inline void CContactItemField::THint::SetIsGivenNamePronunciation()
+	{iHintValue|=KIntContactHintIsGivenName|KIntContactHintIsPronunciation;}
+inline void CContactItemField::THint::SetIsAddress()
+	{iHintValue|=KIntContactHintIsAddress;}
+inline void CContactItemField::THint::SetIsAdditionalName()
+	{iHintValue|=KIntContactHintIsAdditionalName;}
+inline void CContactItemField::THint::SetIsSuffixName()
+	{iHintValue|=KIntContactHintIsSuffixName;}
+inline void CContactItemField::THint::SetIsPrefixName()
+	{iHintValue|=KIntContactHintIsPrefixName;}
+inline void CContactItemField::THint::SetStorageIsInline()
+	{iHintValue|=KIntContactHintStorageInline;}
+inline void CContactItemField::THint::SetIsEmail()
+	{iHintValue|=KIntContactHintIsEmail;}
+inline TBool CContactItemField::THint::IsPhone() const
+	{return (iHintValue&KIntContactHintIsPhone);}
+inline TBool CContactItemField::THint::IsMsg() const
+	{return (iHintValue&KIntContactHintIsMsg);}
+inline TBool CContactItemField::THint::IsCompanyName() const
+	{return ((iHintValue&KIntContactHintIsCompanyNamePronunciation) == KIntContactHintIsCompanyName);}
+inline TBool CContactItemField::THint::IsFamilyName() const
+	{return ((iHintValue&KIntContactHintIsFamilyNamePronunciation)==KIntContactHintIsFamilyName);}
+inline TBool CContactItemField::THint::IsGivenName() const
+	{return ((iHintValue&KIntContactHintIsGivenNamePronunciation)==KIntContactHintIsGivenName);}
+inline TBool CContactItemField::THint::IsCompanyNamePronunciation() const
+	{return ((iHintValue&KIntContactHintIsCompanyNamePronunciation) == KIntContactHintIsCompanyNamePronunciation);}
+inline TBool CContactItemField::THint::IsFamilyNamePronunciation() const
+	{return ((iHintValue&KIntContactHintIsFamilyNamePronunciation)==KIntContactHintIsFamilyNamePronunciation);}
+inline TBool CContactItemField::THint::IsGivenNamePronunciation() const
+	{return ((iHintValue&KIntContactHintIsGivenNamePronunciation)==KIntContactHintIsGivenNamePronunciation);}
+inline TBool CContactItemField::THint::IsAddress() const
+	{return (iHintValue&KIntContactHintIsAddress);}
+inline TBool CContactItemField::THint::IsAdditionalName() const
+	{return (iHintValue&KIntContactHintIsAdditionalName);}
+inline TBool CContactItemField::THint::IsSuffixName() const
+	{return (iHintValue&KIntContactHintIsSuffixName);}
+inline TBool CContactItemField::THint::IsPrefixName() const
+	{return (iHintValue&KIntContactHintIsPrefixName);}
+inline TBool CContactItemField::THint::IsStorageInline() const
+	{return (iHintValue&KIntContactHintStorageInline);}
+inline TBool CContactItemField::THint::IsEmail() const
+	{return (iHintValue&KIntContactHintIsEmail);}
 	
+#ifndef __SYMBIAN_CNTMODEL_USE_SQLITE__	
+inline void CContactItemField::THint::SetHasAdditionalUids()
+	{iHintValue|=KHintAdditionalMask;}
+#endif //__SYMBIAN_CNTMODEL_USE_SQLITE__ 
+inline TBool CContactItemField::THint::Contains(const THint& aHint) const
+	{return (iHintValue&aHint.iHintValue);}
+#endif	
 //
 //	class TFieldHeader
 //

--- a/phonebookengines/contactsmodel/src/CNTITEM.CPP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/src/CNTITEM.CPP	Thu May 27 12:45:19 2010 +0300
@@ -27,6 +27,9 @@
 
 #include "cntstd.h"
 #include "cntprof.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntfieldheader.h"
+#endif
 
 
 EXPORT_C CContactItemFieldSet* CContactItemFieldSet::NewL()

--- a/phonebookengines/contactsmodel/tsrc/CNTTUTIL.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/CNTTUTIL.MMP	Thu May 27 12:45:19 2010 +0300
@@ -30,7 +30,7 @@
 
 SOURCEPATH	../tsrc
 
-systeminclude /epoc32/include 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 userinclude ../inc 
 
 userinclude ../cntsrv/inc 

--- a/phonebookengines/contactsmodel/tsrc/Integration/CntPerfTest/group/CntPerfTestServer.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/CntPerfTest/group/CntPerfTestServer.mmp	Thu May 27 12:45:19 2010 +0300
@@ -58,10 +58,9 @@
 USERINCLUDE   ../../../NbCntTestLib
 USERINCLUDE   ../../../../src  //cntmodel source
 USERINCLUDE   ../../../../cntsrv/inc
-userinclude ../inc 
-systeminclude /epoc32/include 
-systeminclude /epoc32/include/test 
-systeminclude /epoc32/include/connect 
+USERINCLUDE   ../inc
+USERINCLUDE   ../../../../inc 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 
 
 LIBRARY		euser.lib

--- a/phonebookengines/contactsmodel/tsrc/Integration/CntPerfTest/src/ContactUtilitiesCollection.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/CntPerfTest/src/ContactUtilitiesCollection.cpp	Thu May 27 12:45:19 2010 +0300
@@ -15,8 +15,10 @@
 *
 */
 
-
 #include "contactutilitiescollection.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntdb_internal.h"
+#endif
 
 /**
  * Destructor

--- a/phonebookengines/contactsmodel/tsrc/Integration/PerfFuncSuite/group/Te_PerformanceFunctionalitySuite2.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/PerfFuncSuite/group/Te_PerformanceFunctionalitySuite2.mmp	Thu May 27 12:45:19 2010 +0300
@@ -50,8 +50,7 @@
 USERINCLUDE   	../../../../cntmodel/inc //ccontactprivate.h
 USERINCLUDE  	../../CntPerfTest/inc
 
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 //Please add your system include under here. 
 

--- a/phonebookengines/contactsmodel/tsrc/Integration/TCntPolice/groupsql/TE_Cntsrv_API_Policing.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TCntPolice/groupsql/TE_Cntsrv_API_Policing.MMP	Thu May 27 12:45:19 2010 +0300
@@ -123,9 +123,9 @@
 
 
 USERINCLUDE   ../incsql
-USERINCLUDE   ../../../../cntsrv/inc\
+USERINCLUDE   ../../../../cntsrv/inc
 
-SYSTEMINCLUDE /epoc32/include /epoc32/include/test
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY       euser.lib 
 
 //For TEF 

--- a/phonebookengines/contactsmodel/tsrc/Integration/TestContactSuite/group/TestContactSuite.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestContactSuite/group/TestContactSuite.mmp	Thu May 27 12:45:19 2010 +0300
@@ -36,9 +36,7 @@
 USERINCLUDE		../../../../cntvcard
 USERINCLUDE		../../../../inc 
 
-systeminclude /epoc32/include 
-systeminclude /epoc32/include/test 
-systeminclude /epoc32/include/ecom 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 
 LIBRARY		euser.lib 
 LIBRARY		testexecutelogclient.lib

--- a/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/group/TestImpExvCardsuite.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/group/TestImpExvCardsuite.mmp	Thu May 27 12:45:19 2010 +0300
@@ -49,11 +49,9 @@
 
 USERINCLUDE		../../../../cntvcard
 USERINCLUDE		../inc
-userinclude 		../../../../inc 
+USERINCLUDE 	../../../../inc 
 
-systeminclude /epoc32/include 
-systeminclude /epoc32/include/test 
-systeminclude /epoc32/include/ecom 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 
 LIBRARY		euser.lib 
 LIBRARY		testexecutelogclient.lib

--- a/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/inc/ContactsPBAPExportUtilityClass.h	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/inc/ContactsPBAPExportUtilityClass.h	Thu May 27 12:45:19 2010 +0300
@@ -11,13 +11,13 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 * Utility class, which exports the contact items with PBAP version 2.1 or 3.0. Also implements AddIntraContactPropertiesL
+* 
 *
 */
 
 
-
  
 #ifndef __CONTACTSEXPORTUTILITYCLASS_H__
 #define __CONTACTSEXPORTUTILITYCLASS_H__
@@ -34,11 +34,14 @@
 #include <cntdef.h>
 #include <cntdef.hrh>
 #include <cntfield.h>
-#include <testexecutestepbase.h>
+#include <test/testexecutestepbase.h>
 
 // User includes
 #include "cntvcardutils.h"
 #include "testimpexvcardsuitedefs.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntconvertercallback.h"
+#endif
 
 class CContactsPBAPExportUtilityClass : public CBase, public MConverterCallBack
 	{
@@ -61,10 +64,10 @@
 		
 	};
 
-_LIT(KAddr1,								"6th Floor");
-_LIT(KAddr2,								"SJRi Park");
+_LIT(KAddr1,								"1st Floor");
+_LIT(KAddr2,								"Some Park");
 _LIT(KAddr3,								"Tower No.1");					
-_LIT(KEmailVal,								"divya@symbian.com");
+_LIT(KEmailVal,								"dtest@symbianfoundation.com");
 _LIT8(KPhotoVal,							"PHOTO");
 
 _LIT(KDATETIME,								"DateTime");

--- a/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/src/ContactsPBAPExportUtilityClass.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/src/ContactsPBAPExportUtilityClass.cpp	Thu May 27 12:45:19 2010 +0300
@@ -17,6 +17,9 @@
 
  
 #include "contactspbapexportutilityclass.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntdb_internal.h"
+#endif
 
 CContactsPBAPExportUtilityClass::~CContactsPBAPExportUtilityClass()
 /**

--- a/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/src/TestContactsPBAPExportPerformance.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/src/TestContactsPBAPExportPerformance.cpp	Thu May 27 12:45:19 2010 +0300
@@ -17,6 +17,9 @@
 
  
 #include "testcontactspbapexportperformance.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntdb_internal.h"
+#endif
 
 CTestContactsPBAPExportPerformance::~CTestContactsPBAPExportPerformance()
 /**

--- a/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/src/TestGenericImportStep.cpp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestImpExvCard/src/TestGenericImportStep.cpp	Thu May 27 12:45:19 2010 +0300
@@ -17,6 +17,9 @@
 
  
 #include "testgenericimportstep.h"
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include "cntdb_internal.h"
+#endif
 
 CTestGenericImportStep::~CTestGenericImportStep()
 /**

--- a/phonebookengines/contactsmodel/tsrc/Integration/TestStartUp/group/TestStartUp.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestStartUp/group/TestStartUp.mmp	Thu May 27 12:45:19 2010 +0300
@@ -22,8 +22,7 @@
 UID         0x1000007A 0x102797B0
 VENDORID 0x70000001
 
-SYSTEMINCLUDE   /epoc32/include
-SYSTEMINCLUDE   /epoc32/include/test
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../../../inc

--- a/phonebookengines/contactsmodel/tsrc/NbCntTestLib/NbCntTestLib.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/NbCntTestLib/NbCntTestLib.mmp	Thu May 27 12:45:19 2010 +0300
@@ -22,7 +22,7 @@
 UID		0x1000097a
 VENDORID 	0x70000001
 
-systeminclude   /epoc32/include
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 userinclude 	.
 
 SOURCEPATH	.

--- a/phonebookengines/contactsmodel/tsrc/T_AGENT.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_AGENT.mmp	Thu May 27 12:45:19 2010 +0300
@@ -24,7 +24,7 @@
 
 SOURCEPATH	../tsrc
 
-systeminclude   /epoc32/include
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 userinclude     ./  ../inc
 source          t_agent.cpp
 

--- a/phonebookengines/contactsmodel/tsrc/T_CARDTM.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_CARDTM.MMP	Thu May 27 12:45:19 2010 +0300
@@ -24,7 +24,7 @@
 
 SOURCEPATH	../tsrc
 
-systeminclude  /epoc32/include
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 userinclude 	 ../inc  
 

--- a/phonebookengines/contactsmodel/tsrc/T_CntDelete.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_CntDelete.MMP	Thu May 27 12:45:19 2010 +0300
@@ -24,7 +24,7 @@
 
 SOURCEPATH	.
 
-systeminclude /epoc32/include 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 userinclude ../inc 
 
 userinclude     ../tsrc

--- a/phonebookengines/contactsmodel/tsrc/T_Cnt_ViewSortProfiling.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_Cnt_ViewSortProfiling.mmp	Thu May 27 12:45:19 2010 +0300
@@ -23,7 +23,7 @@
 UID		0
 VENDORID 0x70000001
 SOURCEPATH	.
-systeminclude   /epoc32/include
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 userinclude	..
 source          T_Cnt_ViewSortProfiling.cpp
 source          t_utils2.cpp

--- a/phonebookengines/contactsmodel/tsrc/T_Concurrent.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_Concurrent.mmp	Thu May 27 12:45:19 2010 +0300
@@ -25,7 +25,7 @@
 SOURCE          T_Concurrent.cpp
 SOURCEPATH		../tsrc
 
-systeminclude /epoc32/include 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 userinclude ../inc 
 LIBRARY         euser.lib  cntmodel.lib cntview.lib efsrv.lib
 

--- a/phonebookengines/contactsmodel/tsrc/T_ContactViewEvents.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_ContactViewEvents.mmp	Thu May 27 12:45:19 2010 +0300
@@ -23,7 +23,7 @@
 UID		0
 VENDORID 0x70000001
 SOURCEPATH	.
-systeminclude   /epoc32/include
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 userinclude		..
 source          T_ContactViewEvents.cpp
 source          CContactViewEventQueue.cpp

--- a/phonebookengines/contactsmodel/tsrc/T_CustFilter.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_CustFilter.mmp	Thu May 27 12:45:19 2010 +0300
@@ -23,7 +23,7 @@
 VENDORID 0x70000001
 SOURCEPATH		../tsrc
 
-systeminclude /epoc32/include /epoc32/include/kernel 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 userinclude ../inc 
 
 source          T_CustFilter.cpp t_utils2.cpp

--- a/phonebookengines/contactsmodel/tsrc/T_DBASE.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_DBASE.MMP	Thu May 27 12:45:19 2010 +0300
@@ -25,7 +25,7 @@
 
 SOURCEPATH	../tsrc
 
-systeminclude /epoc32/include 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 userinclude ../inc 
 
 source          T_DBASE.CPP

--- a/phonebookengines/contactsmodel/tsrc/T_DBASE2.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_DBASE2.MMP	Thu May 27 12:45:19 2010 +0300
@@ -24,7 +24,7 @@
 
 SOURCEPATH	../tsrc
 
-systeminclude /epoc32/include 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 userinclude ../inc 
 
 source          T_DBASE2.CPP T_FIND.CPP CContactDbEventQueue.cpp

--- a/phonebookengines/contactsmodel/tsrc/T_DBFill.mmp	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_DBFill.mmp	Thu May 27 12:45:19 2010 +0300
@@ -24,7 +24,7 @@
 
 SOURCEPATH	../tsrc
 
-systeminclude /epoc32/include 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 userinclude ../inc 
 
 source          T_DBFill.cpp

--- a/phonebookengines/contactsmodel/tsrc/T_ERROR.MMP	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/T_ERROR.MMP	Thu May 27 12:45:19 2010 +0300
@@ -24,7 +24,7 @@
 
 SOURCEPATH	../tsrc
 
-systeminclude /epoc32/include 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
 userinclude ../inc 
 
 source          T_ERROR.CPP CContactDbEventQueue.cpp