--- a/phonebookengines/contactsmodel/cntview/ViewBase.cpp	Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookengines/contactsmodel/cntview/ViewBase.cpp	Fri Mar 19 09:27:18 2010 +0200
@@ -1,32 +1,30 @@
-// 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: 
+*
+*/
 
-// System includess
-#include "ecom/ecom.h"		// For REComSession
+#include "ecom/ecom.h"		// for recomsession
 #include <ecom/ecomresolverparams.h>
 
 // User includes
 #include <cntviewbase.h>
-#include "CNTSTD.H"
+#include "cntstd.h"
 #include <cntviewfindconfig.h>
-#include "CVIEWCONTACTEXTENSION.h"
+#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);
 
@@ -1541,7 +1539,6 @@
         }    
         
 	iContactType = aContact.iContactType;
-	SetContactTypeUid( aContact.ContactTypeUid() );
 	iExtension->HintBitField() = aContact.iExtension->HintBitField();
 	HBufC* fieldText = aContact.iExtension->FieldText().AllocL();
 	iExtension->SetFieldText(fieldText);
@@ -1799,9 +1796,4 @@
 		}
 	return error;
 	}
-	
-TInt CContactViewBase::GetErrorValueFromExtensionClass()
-	{
-	return iExtension->iError;
-	}