--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataform.cpp	Fri Jun 04 10:19:18 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataform.cpp	Wed Jun 23 18:12:20 2010 +0300
@@ -30,7 +30,7 @@
 HbDataForm::HbDataForm( 
         HbDataFormPrivate & /*dd*/,
         HbAbstractItemContainer * /*container*/,
-        QGraphicsItem * parent ) : HbAbstractItemView( *temp, temp2, parent)
+        QGraphicsItem * parent ) : HbAbstractItemView( *temp, temp2, 0, parent)
     {
     
     }
@@ -81,39 +81,6 @@
     //    ScrollHint, hint )
     }
 
-
-// -----------------------------------------------------------------------------
-// HbDataForm::indexCount
-// -----------------------------------------------------------------------------
-//
-int HbDataForm::indexCount(  ) const
-    {
-    SMC_MOCK_METHOD0( int )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbDataForm::nextIndex
-// -----------------------------------------------------------------------------
-//
-QModelIndex HbDataForm::nextIndex( 
-        const QModelIndex & index ) const
-    {
-//    SMC_MOCK_METHOD1( QModelIndex, const QModelIndex &, index )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbDataForm::previousIndex
-// -----------------------------------------------------------------------------
-//
-QModelIndex HbDataForm::previousIndex( 
-        const QModelIndex & index ) const
-    {
-//    SMC_MOCK_METHOD1( QModelIndex, const QModelIndex &, index )
-    }
-
-
 // -----------------------------------------------------------------------------
 // HbDataForm::setExpanded
 // -----------------------------------------------------------------------------
@@ -192,17 +159,6 @@
 
 
 // -----------------------------------------------------------------------------
-// HbDataForm::dataFormViewItem
-// -----------------------------------------------------------------------------
-//
-HbDataFormViewItem * HbDataForm::dataFormViewItem( 
-        const QModelIndex & index ) const
-    {
-  //  SMC_MOCK_METHOD1( HbDataFormViewItem *, const QModelIndex &, index )
-    }
-
-
-// -----------------------------------------------------------------------------
 // HbDataForm::setModel
 // -----------------------------------------------------------------------------
 //
@@ -271,26 +227,6 @@
 
 
 // -----------------------------------------------------------------------------
-// HbDataForm::loadSettings
-// -----------------------------------------------------------------------------
-//
-void HbDataForm::loadSettings(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbDataForm::storeSettings
-// -----------------------------------------------------------------------------
-//
-void HbDataForm::storeSettings(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
 // HbDataForm::itemShown
 // -----------------------------------------------------------------------------
 //