diff -r 923ff622b8b9 -r 4633027730f5 src/hbwidgets/dataform/hbdataformviewitem_p.cpp
--- a/src/hbwidgets/dataform/hbdataformviewitem_p.cpp	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem_p.cpp	Wed Aug 18 10:05:37 2010 +0300
@@ -356,9 +356,9 @@
         mDialog->setDismissPolicy(HbPopup::NoDismiss);
         mDialog->setModal(true);
         mDialog->setContentWidget(mRadioButtonList);   
-        HbAction *ok = new HbAction(QString("Ok"));
+        HbAction *ok = new HbAction(hbTrId("txt_common_button_ok"));
         mDialog->addAction(ok);
-        HbAction *cancel = new HbAction(QString("Cancel"));
+        HbAction *cancel = new HbAction(hbTrId("txt_common_button_cancel"));
         connect(ok, SIGNAL(triggered()), mDialog,SLOT(accept()));
         mDialog->addAction(cancel);
         mDialog->connect(cancel, SIGNAL(triggered()), mDialog, SLOT(reject()));
@@ -707,13 +707,13 @@
     Q_Q( HbDataFormViewItem );
 
     if( !mBackgroundItem ) {
-        mBackgroundItem = q->style()->createPrimitive( HbStyle::P_DataItem_background, q );
+        mBackgroundItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_DataItem_background, q );
     }
     
 
     if( !mLabel.isEmpty() ) {
         if( !mLabelItem ) {
-            mLabelItem = q->style()->createPrimitive( HbStyle::P_DataItem_label, q );
+            mLabelItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_DataItem_label, q );
         }
     } else {
         if( mLabelItem ) {
@@ -727,7 +727,7 @@
     if( !mIcon.isEmpty() ) {
         q->setProperty( "hasIcon", true );
         if(!mIconItem) {
-            mIconItem = q->style()->createPrimitive( HbStyle::P_DataItem_icon, q );
+            mIconItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_DataItem_icon, q );
         }
     } else {
         q->setProperty( "hasIcon", false );
@@ -740,7 +740,7 @@
 
     if(!mDescription.isEmpty()) {
         if(!mDescriptionItem) {
-            mDescriptionItem = q->style()->createPrimitive(HbStyle::P_DataItem_description, q);
+            mDescriptionItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_DataItem_description, q);
         }
     } else {
         if( mDescriptionItem ) {
@@ -795,21 +795,21 @@
     q->initStyleOption(&options);
 
     if( mBackgroundItem ) {
-        q->style()->updatePrimitive(
-            mBackgroundItem, HbStyle::P_DataItem_background, &options );
+        HbStylePrivate::updatePrimitive(
+            mBackgroundItem, HbStylePrivate::P_DataItem_background, &options );
     }
 
     if( mLabelItem ) {
-        q->style()->updatePrimitive( mLabelItem, HbStyle::P_DataItem_label, &options );
+        HbStylePrivate::updatePrimitive( mLabelItem, HbStylePrivate::P_DataItem_label, &options );
     }
 
     if( mIconItem ) {
-        q->style()->updatePrimitive(
-            mIconItem, HbStyle::P_DataItem_icon, &options );
+        HbStylePrivate::updatePrimitive(
+            mIconItem, HbStylePrivate::P_DataItem_icon, &options );
     }
     
     if(mDescriptionItem) {
-        q->style()->updatePrimitive(mDescriptionItem, HbStyle::P_DataItem_description, &options);
+        HbStylePrivate::updatePrimitive(mDescriptionItem, HbStylePrivate::P_DataItem_description, &options);
     }
 }
 
@@ -927,11 +927,11 @@
                 HbSlider *slider = static_cast<HbSlider*>( mContentWidget );
                 if( enabled ) {
                     //grab pan gesture
-                    slider->primitive(HbStyle::P_SliderElement_touchgroove)->toGraphicsObject()->grabGesture(
+                    slider->primitive((HbStyle::Primitive)HbStylePrivate::P_SliderElement_touchgroove)->toGraphicsObject()->grabGesture(
                         Qt::PanGesture);
                 } else {
                     //ungrab pan gesture
-                    slider->primitive(HbStyle::P_SliderElement_touchgroove)->toGraphicsObject()->ungrabGesture(
+                    slider->primitive((HbStyle::Primitive)HbStylePrivate::P_SliderElement_touchgroove)->toGraphicsObject()->ungrabGesture(
                         Qt::PanGesture);
                 }
         }
@@ -1062,8 +1062,8 @@
     HbStyleOptionDataFormViewItem options;
     q->initStyleOption(&options);
     if( mBackgroundItem ) {
-        q->style()->updatePrimitive(
-            mBackgroundItem, HbStyle::P_DataItem_background, &options );
+        HbStylePrivate::updatePrimitive(
+            mBackgroundItem, HbStylePrivate::P_DataItem_background, &options );
     }
 
     //if ( mContentWidget ) {