--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataform.cpp	Mon Oct 04 16:06:10 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbdataform.cpp	Fri Oct 15 12:58:46 2010 +0300
@@ -16,7 +16,11 @@
 */
 #include <QDebug>
 #include <smcmockclassincludes.h>
-#include "hbdataform.h"
+#include <hbdataform.h>
+
+#include <QAbstractItemModel>
+#include <HbAbstractViewItem>
+#include <HbDataFormModelItem>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -27,6 +31,13 @@
 HbAbstractItemViewPrivate* temp(NULL);
 HbAbstractItemContainer* temp2(NULL);
 
+HbDataForm::HbDataForm(
+        QGraphicsItem *parent)
+        :HbAbstractItemView(*temp, temp2, 0, parent)
+{
+
+}
+
 HbDataForm::HbDataForm( 
         HbDataFormPrivate & /*dd*/,
         HbAbstractItemContainer * /*container*/,
@@ -77,8 +88,8 @@
         const QModelIndex & index,
         ScrollHint hint )
     {
-  //  SMC_MOCK_METHOD2( void, const QModelIndex &, index, 
-    //    ScrollHint, hint )
+    SMC_MOCK_METHOD2( void, const QModelIndex &, index, 
+        ScrollHint, hint )
     }
 
 // -----------------------------------------------------------------------------
@@ -89,8 +100,8 @@
         const QModelIndex & index,
         bool expanded )
     {
- //   SMC_MOCK_METHOD2( void, const QModelIndex &, index, 
-   //     bool, expanded )
+    SMC_MOCK_METHOD2( void, const QModelIndex &, index, 
+        bool, expanded )
     }
 
 
@@ -101,7 +112,7 @@
 bool HbDataForm::isExpanded( 
         const QModelIndex & index ) const
     {
-  //  SMC_MOCK_METHOD1( bool, const QModelIndex &, index )
+    SMC_MOCK_METHOD1( bool, const QModelIndex &, index )
     }
 
 
@@ -154,7 +165,7 @@
 QGraphicsItem * HbDataForm::primitive( 
         HbStyle::Primitive primitive ) const
     {
- //   SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
+    SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
     }
 
 
@@ -166,8 +177,8 @@
         QAbstractItemModel * model,
         HbAbstractViewItem * prototype )
     {
-//    SMC_MOCK_METHOD2( void, QAbstractItemModel *, model, 
-  //      HbAbstractViewItem *, prototype )
+    SMC_MOCK_METHOD2( void, QAbstractItemModel *, model, 
+        HbAbstractViewItem *, prototype )
     }
 
 
@@ -181,11 +192,11 @@
         QObject * receiver,
         const char * slot )
     {
- /*   SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, 
+    SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, 
         const char *, signal, 
         QObject *, receiver, 
         const char *, slot )
-   */ }
+    }
 
 
 // -----------------------------------------------------------------------------
@@ -198,11 +209,11 @@
         QObject * receiver,
         const char * slot )
     {
- /*   SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, 
+    SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, 
         const char *, signal, 
         QObject *, receiver, 
         const char *, slot )
-   */ }
+    }
 
 
 // -----------------------------------------------------------------------------
@@ -222,7 +233,7 @@
 void HbDataForm::removeAllConnection( 
         HbDataFormModelItem * item )
     {
-//    SMC_MOCK_METHOD1( void, HbDataFormModelItem *, item )
+    SMC_MOCK_METHOD1( void, HbDataFormModelItem *, item )
     }
 
 
@@ -233,7 +244,7 @@
 void HbDataForm::itemShown( 
         const QModelIndex & index )
     {
-   // SMC_MOCK_METHOD1( void, const QModelIndex &, index )
+    SMC_MOCK_METHOD1( void, const QModelIndex &, index )
     }
 
 
@@ -246,9 +257,9 @@
         int start,
         int end )
     {
-//    SMC_MOCK_METHOD3( void, const QModelIndex &, parent, 
-  //      int, start, 
-    //    int, end )
+    SMC_MOCK_METHOD3( void, const QModelIndex &, parent, 
+        int, start, 
+        int, end )
     }
 
 
@@ -261,9 +272,9 @@
         int start,
         int end )
     {
-//    SMC_MOCK_METHOD3( void, const QModelIndex &, index, 
-  //      int, start, 
-    //    int, end )
+    SMC_MOCK_METHOD3( void, const QModelIndex &, index, 
+        int, start, 
+        int, end )
     }
 
 
@@ -275,8 +286,8 @@
         const QModelIndex & topLeft,
         const QModelIndex & bottomRight )
     {
-  //  SMC_MOCK_METHOD2( void, const QModelIndex &, topLeft, 
-    //    const QModelIndex &, bottomRight )
+    SMC_MOCK_METHOD2( void, const QModelIndex &, topLeft, 
+        const QModelIndex &, bottomRight )
     }
 
 
@@ -287,7 +298,7 @@
 void HbDataForm::initStyleOption( 
         HbStyleOptionDataForm * option )
     {
- //   SMC_MOCK_METHOD1( void, HbStyleOptionDataForm *, option )
+    //SMC_MOCK_METHOD1( void, HbStyleOptionDataForm *, option )
     }