--- a/src/hbwidgets/widgets/hbcheckbox.cpp Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/widgets/hbcheckbox.cpp Wed Aug 18 10:05:37 2010 +0300
@@ -126,16 +126,16 @@
{
Q_Q( HbCheckBox );
if( !mTouchArea ) {
- mTouchArea = q->style( )->createPrimitive( HbStyle::P_CheckBox_toucharea, q );
+ mTouchArea = HbStylePrivate::createPrimitive( HbStylePrivate::P_CheckBox_toucharea, q );
if( QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>( mTouchArea ) ) {
ta->grabGesture( Qt::TapGesture );
}
}
if ( !mTextItem ) {
- mTextItem = q->style( )->createPrimitive( HbStyle::P_CheckBox_text, q );
+ mTextItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_CheckBox_text, q );
}
if ( !mIconItem ) {
- mIconItem = q->style( )->createPrimitive( HbStyle::P_CheckBox_icon, q );
+ mIconItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_CheckBox_icon, q );
}
}
@@ -253,7 +253,7 @@
if( d->mTextItem ){
HbStyleOptionCheckBox checkBoxOption;
initStyleOption( &checkBoxOption );
- style( )->updatePrimitive( d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption );
+ HbStylePrivate::updatePrimitive( d->mTextItem, HbStylePrivate::P_CheckBox_text, &checkBoxOption );
}
}
}
@@ -320,11 +320,11 @@
Q_D( const HbCheckBox );
switch ( primitive ) {
- case HbStyle::P_CheckBox_text:
+ case HbStylePrivate::P_CheckBox_text:
return d->mTextItem;
- case HbStyle::P_CheckBox_toucharea:
+ case HbStylePrivate::P_CheckBox_toucharea:
return d->mTouchArea;
- case HbStyle::P_CheckBox_icon:
+ case HbStylePrivate::P_CheckBox_icon:
return d->mIconItem;
default:
return 0;
@@ -369,13 +369,13 @@
initStyleOption( &checkBoxOption );
if ( d->mTextItem ) {
- style( )->updatePrimitive( d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption );
+ HbStylePrivate::updatePrimitive( d->mTextItem, HbStylePrivate::P_CheckBox_text, &checkBoxOption );
}
if ( d->mIconItem ) {
- style( )->updatePrimitive( d->mIconItem, HbStyle::P_CheckBox_icon, &checkBoxOption );
+ HbStylePrivate::updatePrimitive( d->mIconItem, HbStylePrivate::P_CheckBox_icon, &checkBoxOption );
}
if (d->mTouchArea) {
- style( )->updatePrimitive( d->mTouchArea, HbStyle::P_CheckBox_toucharea, &checkBoxOption );
+ HbStylePrivate::updatePrimitive( d->mTouchArea, HbStylePrivate::P_CheckBox_toucharea, &checkBoxOption );
}
}