--- a/bluetoothengine/btui/btcpplugin/btcpuibaseview.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btui/btcpplugin/btcpuibaseview.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -1,39 +1,45 @@
 /*
-* ============================================================================
-*  Name        : btcpuibaseclass.cpp
-*  Part of     : BluetoothUI / btapplication       *** Info from the SWAD
-*  Description : Implements the baseclass for all views in btapplication.
-*
-*  Copyright © 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:
-*  Nokia Corporation
-* ============================================================================
-* Template version: 4.1
-*/
+ * 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:  
+ *
+ */
 
 #include "btcpuibaseview.h"
 #include <hbaction.h>
 
 /*!
-    Constructor.
+    This constructor constructs new setting and device models.
+ */
+BtCpUiBaseView::BtCpUiBaseView(QGraphicsItem *parent )
+    :CpBaseSettingView( 0 , parent )
+{
+    mSettingModel = new BtSettingModel(this);
+    mDeviceModel = new BtDeviceModel(this);
+}
+
+/*!
+    This constructor constructs models from the given setting and device models.
+    This implies the model impl and data structure is shared.
  */
 BtCpUiBaseView::BtCpUiBaseView(
         BtSettingModel &settingModel, 
         BtDeviceModel &deviceModel, 
         QGraphicsItem *parent )
-    :CpBaseSettingView( 0 , parent ), 
-     mSettingModel( &settingModel ),
-     mDeviceModel( &deviceModel )
+    :CpBaseSettingView( 0 , parent )
 {
+    mSettingModel = new BtSettingModel(settingModel, this);
+    mDeviceModel = new BtDeviceModel(deviceModel, this);    
 }
 
 /*!