--- 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