--- a/src/hbwidgets/sliders/hbvolumeslider_p.cpp Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/sliders/hbvolumeslider_p.cpp Wed Aug 18 10:05:37 2010 +0300
@@ -138,27 +138,27 @@
// and volume slider Icon is set in style
if ( !elementItemMap.contains(HbSlider::IncreaseElement) ) {
elementItemMap [HbSlider::IncreaseElement].item =
- q->style( )->createPrimitive( HbStyle::P_SliderElement_increase, q);
+ HbStylePrivate::createPrimitive( HbStylePrivate::P_SliderElement_increase, q);
HbStyle::setItemName( elementItemMap [HbSlider::IncreaseElement].item, "increment-icon" );
- elementItemMap[HbSlider::IncreaseElement].type = HbStyle::P_SliderElement_increase;
- elementItemMap [HbSlider::IncreaseElement].touchItem = q->style( )->createPrimitive( HbStyle::P_SliderElement_touchincrease, q );
+ elementItemMap[HbSlider::IncreaseElement].type = HbStylePrivate::P_SliderElement_increase;
+ elementItemMap [HbSlider::IncreaseElement].touchItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_SliderElement_touchincrease, q );
// create touch area for increment
HbStyle::setItemName( elementItemMap [HbSlider::IncreaseElement].touchItem, "increment-icon-toucharea" );
}
if ( !elementItemMap.contains(HbSlider::DecreaseElement) ) {
elementItemMap[HbSlider::DecreaseElement].item =
- q->style( )->createPrimitive( HbStyle::P_SliderElement_decrease, q );
- elementItemMap[HbSlider::DecreaseElement].type = HbStyle::P_SliderElement_decrease;
+ HbStylePrivate::createPrimitive( HbStylePrivate::P_SliderElement_decrease, q );
+ elementItemMap[HbSlider::DecreaseElement].type = HbStylePrivate::P_SliderElement_decrease;
HbStyle::setItemName( elementItemMap[HbSlider::DecreaseElement].item, "decrement-icon" );
// create touch area for decrement
- elementItemMap[HbSlider::DecreaseElement].touchItem = q->style( )->createPrimitive( HbStyle::P_SliderElement_touchdecrease, q ) ;
+ elementItemMap[HbSlider::DecreaseElement].touchItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_SliderElement_touchdecrease, q ) ;
HbStyle::setItemName( elementItemMap[HbSlider::DecreaseElement].touchItem, "decrement-icon-toucharea" );
}
if( !elementItemMap.contains(HbSlider::IconElement) ) {
- elementItemMap[HbSlider::IconElement].item = q->style( )->createPrimitive( HbStyle::P_SliderElement_icon,q );
- elementItemMap[HbSlider::IconElement].type = HbStyle::P_SliderElement_icon;
+ elementItemMap[HbSlider::IconElement].item = HbStylePrivate::createPrimitive( HbStylePrivate::P_SliderElement_icon,q );
+ elementItemMap[HbSlider::IconElement].type = HbStylePrivate::P_SliderElement_icon;
HbStyle::setItemName( elementItemMap[HbSlider::IconElement].item, "icon-icon" );
// creating a dummy button , because slider icon
// need to emit all signal which is emitted by button
@@ -181,11 +181,11 @@
HbStyleOptionSlider option;
q->initStyleOption( &option );
option.sliderElementIcon = icons.value( HbSlider::IncreaseElement );
- q->style( )->updatePrimitive( elementItemMap [HbSlider::IncreaseElement].item,HbStyle::P_SliderElement_increase,&option );
+ HbStylePrivate::updatePrimitive( elementItemMap [HbSlider::IncreaseElement].item,HbStylePrivate::P_SliderElement_increase,&option );
option.sliderElementIcon = icons.value( HbSlider::DecreaseElement );
- q->style( )->updatePrimitive( elementItemMap[HbSlider::DecreaseElement].item,HbStyle::P_SliderElement_decrease,&option );
+ HbStylePrivate::updatePrimitive( elementItemMap[HbSlider::DecreaseElement].item,HbStylePrivate::P_SliderElement_decrease,&option );
option.sliderElementIcon = icons.value( HbSlider::IconElement );
- q->style( )->updatePrimitive( elementItemMap[HbSlider::IconElement].item,elementItemMap[HbSlider::IconElement].type,&option );
+ HbStylePrivate::updatePrimitive( elementItemMap[HbSlider::IconElement].item,elementItemMap[HbSlider::IconElement].type,&option );
q->setIconCheckable( true );
q->setFlags( QGraphicsItem::ItemIsFocusable );
q->setProperty("changeincrementState" ,false);
@@ -244,7 +244,7 @@
option.state&= ~( QStyle::State_Sunken );
}
option.sliderElementIcon = icons.value( HbSlider::IconElement );
- q->style( )->updatePrimitive( elementItemMap[HbSlider::IconElement].item,HbStyle::P_SliderElement_icon,&option );
+ HbStylePrivate::updatePrimitive( elementItemMap[HbSlider::IconElement].item,HbStylePrivate::P_SliderElement_icon,&option );
q->setProperty("changeincrementState" ,false);
q->setProperty("changedecrementState" ,false);
q->setProperty("state", "normal");