FCL/sf/mw/hb: comparison src/hbcore/style/hbstyle.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 #include "hbstyleoptionsliderelement_p.h"
 #include "hbstyleoptionpushbutton_p.h"
 #include "hbstyleoptiontoolbutton_p.h"
 #include "hbstyleoptiontooltip_p.h"
 #include "hbstyleoptionprogressbar_p.h"
-#include "hbstyleoptionabstractviewitem_p.h"
-#include "hbstyleoptionlistviewitem_p.h"
-#include "hbstyleoptionmenuitem_p.h"
 #include "hbstyleoptionlabel_p.h"
-#include "hbstyleoptionscrollbar_p.h"
-#include "hbstyleoptiongridviewitem_p.h"
 #include "hbstyleoptioncheckbox_p.h"
 #include "hbiconloader_p.h"
 #include "hbstyleoptiontitlepane_p.h"
 #include "hbstyleoptionstatusbar_p.h"
 #include "hbstyleoptionindicatorgroup_p.h"
 #include "hbstyleoptionprogressdialog_p.h"
 #include "hbstyleoptionnotificationdialog_p.h"
-#include "hbstyleoptiontreeviewitem_p.h"
-#include "hbstyleoptioncolorgridviewitem_p.h"
 #include "hbstyleoptionmessagebox_p.h"
 #include "hbstyleoptionnavigationbutton_p.h"
 #include "hbstyleoptionindicatorbutton_p.h"
 #include "hbstyleoptionsignalindicator_p.h"
 #include "hbstyleoptionbatteryindicator_p.h"
 #include "hbstyleoptiondataformviewitem_p.h"
 #include "hbstyleoptiondatagroup_p.h"
 #include "hbstyleoptiondatagroupheadingwidget_p.h"
 #include "hbstyleoptiondataform_p.h"
 #include "hbstyleoptiongroupbox_p.h"
-#include "hbstyleoptionindexfeedback_p.h"
 #include "hbstyleoptioncombobox_p.h"
 #include "hbstyleoptioninputdialog_p.h"
 #include "hbstyleoptionprogresssliderhandle_p.h"
 #include "hbstyleoptionprogressslider_p.h"
+#include <hbstyleprimitivedata.h>
+#include <hbstyletextprimitivedata.h>
+#include <hbstylerichtextprimitivedata.h>
+#include <hbstyleiconprimitivedata.h>
+#include <hbstyleframeprimitivedata.h>
+#include <hbstylemarqueeprimitivedata.h>
+#include <hbstyletouchareaprimitivedata.h>
 #include <hbicon.h>
 #include <hbstyle.h>
 #include <hbframedrawer.h>
 #include <hbiconitem.h>
 #include <hbiconitem_p.h>
 #include <hbframeitem.h>
 #include <hbframedrawer.h>
 #include <hbframedrawer_p.h>
 #include <hbframebackground.h>
-#include <hbprogresstrackitem_p.h>
 #include <hbslidertrackitem_p.h>
 #include <hbinstance.h>
 #include <hbtextitem.h>
 #include <hbtextitem_p.h>
 #include <hbmarqueeitem.h>
 #include "hbstyleselector_p.h"
 #include "hblayeredstyleloader_p.h"
 #include "hbwidgetstyleloader_p.h"
 #include "hbcssparser_p.h"
-#include "hbrepeaticonitem_p.h"
 #include "hbnamespace_p.h"
 #include "hbanchorlayout.h"
 #include <hbanchor.h>
 #include <QGraphicsWidget>
-#include <hbwidget.h>
 #include <hbwidgetbase.h>
 #include "hbdeviceprofile.h"
-#include "hbrepeatitem_p.h"
 #include <QDebug>
 #include <QMetaClassInfo>
+#ifdef HB_TEXT_MEASUREMENT_UTILITY
+#include "hbinstance_p.h"
+#include "hbtextmeasurementutility_r.h"
+#endif
 Q_DECLARE_METATYPE(QGraphicsLayout*)
 //Uncomment next define(s) in order to get more debug prints.
 //Similar define exists also in the engine side.
 Whenever the widget's state changes in a way that needs changes in drawing the primitive
 (such as button pressed down -> change the button background image) then the widget needs to
 call the updatePrimitive method.
 Generally primitives should be updated only when a state change occurs. When a widget uses primitives to construct
 itself it does not need a paint() method at all since primitives (widget's children) are doing the drawing.
 Painting for the primitives occurs from the graphics scene.
 HbStyle has some caching functionality and thus it should not be instantiated explicitly, but
 accessed only through HbWidget::style() or HbInstance::style() APIs.
 */
-/*!
-	    \deprecated P_PushButton_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_PushButton_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_PushButton_additionaltext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_PushButton_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_PushButton_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_PushButton_focus
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataGrou\deprecated P_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataGroupComboBackground
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataGrou\deprecated P_heading
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataGrou\deprecated P_description
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataForm_heading
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataForm_heading_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataForm_description
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataGrou\deprecated P_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ToolButton_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ToolButton_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ToolButton_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Slider_thumb
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_increase
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_decrease
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Slider_groove
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Slider_progressgroove
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemViewItem_checkbox
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemViewItem_radiobutton
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemViewItem_selection
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_LineEdit_frame_normal
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_LineEdit_frame_highlight
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TextEdit_frame_normal
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TextEdit_frame_highlight
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Edit_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Label_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Label_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MenuItem_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MenuItem_focus
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MenuItem_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MenuItem_submenuindicator
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MenuItem_checkindicator
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MenuItem_separator
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ScrollBar_groove
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ScrollBar_handle
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ScrollBar_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Popu\deprecated P_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Popu\deprecated P_background_weak
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Popu\deprecated P_heading_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ToolTi\deprecated P_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MessageBox_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemViewItem_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ListViewItem_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ListViewItem_richtext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ListViewItem_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemHighlight_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ToolBarExtension_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_GridViewItem_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_GridViewItem_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_CheckBox_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_CheckBox_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_CheckBox_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Fade_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TitlePane_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TitlePane_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TitlePane_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TitleBar_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorGrou\deprecated P_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorGrou\deprecated P_signalicon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorGrou\deprecated P_batteryicon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SignalIndicator_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SignalLevel_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SignalLevel_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_BatteryIndicator_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_BatteryLevel_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_BatteryLevel_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorGrou\deprecated P_icon1
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorGrou\deprecated P_icon2
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorGrou\deprecated P_icon3
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorGrou\deprecated P_icon4
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressBar_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressBar_track
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressBar_waittrack
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressBar_mintext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressBar_maxtext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Softkey_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_NavigationButton_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorButton_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndicatorButton_handleindication
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemViewItem_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SelectionControl_selectionstart
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SelectionControl_selectionend
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TreeViewItem_expandicon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_Label_richtext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_RatingSlider_track
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_RatingSlider_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_RatingSlider_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-				\deprecated P_ProgressSlider_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-				\deprecated P_ProgressSlider_track
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSlider_slidertrack
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSlider_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSliderHandle_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSliderHandle_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSliderHandle_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_RatingSlider_layout
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ScrollArea_continuationbottom
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ScrollArea_continuationtop
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ScrollArea_continuationleft
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ScrollArea_continuationright
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemViewItem_focus
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_NotificationDialog_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_NotificationDialog_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_NotificationDialog_title
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_NotificationDialog_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ComboBox_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ComboBoxPopu\deprecated P_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ComboBoxButton_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ComboBox_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataItem_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataItem_separator
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ColorGridViewItem_colorIcon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ColorGridViewItem_borderIcon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ColorGridViewItem_checkIcon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ComboBox_button
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressDialog_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressDialog_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataItem_label
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataItem_description
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_touchincrease
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_touchdecrease
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_touchhandle
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderElement_touchgroove
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderTickMark_majoricon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderTickMark_minoricon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderTickMark_majorlabel
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderTickMark_minorlabel
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_QueryInputMode_image
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_GroupBoxHeading_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_GroupBoxHeading_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_GroupBoxMarquee_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_GroupBoxHeading_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_GroupBoxContent_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DataItem_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ItemViewItem_touchmultiselection
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TumbleView_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TumbleView_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_TumbleView_highlight
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DateTimePicker_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DateTimePicker_frame
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_DateTimePicker_separator
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndexFeedback_popu\deprecated P_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_IndexFeedback_popu\deprecated P_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_SliderPopu\deprecated P_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_StatusBar_background
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_StatusBar_timetext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_InputDialog_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_InputDialog_additionaltext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSlider_toucharea
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSlider_track
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSliderHandle_icon
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_InputDialog_additionaltext
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_MessageBox_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressSlider_handle
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-\deprecated P_ProgressBar_text
-is deprecated. HbStyle::Primitive enums are deprecated. Primitives can be accessed by item names using HbWidget::primitive(const QString).
-*/
 // TODO: margins should be defined in layout data once layout specification exists.
-static const int ItemName = 0xfffe;
 static const QString STYLE_LOCATION = QLatin1String(":/themes/style/hbdefault/rules/widgets/%w/%w");
-static const QString COLOR_STYLE_LOCATION = QLatin1String(":/themes/style/hbdefault/rules/widgets/%w/%w_color");
+static const QString COLOR_STYLE_LOCATION = QLatin1String(":/themes/style/hbdefault/rules/widgets/%w/%w_color.css");
 static const int TOUCHAREA_ZVALUE = 1000;
 static const QString GLOBAL_PARAMETERS_LOCATION = QLatin1String(":/themes/style/hbdefault/variables/layout/zoom/0/hbglobalparameters.css");
 static const char* LAYOUT_PTR_PROPERTY = "HbStyle_layout_ptr";
 }
 }
 }
 /*!
-Constructor
+Must not be called explicitly. Use HbWidget::style() or HbInstance::style() instead.
-Should not be called explicitly. Use HbWidget::style() or HbInstance::style() instead.
+\deprecated HbStyle::HbStyle()
+is deprecated. Use HbWidget::style() or HbInstance::style() instead.
 */
 HbStyle::HbStyle() :
 d_ptr(new HbStylePrivate)
 {
 Q_D( HbStyle );
 */
 HbStyle::~HbStyle()
 {
 delete d_ptr;
 }
 /*!
+Instantiates widget building blocks. The building blocks are called "primitives" and their main function is to perform the painting (e.g. drawing text).
-\deprecated HbStyle::createPrimitive(HbStyle::Primitive, QGraphicsItem*)
+A set of base primitives are defined in HbStyle::BasePrimitive enumeration. A widget calling this method should not cast the returned QGraphicsObject
-is deprecated. This method will be replaced with an altered version which will use new base primitive enumerations.
+to the actual primitive object. By following this rule the styling mechanism can be used to change the actual primitive instance to something else than the original one
+instantiated by the createPrimitive() method. This enables customizing the painting of the UI without touching the widget code.
-Creates instances of primitive graphics items. This method should be used by all widgets that support styling.
-When changing the style the returned primitives can be replaced with an altered version of the primitives, or with a completely
+Updating of a primitive's state is done by using HbStyle::updatePrimitive() method which uses the style primitive data classes (comparable to
-different primitive, to create a custom appearance. This shouldn't cause changes to the widget if the functional design
+Qt styleoptions) to get the state information needed for the primitive updating.
-remains the same.
+\param primitiveType enumeration of the base primitive
-This method returns HbWidgetBase objects. A widget can store the returned items as HbWidgetBase. If a widget
+\param itemName string which identifies a primitive in the widget (e.g. "background", or "text"). The item name matches with primitive names in widget's CSS file.
-does not require any functionality from HbWidgetBase then it should store the primitives as QGraphicsItems.
+\param parent parent for the primitive, although the default is 0 usually the widget is given as a parent for the primitive
+\return QGraphicsObject, the returned primitive should be stored as a QGraphicsObject on the widget side
-\note This method is used to replace the conventional Qt-style paint indirection via drawPrimitive.
+\sa HbStyle::updatePrimitive()
-\sa HbStyle::updatePrimitive method which is to be used in conjunction with this method
+\sa HbStylePrimitiveData
-\sa HbWidgetBase
+\sa HbStyleTextPrimitiveData
-\param primitive, to identify the primitive to create
+\sa HbStyleFramePrimitiveData
-\param parent of the item
+\sa HbStyleIconPrimitiveData
-\return HbWidgetBase is returned.
+\sa HbStyleRichTextPrimitiveData
+\sa HbStyleMarqueePrimitiveData
+\sa HbStyleTouchAreaPrimitiveData
 */
-QGraphicsItem *HbStyle::createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent ) const
+QGraphicsObject *HbStyle::createPrimitive(HbStyle::PrimitiveType primitiveType, const QString &itemName, QGraphicsObject *parent) const
 {
+QGraphicsObject *bp;
+switch (primitiveType) {
+case PT_TextItem:
+bp = new HbTextItem(parent);
+break;
+case PT_RichTextItem:
+bp = new HbRichTextItem(parent);
+break;
+case PT_FrameItem:
+bp = new HbFrameItem(parent);
+break;
+case PT_IconItem:
+bp = new HbIconItem(parent);
+break;
+case PT_MarqueeItem:
+bp = new HbMarqueeItem(parent);
+break;
+case PT_TouchArea:
+bp = new HbTouchArea(parent);
+break;
+default:
+bp = 0;
+}
+if (bp != 0) {
+setItemName(bp, itemName);
+}
+return bp;
+}
+/*!
+This method is called by Hb widgets whenever there's a widget state change that results to a change in primitive's state.
+For example if a button's text changes the button widget needs to update the button's text primitive by calling this method.
+Widgets need to use the HbStylePrimitiveData-derived classes to carry the primitive state information from the widget to the style.
+These data classes enable the widget to set the primitives' state information without directly using the primitive APIs.
+Note that the updating of the primitive attributes is optimized so that if just one value from the primitive data set is updated only that one
+value will be updated to the primitive on the style side. The values on primitive data classes are stored by using HbStyleValue templated class
+which keeps track of whether a primitive data value was assigned or not. On the style side before calling the primitive API the HbStyleValue's
+isSet()-method is called first to check if the widget did assign the primitive data value.
+\param primitive the primitive to be updated
+\param data primitive data needed for updating the primitive
+\param parent optionally the parent can be given
+\return bool, true if correct primitive type was found from the style, false if not.
+\sa HbStyle::createPrimitive()
+\sa HbStylePrimitiveData
+\sa HbStyleTextPrimitiveData
+\sa HbStyleFramePrimitiveData
+\sa HbStyleIconPrimitiveData
+\sa HbStyleRichTextPrimitiveData
+\sa HbStyleMarqueePrimitiveData
+\sa HbStyleTouchAreaPrimitiveData
+*/
+bool HbStyle::updatePrimitive(QGraphicsObject *primitive, const HbStylePrimitiveData *data, QGraphicsObject *parent) const
+{
+Q_UNUSED(parent);
+bool ret = false;
+if (HbTextItem *textItem = qgraphicsitem_cast<HbTextItem*>(primitive)) {
+const HbStyleTextPrimitiveData *td = hbstyleprimitivedata_cast<const HbStyleTextPrimitiveData*>(data);
+if (td->text.isSet())
+textItem->setText(td->text);
+if (td->textColor.isSet())
+textItem->setTextColor(td->textColor);
+if (td->alignment.isSet())
+textItem->setAlignment(td->alignment);
+if (td->elideMode.isSet())
+textItem->setElideMode(td->elideMode);
+if (td->textWrapping.isSet())
+textItem->setTextWrapping(td->textWrapping);
+if (td->isTextVisible.isSet())
+textItem->setTextVisible(td->isTextVisible);
+if (td->isTextClip.isSet())
+textItem->setTextClip(td->isTextClip);
+if (td->geometry.isSet())
+textItem->setGeometry(td->geometry);
+if (td->fadeLengths.isSet())
+textItem->setFadeLengths(td->fadeLengths);
+if (td->minimumLines.isSet())
+textItem->setMinimumLines(td->minimumLines);
+if (td->maximumLines.isSet())
+textItem->setMaximumLines(td->maximumLines);
+if (td->fontSpec.isSet())
+textItem->setFontSpec(td->fontSpec);
+ret = true;
+} else if (HbIconItem *iconItem = qgraphicsitem_cast<HbIconItem*>(primitive)) {
+const HbStyleIconPrimitiveData *id = hbstyleprimitivedata_cast<const HbStyleIconPrimitiveData*>(data);
+if (id->icon.isSet())
+iconItem->setIcon(id->icon);
+if (id->size.isSet())
+iconItem->setSize(id->size);
+if (id->aspectRatioMode.isSet())
+iconItem->setAspectRatioMode(id->aspectRatioMode);
+if (id->alignment.isSet())
+iconItem->setAlignment(id->alignment);
+if (id->iconMode.isSet())
+iconItem->setMode(id->iconMode);
+if (id->iconState.isSet())
+iconItem->setState(id->iconState);
+if (id->iconName.isSet())
+iconItem->setIconName(id->iconName);
+if (id->iconFlags.isSet())
+iconItem->setFlags(id->iconFlags);
+if (id->mirroringMode.isSet())
+iconItem->setMirroringMode(id->mirroringMode);
+if (id->brush.isSet())
+iconItem->setBrush(id->brush);
+if (id->color.isSet())
+iconItem->setColor(id->color);
+ret = true;
+} else if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(primitive)) {
+const HbStyleFramePrimitiveData *fd =  hbstyleprimitivedata_cast<const HbStyleFramePrimitiveData*>(data);
+HbFrameDrawer *drawer = &(frameItem->frameDrawer());
+if (fd->frameGraphicsName.isSet())
+drawer->setFrameGraphicsName(fd->frameGraphicsName);
+if (fd->frameType.isSet())
+drawer->setFrameType(fd->frameType);
+if (fd->borderWidthLeft.isSet() || fd->borderWidthRight.isSet() || fd->borderWidthBottom.isSet() || fd->borderWidthTop.isSet())
+drawer->setBorderWidths(fd->borderWidthLeft, fd->borderWidthTop, fd->borderWidthRight, fd->borderWidthBottom);
+if (fd->fillWholeRect.isSet())
+drawer->setFillWholeRect(fd->fillWholeRect);
+if (fd->mirroringMode.isSet())
+drawer->setMirroringMode(fd->mirroringMode);
+if (fd->fileNameSuffixList.isSet())
+drawer->setFileNameSuffixList(fd->fileNameSuffixList);
+if (fd->pixmapMask.isSet())
+drawer->setMask(fd->pixmapMask);
+if (fd->bitmapMask.isSet())
+drawer->setMask(fd->bitmapMask);
+frameItem->setFrameDrawer(drawer);
+ret = true;
+} else if (HbMarqueeItem *marqueeItem = qgraphicsitem_cast<HbMarqueeItem*>(primitive)) {
+const HbStyleMarqueePrimitiveData *md =  hbstyleprimitivedata_cast<const HbStyleMarqueePrimitiveData*>(data);
+if (md->text.isSet())
+marqueeItem->setText(md->text);
+if (md->textColor.isSet())
+marqueeItem->setTextColor(md->textColor);
+if (md->animation.isSet()) {
+if (md->animation)
+marqueeItem->startAnimation();
+else
+marqueeItem->stopAnimation();
+}
+if (md->loopCount.isSet())
+marqueeItem->setLoopCount(md->loopCount);
+ret = true;
+} else if (HbTouchArea *touchArea = qgraphicsitem_cast<HbTouchArea*>(primitive)) {
+const HbStyleTouchAreaPrimitiveData *td =  hbstyleprimitivedata_cast<const HbStyleTouchAreaPrimitiveData*>(data);
+if (td->size.isSet())
+touchArea->setSize(td->size);
+if (td->geometry.isSet())
+touchArea->setGeometry(td->geometry);
+ret = true;
+} else if (HbRichTextItem *richTextItem = qgraphicsitem_cast<HbRichTextItem*>(primitive)) {
+const HbStyleRichTextPrimitiveData *rd =  hbstyleprimitivedata_cast<const HbStyleRichTextPrimitiveData*>(data);
+if (rd->text.isSet())
+richTextItem->setText(rd->text);
+if (rd->defaultColor.isSet())
+richTextItem->setTextDefaultColor(rd->defaultColor);
+if (rd->alignment.isSet())
+richTextItem->setAlignment(rd->alignment);
+if (rd->textWrappingMode.isSet())
+richTextItem->setTextWrapping(rd->textWrappingMode);
+if (rd->isTextVisible.isSet())
+richTextItem->setTextVisible(rd->isTextVisible);
+if (rd->clipping.isSet())
+richTextItem->setTextClip(rd->clipping);
+if (rd->geometry.isSet())
+richTextItem->setGeometry(rd->geometry);
+ret = true;
+}
+if (ret) {
+if (data->geometry.isSet()
+&& primitive->isWidget()) {
+static_cast<QGraphicsWidget*>(primitive)->setGeometry(data->geometry);
+}
+}
+return ret;
+}
+QGraphicsItem *HbStylePrivate::createPrimitive( HbStylePrivate::Primitive primitive, QGraphicsItem *parent )
+{
 switch (primitive){
-case P_MenuItem_submenuindicator:
-{
-HbIconItem *item = new HbIconItem(parent);
-setItemName(item, QLatin1String("submenu-indicator"));
-return item;
-}
-case P_MenuItem_checkindicator:
-{
-HbIconItem *item = new HbIconItem(parent);
-setItemName(item, QLatin1String("check-indicator"));
-return item;
-}
-case P_MenuItem_separator:
-{
-HbIconItem *item = new HbIconItem(parent);
-setItemName(item, QLatin1String("separator"));
-return item;
-}
 case P_ToolButton_icon:
 case P_PushButton_icon:
 case P_ProgressDialog_icon: {
 HbIconItem *iconItem = new HbIconItem(HbIcon(),parent);
-setItemName(iconItem, QLatin1String("icon"));
+HbStyle::setItemName(iconItem, QLatin1String("icon"));
 return iconItem;
 }
 case P_CheckBox_icon:
 case P_GroupBoxHeading_icon:
-case P_Label_icon:
+case P_Label_icon: {
+HbIconItem *item = q_check_ptr(new HbIconItem(HbIcon(),parent));
+HbStyle::setItemName(item, QLatin1String("icon"));
+return item;
+}
 case P_GridViewItem_icon: {
-HbIconItem *item = q_check_ptr(new HbIconItem(HbIcon(),parent));
+Q_ASSERT_X(false, "HbStyle" , "P_GridViewItem_icon no more supported. Use refactored styling");
-setItemName(item, QLatin1String("icon"));
+return 0;
-return item;
+}
-}
 case P_DataGroup_icon:
 {
 HbIconItem *item = new HbIconItem(HbIcon(), parent);
-setItemName(item, QLatin1String("dataGroup_Icon"));
+HbStyle::setItemName(item, QLatin1String("dataGroup_Icon"));
 return item;
 }
 case P_DataItem_icon:
 {
 HbIconItem *item = new HbIconItem(HbIcon(), parent);
-setItemName(item, QLatin1String("dataItem_Icon"));
+HbStyle::setItemName(item, QLatin1String("dataItem_Icon"));
 return item;
 }
 case P_ComboBox_text:
 {
 HbTextItem *textItem = new HbTextItem(parent);
-setItemName(textItem, QLatin1String("combobox_labelfield"));
+HbStyle::setItemName(textItem, QLatin1String("combobox_labelfield"));
 return  textItem;
 }
 case P_ToolButton_text:
 case P_CheckBox_text:
 case P_ProgressDialog_text:
 {
 HbTextItem *textItem = new HbTextItem(parent);
-setItemName(textItem, QLatin1String("text"));
+HbStyle::setItemName(textItem, QLatin1String("text"));
+textItem->setTextWrapping(Hb::TextWordWrap);
 return  textItem;
 }
 case P_PushButton_text:
 {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("text"));
+HbStyle::setItemName(ti, QLatin1String("text"));
 return  ti;
 }
 case P_DataGroup_heading:
 {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("dataGroup_HeadingLabel"));
+HbStyle::setItemName(ti, QLatin1String("dataGroup_HeadingLabel"));
 return  ti;
 }
 case P_DataGroup_description:
 {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("dataGroup_Description"));
+HbStyle::setItemName(ti, QLatin1String("dataGroup_Description"));
 return  ti;
 }
 case P_DataForm_heading:
 {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("dataForm_Heading"));
+HbStyle::setItemName(ti, QLatin1String("dataForm_Heading"));
 //ti->setZValue(2);
 return  ti;
 }
 case P_DataForm_description:
 {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("dataForm_Desc"));
+HbStyle::setItemName(ti, QLatin1String("dataForm_Desc"));
 return  ti;
 }
 case P_PushButton_additionaltext:
 {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("additional-text"));
+HbStyle::setItemName(ti, QLatin1String("additional-text"));
 return  ti;
 }
 case P_ProgressSlider_toucharea:
-{
+return 0;
-HbTouchArea *ta = new HbTouchArea(parent);
-ta->setFlag(QGraphicsItem::ItemIsFocusable);
-setItemName(ta, QLatin1String("toucharea"));
-ta->setZValue(TOUCHAREA_ZVALUE);
-return ta;
-}
 case P_ProgressSliderHandle_toucharea:
-{
+return 0;
-HbTouchArea *ta = new HbTouchArea(parent);
-ta->setFlag(QGraphicsItem::ItemIsFocusable);
-setItemName(ta, QLatin1String("toucharea"));
-ta->setZValue(TOUCHAREA_ZVALUE);
-if(parent){
-parent->setFiltersChildEvents(true);
-}
-return ta;
-}
 case P_ProgressSliderHandle_icon:
 {
 HbIconItem *item = new HbIconItem(QLatin1String("qtg_graf_progslider_handle_normal"), parent);
 item->setAspectRatioMode(Qt::IgnoreAspectRatio);
 case P_RatingSlider_toucharea:
 case P_SliderElement_touchhandle:
 {
 HbTouchArea *ta = new HbTouchArea(parent);
 ta->setFlag(QGraphicsItem::ItemIsFocusable);
-setItemName(ta, QLatin1String("toucharea"));
+HbStyle::setItemName(ta, QLatin1String("toucharea"));
 if(parent){
 parent->setFiltersChildEvents(true);
 }
-return ta;
-}
-case P_ScrollBar_toucharea:
-{
-HbTouchArea *ta = new HbTouchArea(parent);
-ta->setFlags(QGraphicsItem::ItemIsFocusable);
-setItemName(ta, QLatin1String("toucharea"));
-// NOTE:: This is a temporary fix
-//if(parent){
-//    parent->setHandlesChildEvents(true);
-//}
 return ta;
 }
 case P_ComboBoxButton_toucharea:
 {
 HbTouchArea *ta = new HbTouchArea(parent);
 ta->setFlag(QGraphicsItem::ItemIsFocusable);
-setItemName(ta, QLatin1String("combobox_button_toucharea"));
+HbStyle::setItemName(ta, QLatin1String("combobox_button_toucharea"));
 if(parent){
 parent->setFiltersChildEvents(true);
 }
 return ta;
 }
 case P_TitleBar_toucharea:
 {
 HbTouchArea *ta = new HbTouchArea(parent);
 ta->setFlag(QGraphicsItem::ItemIsFocusable);
-setItemName(ta, QLatin1String("toucharea"));
+ta->grabGesture(Qt::SwipeGesture);
+HbStyle::setItemName(ta, QLatin1String("toucharea"));
 return ta;
 }
 case P_IndicatorButton_toucharea:
-case P_TitlePane_toucharea:
 case P_NavigationButton_toucharea:
 {
 HbTouchArea *ta = new HbTouchArea(parent);
 ta->setFlag(QGraphicsItem::ItemIsFocusable);
-setItemName(ta, QLatin1String("toucharea"));
+ta->grabGesture(Qt::TapGesture);
+HbStyle::setItemName(ta, QLatin1String("toucharea"));
+if (parent){
+parent->setHandlesChildEvents(true);
+}
+return ta;
+}
+case P_TitlePane_toucharea:
+{
+HbTouchArea *ta = new HbTouchArea(parent);
+ta->setFlag(QGraphicsItem::ItemIsFocusable);
+ta->grabGesture(Qt::TapGesture);
+ta->grabGesture(Qt::SwipeGesture);
+ta->grabGesture(Qt::PanGesture);
+HbStyle::setItemName(ta, QLatin1String("toucharea"));
 if (parent){
 parent->setHandlesChildEvents(true);
 }
 return ta;
 }
 if(parent){
 parent->setFiltersChildEvents(true);
 }
 return ta;
 }
 case P_SliderElement_text:
+{
+HbTextItem *ti = new HbTextItem(parent);
+return  ti;
+}
 case P_ProgressBar_text:
+return 0;
+case P_DataItem_label:
 {
 HbTextItem *ti = new HbTextItem(parent);
+HbStyle::setItemName(ti, QLatin1String("dataItem_Label"));
 return  ti;
 }
-case P_DataItem_label:
+case P_DataItem_description:
 {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("dataItem_Label"));
+HbStyle::setItemName(ti, QLatin1String("dataItem_Description"));
 return  ti;
 }
-case P_DataItem_description:
-{
-HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("dataItem_Description"));
-return  ti;
-}
 case P_ProgressBar_mintext:
-{
+return 0;
-HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("min-text"));
-return  ti;
-}
 case P_ProgressBar_maxtext:
-{
+return 0;
-HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("max-text"));
-return  ti;
-}
 case P_Label_text: {
 HbTextItem *ti = new HbTextItem(parent);
-setItemName(ti, QLatin1String("text"));
+HbStyle::setItemName(ti, QLatin1String("text"));
 ti->setAlignment(Qt::AlignCenter);
 return ti;
 }
 case P_Label_richtext:
 {
 HbRichTextItem *rti = new HbRichTextItem(parent);
-setItemName(rti, QLatin1String("text"));
+HbStyle::setItemName(rti, QLatin1String("text"));
 return rti;
 }
-case P_MenuItem_text:
-{
-HbTextItem *item = new HbTextItem(parent);
-setItemName(item, QLatin1String("text"));
-return item;
-}
 case P_Slider_thumb:
 return new HbIconItem(parent);
-case P_MenuItem_frame:
+case P_Slider_groove:
-case P_MenuItem_focus:
-case P_ScrollBar_groove:
-case P_ScrollBar_handle:
-case P_Slider_groove:
-case P_Popup_background:
-case P_Popup_background_weak:
 case P_Popup_heading_frame:
 case P_NotificationDialog_frame:
-case P_ToolTip_background:
 case P_PushButton_focus:
 case P_ComboBox_background:
-case P_ToolBarExtension_background:
 case P_SliderPopup_background:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
 return n;
 }
 case P_ProgressBar_frame:
+return 0;
+case P_ComboBoxPopup_background:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-n->frameDrawer().setFillWholeRect(true);
+HbStyle::setItemName(n , "dropdown_background");
-setItemName(n, "frame");
-return n;
-}
-case P_ComboBoxPopup_background:
-{
-HbFrameItem *n = new HbFrameItem(parent);
-n->setZValue(-1);
-setItemName(n , "dropdown_background");
 return n;
 }
 case P_TumbleView_background:
 case P_TumbleView_frame:
 }
 case P_DataGroup_background :
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("dataGroup_Background"));
+HbStyle::setItemName(n, QLatin1String("dataGroup_Background"));
 return n;
 }
 case P_DataGroupComboBackground:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("dataGroup_ComboBackground"));
+HbStyle::setItemName(n, QLatin1String("dataGroup_ComboBackground"));
 return n;
 }
 case P_DataForm_heading_background :
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("dataFormHeading_Background"));
+HbStyle::setItemName(n, QLatin1String("dataFormHeading_Background"));
 return n;
 }
 case P_DataItem_background:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-2);
-setItemName(n, QLatin1String("dataItem_Background"));
+HbStyle::setItemName(n, QLatin1String("dataItem_Background"));
 return n;
 }
 case P_GroupBoxContent_background:
 case P_GroupBoxHeading_background:
 case P_PushButton_background:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("background"));
+HbStyle::setItemName(n, QLatin1String("background"));
 return n;
 }
 case P_ProgressBar_track:
-{
+return 0;
-HbProgressTrackItem *n = new HbProgressTrackItem(parent);
-n->frameDrawer().setFillWholeRect(true);
-n->setZValue(-2);
-return n;
-}
 case P_ProgressSlider_slidertrack:
-{
+return 0;
-HbProgressTrackItem *n = new HbProgressTrackItem(parent);
-n->setZValue(-1);
-return n;
-}
 case P_Slider_progressgroove:
 {
 HbSliderTrackItem *n=new HbSliderTrackItem(parent);
 n->setZValue(0);
 return n;
 }
 case P_ToolButton_frame:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("background"));
+HbStyle::setItemName(n, QLatin1String("background"));
 return n;
 }
 case P_NavigationButton_background:
 case P_IndicatorButton_background:
 {
 HbIconItem *n = new HbIconItem(HbIcon(), parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("background"));
+HbStyle::setItemName(n, QLatin1String("background"));
 return n;
 }
 case P_IndicatorButton_handleindication:
 {
 HbIconItem *n = new HbIconItem(parent);
-setItemName(n, QLatin1String("handleindication"));
+HbStyle::setItemName(n, QLatin1String("handleindication"));
 return n;
 }
 case P_IndicatorButton_eventindication:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("eventindication"));
+HbStyle::setItemName(n, QLatin1String("eventindication"));
 return n;
 }
 case P_IndicatorGroup_icon1:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("icon1"));
+HbStyle::setItemName(n, QLatin1String("icon1"));
 return n;
 }
 case P_IndicatorGroup_icon2:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("icon2"));
+HbStyle::setItemName(n, QLatin1String("icon2"));
 return n;
 }
 case P_IndicatorGroup_icon3:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("icon3"));
+HbStyle::setItemName(n, QLatin1String("icon3"));
 return n;
 }
 case P_IndicatorGroup_icon4:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("icon4"));
+HbStyle::setItemName(n, QLatin1String("icon4"));
 return n;
 }
 case P_SignalIndicator_icon:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("icon"));
+HbStyle::setItemName(n, QLatin1String("icon"));
 return n;
 }
 case P_SignalLevel_background:
 {
 HbIndicatorLevelIconItem *n = new HbIndicatorLevelIconItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("background"));
+HbStyle::setItemName(n, QLatin1String("background"));
 return n;
 }
 case P_SignalLevel_icon:
 {
 HbIndicatorLevelIconItem *n = new HbIndicatorLevelIconItem(parent);
-setItemName(n, QLatin1String("levelicon"));
+HbStyle::setItemName(n, QLatin1String("levelicon"));
 return n;
 }
 case P_BatteryIndicator_icon:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("icon"));
+HbStyle::setItemName(n, QLatin1String("icon"));
 return n;
 }
 case P_BatteryLevel_background:
 {
 HbIndicatorLevelIconItem *n = new HbIndicatorLevelIconItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("background"));
+HbStyle::setItemName(n, QLatin1String("background"));
 return n;
 }
 case P_BatteryLevel_icon:
 {
 HbIndicatorLevelIconItem *n = new HbIndicatorLevelIconItem(parent);
-setItemName(n, QLatin1String("levelicon"));
+HbStyle::setItemName(n, QLatin1String("levelicon"));
 return n;
 }
 case P_TitlePane_background:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("background"));
+HbStyle::setItemName(n, QLatin1String("background"));
 return n;
 }
 case P_LineEdit_frame_normal:
 case P_LineEdit_frame_highlight:
 case P_TextEdit_frame_normal:
 }
 case P_GroupBoxMarquee_text:
 case P_TitlePane_text:
 {
 HbMarqueeItem *n = new HbMarqueeItem(parent);
-setItemName(n, QLatin1String("text"));
+HbStyle::setItemName(n, QLatin1String("text"));
 return n;
 }
 case P_TitlePane_icon:
 {
 HbIconItem *n = new HbIconItem(parent);
 n->setFlags(HbIcon::Colorized);
-setItemName(n, QLatin1String("icon"));
+HbStyle::setItemName(n, QLatin1String("icon"));
 return n;
 }
 case P_StatusBar_background:
 {
 HbFrameItem *n = new HbFrameItem(parent);
 n->setZValue(-1);
-setItemName(n, QLatin1String("background"));
+HbStyle::setItemName(n, QLatin1String("background"));
 return n;
 }
 case P_StatusBar_timetext:
 {
 HbTextItem *textItem = new HbTextItem(parent);
-setItemName(textItem, QLatin1String("timetext"));
+HbStyle::setItemName(textItem, QLatin1String("timetext"));
 textItem->setAlignment(Qt::AlignCenter);
 return textItem;
 }
 case P_Fade_background:
 return new HbIconItem(QString(), parent);
 case P_SliderElement_decrease:
 return new HbIconItem(QString(), parent);
 case P_SliderTickMark_majoricon: {
 HbIconItem *iconItem = new HbIconItem(parent);
-setItemName(iconItem,QLatin1String("tickmark-majoricon"));
+HbStyle::setItemName(iconItem,QLatin1String("tickmark-majoricon"));
 return iconItem;
 }
 case P_SliderTickMark_minoricon: {
 HbIconItem *iconItem = new HbIconItem(parent);
-setItemName(iconItem,QLatin1String("tickmark-minoricon"));
+HbStyle::setItemName(iconItem,QLatin1String("tickmark-minoricon"));
 return iconItem;
 }
 case P_SliderTickMark_majorlabel: {
 HbTextItem *textItem = new HbTextItem(parent);
-setItemName(textItem,QLatin1String("tickmark-majorlabel"));
+HbStyle::setItemName(textItem,QLatin1String("tickmark-majorlabel"));
 return textItem;
 }
 case P_SliderTickMark_minorlabel: {
 HbTextItem *textItem = new HbTextItem(parent);
-setItemName(textItem,QLatin1String("tickmark-minorlabel"));
+HbStyle::setItemName(textItem,QLatin1String("tickmark-minorlabel"));
 return textItem;
 }
 case P_ProgressBar_waittrack:
-return new HbRepeatIconItem(QLatin1String("qtg_graf_progbar_h_wait"), parent);
+return 0;
 case P_RatingSlider_frame:
-return  new HbRepeatItem(parent);
+return 0;
 case P_RatingSlider_track:
-return new HbRepeatMaskItem(parent);
+return 0;
+case P_RatingSlider_layout:
-case P_RatingSlider_layout: {
+return 0;
-HbWidgetBase *layout = new HbWidgetBase(parent);
-setItemName(layout, "frame");
-return layout;
-}
 case P_ItemViewItem_checkbox: {
 qDebug() << "Primitive P_ItemViewItem_checkbox is deprecated and will cease to exist in the near future.";
 HbIconItem *iconItem = new HbIconItem(parent);
-setItemName(iconItem, QLatin1String("checkbox-icon"));
+HbStyle::setItemName(iconItem, QLatin1String("checkbox-icon"));
 return iconItem;
 }
 case P_ItemViewItem_radiobutton:
 case P_ItemViewItem_selection: {
-HbIconItem *iconItem = q_check_ptr(new HbIconItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_selection no more supported. Use refactored styling");
-setItemName(iconItem, QLatin1String("selection-icon"));
+return 0;
-return iconItem;
 }
 case P_Edit_text:{
 return 0;
 }
 case P_GroupBoxHeading_text:
 case P_NotificationDialog_text:{
 HbTextItem *n = new HbTextItem(parent);
-setItemName(n, QLatin1String("text"));
+HbStyle::setItemName(n, QLatin1String("text"));
 n->setMinimumLines(1);
 n->setMaximumLines(1);
 n->setTextWrapping(Hb::TextNoWrap);
 return n;
 }
 case P_NotificationDialog_title:{
 HbTextItem *n = new HbTextItem(parent);
-setItemName(n, QLatin1String("title"));
+HbStyle::setItemName(n, QLatin1String("title"));
 return n;
 }
 case P_NotificationDialog_icon:{
 HbIconItem *n = new HbIconItem(QString(), parent);
-setItemName(n, QLatin1String("icon"));
+HbStyle::setItemName(n, QLatin1String("icon"));
 return n;
 }
-case P_MessageBox_text:{    //deprecated
+case P_MessageBox_text:{
 HbTextItem *rti = new HbTextItem(parent);
 return rti;
 }
 case P_MessageBox_icon:{
 HbIconItem *n = new HbIconItem(QString(), parent);
 return n;
 }
 case P_ItemViewItem_background: {
-HbIconItem *iconItem = q_check_ptr(new HbIconItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_background no more supported. Use refactored styling");
-iconItem->setZValue(-3.0);
+return 0;
-setItemName(iconItem, QLatin1String("background"));
-return iconItem;
 }
 case P_ListViewItem_text: {
-HbTextItem *textItem = q_check_ptr(new HbTextItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_ListViewItem_text no more supported. Use refactored styling");
+return 0;
-return textItem;
 }
 case P_ListViewItem_richtext: {
-HbRichTextItem *textItem = q_check_ptr(new HbRichTextItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_ListViewItem_richtext no more supported. Use refactored styling");
-return textItem;
+return 0;
 }
 case P_GridViewItem_text: {
-HbTextItem *textItem = q_check_ptr(new HbTextItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_GridViewItem_text no more supported. Use refactored styling");
-// caching do not work properly - text is not refreshed immediatelly
+return 0;
-//textItem->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
-setItemName(textItem, QLatin1String("text"));
-return textItem;
 }
 case P_ListViewItem_icon:
-return q_check_ptr(new HbIconItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_ListViewItem_icon no more supported. Use refactored styling");
+return 0;
-case P_ColorGridViewItem_colorIcon:
-return new HbIconItem("qtg_graf_colorpicker_mask", parent);
-case P_ColorGridViewItem_borderIcon:
-return new HbIconItem("qtg_graf_colorpicker_filled", parent);
-case P_ColorGridViewItem_checkIcon:
-return new HbIconItem("qtg_small_tick", parent);
 case P_TreeViewItem_expandicon: {
-HbIconItem *iconItem = q_check_ptr(new HbIconItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_TreeViewItem_expandicon no more supported. Use refactored styling");
-setItemName(iconItem, QLatin1String("subitem-indicator"));
+return 0;
-return iconItem;
+}
-}
-case P_SelectionControl_selectionstart://fallthrough
-case P_SelectionControl_selectionend://fallthrough
-{
-HbIconItem *iconItem = new HbIconItem(parent);
-switch (primitive) {
-case P_SelectionControl_selectionstart:
-iconItem->setIconName(QLatin1String("qtg_graf_editor_handle_begin"));
-break;
-case P_SelectionControl_selectionend:
-iconItem->setIconName(QLatin1String("qtg_graf_editor_handle_end"));
-break;
-default:
-qWarning("Unknown HbSelectionControl primitive %i", primitive);
-break;
-}
-setItemName(iconItem, QLatin1String("handle-icon"));
-return iconItem;
-}
 case P_ComboBox_button: {
 HbIconItem *n = new HbIconItem(QString(), parent);
 return n;
 }
 case P_ItemViewItem_focus: {
-HbFrameItem *frameItem = q_check_ptr(new HbFrameItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_focus no more supported. Use refactored styling");
-frameItem->setZValue(-1.0);
+return 0;
-return frameItem;
 }
 case P_ItemHighlight_background:
 return new HbFrameItem(parent);
 case P_ItemViewItem_frame: {
-HbFrameItem *item = q_check_ptr(new HbFrameItem(parent));
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_frame no more supported. Use refactored styling");
-item->setZValue(-4.0);
+return 0;
-setItemName(item,"frame");
+}
-return item;
+case P_ItemViewItem_touchmultiselection:
-}
+{
-case P_ScrollArea_continuationbottom:
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_touchmultiselection no more supported. Use refactored styling");
-{
+return 0;
-HbFrameItem *n = new HbFrameItem(parent);
+}
-setItemName(n, QLatin1String("continuation-indicator-bottom"));
+case P_IndexFeedback_popup_text:
-n->setZValue(-1);
+{
+Q_ASSERT_X(false, "HbStyle" , "P_IndexFeedback_popup_text no more supported. Use refactored styling");
+return 0;
+}
+case P_IndexFeedback_popup_background:
+{
+Q_ASSERT_X(false, "HbStyle" , "P_IndexFeedback_popup_background no more supported. Use refactored styling");
+return 0;
+}
+case P_InputDialog_text:
+{
+HbTextItem *n = new HbTextItem(parent);
+n->setTextWrapping(Hb::TextWordWrap);
+HbStyle::setItemName(n, QLatin1String("label-1"));
 return n;
 }
-case P_ScrollArea_continuationtop:
+case P_InputDialog_additionaltext:
-{
-HbFrameItem *n = new HbFrameItem(parent);
-setItemName(n, QLatin1String("continuation-indicator-top"));
-n->setZValue(-1);
-return n;
-}
-case P_ScrollArea_continuationleft:
-{
-HbFrameItem *n = new HbFrameItem(parent);
-setItemName(n, QLatin1String("continuation-indicator-left"));
-n->setZValue(-1);
-return n;
-}
-case P_ScrollArea_continuationright:
-{
-HbFrameItem *n = new HbFrameItem(parent);
-setItemName(n, QLatin1String("continuation-indicator-right"));
-n->setZValue(-1);
-return n;
-}
-case P_ItemViewItem_touchmultiselection:
-{
-HbTouchArea *area = q_check_ptr(new HbTouchArea(parent));
-setItemName(area, "multiselection-toucharea");
-return area;
-}
-case P_IndexFeedback_popup_text:
-{
-HbTextItem *textItem = new HbTextItem(parent);
-textItem->setAlignment(Qt::AlignCenter);
-textItem->setTextWrapping(Hb::TextNoWrap);
-setItemName(textItem, QLatin1String("index-text"));
-//TODO:: make this a sane value
-textItem->setZValue(4);
-return textItem;
-}
-case P_IndexFeedback_popup_background:
-{
-HbFrameItem *n = new HbFrameItem(parent);
-n->frameDrawer().setFrameGraphicsName("qtg_fr_popup_preview");
-n->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-qreal cornerPieceSize = 0;
-parameter(QLatin1String("hb-param-background-popup-preview"),cornerPieceSize);
-n->frameDrawer().setBorderWidths(cornerPieceSize, cornerPieceSize);
-setItemName(n, QLatin1String("index-background"));
-n->setZValue(3);
-return n;
-}
-case P_InputDialog_text:
 {
 HbTextItem *n = new HbTextItem(parent);
-setItemName(n, QLatin1String("label-1"));
+n->setTextWrapping(Hb::TextWordWrap);
-return n;
+HbStyle::setItemName(n, QLatin1String("label-2"));
-}
-case P_InputDialog_additionaltext:
-{
-HbTextItem *n = new HbTextItem(parent);
-setItemName(n, QLatin1String("label-2"));
 return n;
 }
 default:
 return 0;
 }
 }
-/*!
+void HbStylePrivate::updatePrimitive( QGraphicsItem *item, HbStylePrivate::Primitive primitive, const QStyleOption *option )
-\deprecated HbStyle::updatePrimitive(QGraphicsItem*, HbStyle::Primitive, const QStyleOption*)
-is deprecated. This method will be made private and finally removed since primitive updating will be done in the widgets.
-Updates the state and content of widget's child primitives. Update for a styled primitive should happen always when
-a state change that affects drawing occurs. Such a situation can be for example pressing of a button (change background image), or
-changing a text for a widget having text content. The updatePrimitive() implementation for each primitive element can be considered
-as a part of widget's implementation. Note that it's up to the widget to decide what the styleoption contains and what the updatePrimitive() method
-uses the styleoption data for.
-\sa HbStyle::createPrimitive
-\param item Primitive graphicsitem.
-\param primitive To identify the primitive to create.
-\param option Style option, contains all the information needed to update the primitive, this
-information is widget specific and each widget usually has a styleoption. Styleoption may include
-information about the widget's state, content etc.
-*/
-void HbStyle::updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const
 {
-Q_D( const HbStyle );
 switch(primitive){
 case P_PushButton_icon:
 {
 if (const HbStyleOptionPushButton *opt =
 qstyleoption_cast<const HbStyleOptionPushButton*>(option)) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 //iconItem->setIconName(opt->icon.iconName());
 iconItem->setIcon(opt->icon); // with this call iconitem refresh issue is there
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 iconItem->setAlignment(Qt::AlignCenter);
 }
 break;
 }
 case P_GroupBoxHeading_icon:
 case P_Label_icon:
 if (const HbStyleOptionLabel *opt = qstyleoption_cast<const HbStyleOptionLabel*>(option)) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 iconItem->setIcon(opt->icon);
 if (!opt->icon.isNull()) {
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 iconItem->setAspectRatioMode(opt->aspectRatioMode);
 iconItem->setAlignment(opt->alignment);
 }
 }
 break;
 case P_ToolButton_icon:
 if (const HbStyleOptionToolButton *opt = qstyleoption_cast<const HbStyleOptionToolButton*>(option)) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 iconItem->setIcon(opt->icon);
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 }
 break;
 case P_ComboBox_text:
 if (const HbStyleOptionComboBox *opt = qstyleoption_cast<const HbStyleOptionComboBox*>(option)) {
 HbTextItem *comboTextItem = static_cast<HbTextItem*>(item);
 case P_NavigationButton_toucharea:
 case P_SliderElement_touchdecrease:
 case P_SliderElement_touchincrease:
 case P_SliderElement_touchgroove:
 case P_SliderElement_touchhandle:
-case P_ScrollBar_toucharea:
 {
 HbTouchArea *touchArea = static_cast<HbTouchArea*>(item);
 touchArea->setZValue(TOUCHAREA_ZVALUE);
 }
 break;
 if (const HbStyleOptionToolButton *opt = qstyleoption_cast<const HbStyleOptionToolButton*>(option)) {
 HbTextItem *textItem = static_cast<HbTextItem*>(item);
 textItem->setText(opt->text);
 }
 break;
-case P_ProgressBar_text: {
+case P_ProgressBar_text:
-if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar*>(option)) {
+break;
-HbTextItem *textItem = static_cast<HbTextItem*>(item);
-textItem->setAlignment(Qt::AlignCenter);
-textItem->setZValue(100);
-textItem->setText(opt->text);
-}
-break;
-}
 case P_DataGroup_background: {
 if (const HbStyleOptionDataGroupHeadingWidget *opt =
 qstyleoption_cast<const HbStyleOptionDataGroupHeadingWidget *>(option)) {
 HbFrameItem *frameItem = static_cast<HbFrameItem*>( item );
 if(!frameItem){
 if (opt->state & QStyle::State_Enabled) {
 mode = QIcon::Normal;
 }
 if (opt->state & QStyle::State_Active) {
 mode = QIcon::Active;
 }
 if (opt->state & QStyle::State_Selected) {
 mode = QIcon::Selected;
 }
 frameItem->setZValue(-1.0);
 if(mode == QIcon::Disabled) {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_disabled"));
 }
 else if(opt->pressed ) {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_pressed"));
 } else {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_parent_normal"));
 }
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->setGeometry(opt->rect);
 }
 break;
 }
 case P_DataGroupComboBackground: {
 if (const HbStyleOptionDataGroup *opt = qstyleoption_cast<const HbStyleOptionDataGroup *>(option)) {
 if (const HbStyleOptionDataFormViewItem *opt = qstyleoption_cast<const HbStyleOptionDataFormViewItem *>(option)) {
 QString frameGraphicsName;
 HbFrameItem *frameItem = static_cast<HbFrameItem*>( item );
 if(!frameItem){
 return;
 }
 QIcon::Mode mode = QIcon::Disabled;
 if (opt->state & QStyle::State_Enabled) {
 mode = QIcon::Normal;
 }
 if (opt->state & QStyle::State_Active) {
 mode = QIcon::Selected;
 }
 if (mode == QIcon::Disabled ) {
 frameGraphicsName = QLatin1String("qtg_fr_list_disabled");
 } else  {
-frameGraphicsName = QLatin1String("qtg_fr_list_parent_normal");
+frameGraphicsName = QLatin1String("qtg_fr_list_normal");
 }
 frameItem->frameDrawer().setFrameGraphicsName(frameGraphicsName);
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 }
 break;
 case P_StatusBar_background: {
 const HbStyleOptionStatusBar *opt = qstyleoption_cast<const HbStyleOptionStatusBar *>(option);
 if (opt) {
 HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+frameItem->frameDrawer().setFillWholeRect(true);
 if (opt->transparent) {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_statusbar_trans"));
 } else {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_statusbar"));
 }
 iconItem->setIconName("qtg_graf_titlebar_minimize");
 }
 break;
 }
 case P_IndicatorButton_eventindication: {
 const HbStyleOptionIndicatorButton *opt = qstyleoption_cast<const HbStyleOptionIndicatorButton *>(option);
 if (opt) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 if (opt->twoIcons) {
 iconItem->setIconName("qtg_mono_new_event");
 iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_l"));
 } else {
 iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_l"));
 }
 }
+iconItem->update();
 }
 break;
 }
 case P_TitlePane_text: {
 const HbStyleOptionTitlePane *opt = qstyleoption_cast<const HbStyleOptionTitlePane *>(option);
 if (opt) {
-HbMarqueeItem *marqueeItem = static_cast<HbMarqueeItem*>( item );
+HbMarqueeItem *marqueeItem = static_cast<HbMarqueeItem*>(item);
 if (marqueeItem) {
 marqueeItem->setText(opt->caption);
+if (opt->margueeAnimation) {
+marqueeItem->startAnimation();
+}
 }
 }
 break;
 }
 case P_PushButton_focus: {
 if (const HbStyleOptionPushButton *opt =
 qstyleoption_cast<const HbStyleOptionPushButton *>(option)) {
 HbFrameItem *iconItem  = static_cast<HbFrameItem*>(item);
 iconItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_btn_highlight"));
-int margin = 4;
+//int margin = 4;
-QRectF focusRect  = opt->rect.adjusted(-margin , -margin , margin , margin);
+//QRectF focusRect  = opt->rect.adjusted(-margin , -margin , margin , margin);
-iconItem->setGeometry(focusRect);
+iconItem->setGeometry(opt->boundingRect);
 iconItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 }
 break;
 }
 case P_ToolButton_frame:{
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
 }
 QStringList list;
 QString frameGraphicsFooter;
-QIcon::Mode mode = d->iconMode(opt->state);
+QIcon::Mode mode = iconMode(opt->state);
-QIcon::State state = d->iconState(opt->state);
+QIcon::State state = iconState(opt->state);
 if (!opt->customBackground.isNull()) {
 QString customName = opt->customBackground.iconName(mode, state);
 frameItem->frameDrawer().setFrameGraphicsName(customName);
 break;
 case P_SliderTickMark_majoricon: {
 if (const HbStyleOptionSlider *opt =
 qstyleoption_cast<const HbStyleOptionSlider*>(option)) {
 HbIconItem *iconItem = qgraphicsitem_cast<HbIconItem*>(item);
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
 if ( opt->orientation ==Qt::Horizontal ){
 iconItem->setIconName( "qtg_graf_slider_h_tick_major" );
 } else {
 iconItem->setIconName ( "qtg_graf_slider_v_tick_major" );
 }
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 }
 break;
 }
 case P_SliderTickMark_minoricon: {
 if (const HbStyleOptionSlider *opt =
 qstyleoption_cast<const HbStyleOptionSlider*>(option)) {
 HbIconItem *iconItem = qgraphicsitem_cast<HbIconItem*>(item);
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
 if ( opt->orientation ==Qt::Horizontal ){
 iconItem->setIconName( "qtg_graf_slider_h_tick_minor" );
 } else {
 iconItem->setIconName ( "qtg_graf_slider_v_tick_minor" );
 }
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 }
 break;
 }
 frameItem->setMaximum(opt->maximum);
 frameItem->setMinimum(opt->minimum);
 frameItem->setValue(opt->sliderValue);
 frameItem->setOrientation(opt->orientation);
 frameItem->setSpan( opt->span );
+frameItem->setHandleRect(opt->handleRect);
 frameItem->update();
 }
 break;
 }
 case P_Slider_groove:{
 else {
 name = QLatin1String("qtg_fr_slider_v_frame_pressed");
 }
 } else {
 name = QLatin1String("qtg_fr_slider_v_frame_disabled");
 }
 type = HbFrameDrawer::ThreePiecesVertical;
 }
 frameItem->frameDrawer().setFrameGraphicsName(name);
 frameItem->frameDrawer().setFrameType(type);
 frameItem->frameDrawer().setFillWholeRect(true);
-break;
+}
-}
+break;
 }
 case P_Slider_thumb: {
 if (const HbStyleOptionSlider *opt = qstyleoption_cast<const HbStyleOptionSlider *>(option)){
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 // Set pixmap name and bounding rect
 QString thumbPath;
 if(opt->thumbPath.isNull())
 {
-thumbPath=d->logicalName(HbStyle::P_Slider_thumb, option);
+thumbPath=logicalName(HbStylePrivate::P_Slider_thumb, option);
 }
 else
 {
 thumbPath=opt->thumbPath;
-iconItem->setAlignment(Qt::AlignCenter);
+}
-}
+iconItem->setAlignment(Qt::AlignCenter);
 iconItem->setIconName(thumbPath);
 iconItem->setAspectRatioMode(Qt::KeepAspectRatio);
 }
 break;
 }
-case HbStyle::P_SliderElement_increase:
+case HbStylePrivate::P_SliderElement_increase:
 {
 if (const HbStyleOptionSlider *opt = qstyleoption_cast<const HbStyleOptionSlider*>(option)) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 iconItem->setZValue(1.0);
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 if ( !opt->sliderElementIcon.isNull() ){
 iconItem->setIcon(opt->sliderElementIcon);
 } else if ( opt->sliderType == HbStyleOptionSlider::VolumeType) {
 iconItem->setIconName(QLatin1String("qtg_mono_vol_up"));
 } else if (opt->sliderType == HbStyleOptionSlider::ZoomType) {
 iconItem->setIconName(QLatin1String("qtg_mono_zoom_in"));
 }
 }
 break;
 }
-case HbStyle::P_SliderElement_decrease:
+case HbStylePrivate::P_SliderElement_decrease:
 {
 if (const HbStyleOptionSlider *opt = qstyleoption_cast<const HbStyleOptionSlider*>(option)) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 iconItem->setZValue(1.0);
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 if ( !opt->sliderElementIcon.isNull() ){
 iconItem->setIcon(opt->sliderElementIcon);
 } else if ( opt->sliderType == HbStyleOptionSlider::VolumeType) {
 iconItem->setIconName(QLatin1String("qtg_mono_vol_down"));
 } else if (opt->sliderType == HbStyleOptionSlider::ZoomType) {
 iconItem->setIconName(QLatin1String("qtg_mono_zoom_out"));
 }
 }
 break;
 }
-case HbStyle::P_SliderElement_icon:
+case HbStylePrivate::P_SliderElement_icon:
 {
 if (const HbStyleOptionSlider *opt = qstyleoption_cast<const HbStyleOptionSlider*>(option)) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 iconItem->setZValue(1.0);
-iconItem->setMode(d->iconMode(opt->state));
+iconItem->setMode(iconMode(opt->state));
-iconItem->setState(d->iconState(opt->state));
+iconItem->setState(iconState(opt->state));
 if ( !opt->sliderElementIcon.isNull() ){
 iconItem->setIcon(opt->sliderElementIcon);
 } else if ( opt->sliderType == HbStyleOptionSlider::VolumeType) {
 if( opt->state & QStyle::State_Sunken) {
 iconItem->setIconName(QLatin1String("qtg_mono_speaker_off"));
 break;
 }
 case P_ItemViewItem_radiobutton:
 case P_ItemViewItem_checkbox:
 case P_ItemViewItem_selection:{
-if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)){
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_selection no more supported. Use refactored styling");
-HbIconItem *iconItem = static_cast<HbIconItem *>(item);
-iconItem->setAlignment(Qt::AlignCenter);
-if (opt->viewItemType == Hb::ItemType_RadioButtonListViewItem) {
-if (opt->checkState == Qt::Checked) {
-iconItem->setState(QIcon::On);
-iconItem->setIconName(QLatin1String("qtg_small_radio_selected"));
-} else {
-iconItem->setState(QIcon::Off);
-iconItem->setIconName(QLatin1String("qtg_small_radio_unselected"));
-}
-} else {
-if (opt->checkState == Qt::Checked) {
-iconItem->setState(QIcon::On);
-if (opt->singleSelectionMode) {
-iconItem->setIconName(QLatin1String("qtg_small_tick"));
-}
-else {
-iconItem->setIconName(QLatin1String("qtg_small_selected"));
-}
-} else if (opt->checkState == Qt::PartiallyChecked) {
-iconItem->setState(QIcon::On);
-iconItem->setIconName(QLatin1String("qtg_small_selected_partial"));
-} else {
-iconItem->setState(QIcon::Off);
-if (opt->singleSelectionMode) {
-iconItem->setIconName(QLatin1String(""));
-}
-else {
-iconItem->setIconName(QLatin1String("qtg_small_unselected"));
-}
-}
-}
-}
 break;
 }
 case P_LineEdit_frame_normal:{
 if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_lineedit_normal"));
+if(frameItem->isEnabled()) {
+frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_lineedit_normal"));
+} else {
+frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_lineedit_disabled"));
+}
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 }
 break;
 }
 break;
 }
 case P_TextEdit_frame_normal:{
 if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_textedit_normal"));
+if(frameItem->isEnabled()) {
+frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_textedit_normal"));
+} else {
+frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_textedit_disabled"));
+}
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 }
 break;
 }
 case P_Edit_text:{
 break;
 }
-case P_MenuItem_frame:{
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_list_normal"));
-break;
-}
-case P_MenuItem_focus:{
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_list_pressed"));
-break;
-}
 case P_Label_text:
 if (const HbStyleOptionLabel *opt = qstyleoption_cast<const HbStyleOptionLabel*>(option)) {
 HbTextItem *textItem = static_cast<HbTextItem*>(item);
 textItem->setAlignment(opt->alignment);
 textItem->setElideMode(opt->elideMode);
 }
 if (opt->color.isValid()) {
 textItem->setTextColor(opt->color);
 }
 textItem->setText(opt->text);
+textItem->setMaximumLines(opt->maximumLines);
 }
 break;
 case P_Label_richtext:
 if (const HbStyleOptionLabel *opt = qstyleoption_cast<const HbStyleOptionLabel*>(option)) {
 HbRichTextItem *textItem = static_cast<HbRichTextItem*>(item);
 textItem->setTextDefaultColor(opt->color);
 }
 textItem->setText(opt->text);
 }
 break;
+case P_Popup_heading_frame: {
-case P_MenuItem_submenuindicator:
-if (const HbStyleOptionMenuItem *opt = qstyleoption_cast<const HbStyleOptionMenuItem *>(option)) {
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-Q_UNUSED(opt)
-iconItem->setIconName(QLatin1String("qtg_mono_options_menu"));
-}
-break;
-case P_MenuItem_checkindicator:
-if (const HbStyleOptionMenuItem *opt = qstyleoption_cast<const HbStyleOptionMenuItem *>(option)) {
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-if (opt->checked) {
-iconItem->setIconName(QLatin1String("qtg_small_tick"));
-} else {
-iconItem->setIcon(HbIcon());
-}
-}
-break;
-case P_MenuItem_separator:
-if (const HbStyleOptionMenuItem *opt = qstyleoption_cast<const HbStyleOptionMenuItem *>(option)) {
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-Q_UNUSED(opt)
-iconItem->setAspectRatioMode(Qt::IgnoreAspectRatio);
-iconItem->setAlignment(Qt::AlignCenter);
-iconItem->setIconName(QLatin1String("qtg_graf_popup_separator"));
-}
-break;
-case P_ScrollBar_groove:
-if (const HbStyleOptionScrollBar *opt = qstyleoption_cast<const HbStyleOptionScrollBar *>(option)) {
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-if (opt->interactive) {
-if (opt->groovePressed) {
-if (opt->orientation == Qt::Vertical) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_v_active_frame_pressed"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_h_active_frame_pressed"));
-}
-} else {
-if (opt->orientation == Qt::Vertical) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_v_active_frame_normal"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_h_active_frame_normal"));
-}
-}
-} else {
-if (opt->orientation == Qt::Vertical) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_v_frame"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_h_frame"));
-}
-}
-frameItem->frameDrawer().setFillWholeRect(true);
-}
-break;
-case P_ScrollBar_handle:
-if (const HbStyleOptionScrollBar *opt = qstyleoption_cast<const HbStyleOptionScrollBar *>(option)) {
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-if (opt->interactive) {
-if (opt->thumbPressed) {
-if (opt->orientation == Qt::Vertical) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_v_active_handle_pressed"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_h_active_handle_pressed"));
-}
-} else {
-if (opt->orientation == Qt::Vertical) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_v_active_handle_normal"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_h_active_handle_normal"));
-}
-}
-} else {
-if (opt->orientation == Qt::Vertical) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_v_handle"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_scroll_h_handle"));
-}
-}
-frameItem->frameDrawer().setFillWholeRect(true);
-}
-break;
-case P_Popup_background:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup"));
-frameItem->setGeometry(opt->boundingRect);
-}
-break;
-case P_Popup_background_weak:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_secondary"));
-frameItem->setGeometry(opt->boundingRect);
-}
-break;
-case P_Popup_heading_frame:
 if (const HbStyleOptionPopup *opt = qstyleoption_cast<const HbStyleOptionPopup *>(option)) {
 HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
 frameItem->setGeometry(opt->boundingRect);
 if (opt->headingMode == QIcon::Active) {
 } else {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_heading_normal"));
 }
 }
 break;
+}
-case P_ComboBoxPopup_background:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
+case P_ComboBoxPopup_background: {
 HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
 if(!frameItem){
 return;
 }
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_secondary"));
-frameItem->setGeometry(opt->boundingRect);
-}
-break;
-case P_ToolTip_background:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_preview"));
-frameItem->setGeometry(opt->boundingRect);
 }
 break;
 case P_NotificationDialog_frame:
 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
 break;
 case P_MessageBox_text:    //deprecated
 if (const HbStyleOptionMessageBox *opt = static_cast<const HbStyleOptionMessageBox *>(option)) {
 HbTextItem *textItem = static_cast<HbTextItem*>(item);
-textItem->setAlignment(opt->textAlignment);
+textItem->setTextWrapping(Hb::TextWordWrap);
-if (opt->textWrapping) {
-textItem->setTextWrapping(Hb::TextWrapAnywhere);
-} else {
-textItem->setTextWrapping(Hb::TextNoWrap);
-}
 textItem->setText(opt->text);
 }
 break;
 case P_MessageBox_icon:
 if (const HbStyleOptionMessageBox *opt = static_cast<const HbStyleOptionMessageBox *>(option)) {
 icon->setIcon(opt->icon);
 }
 }
 break;
 case P_ListViewItem_text:
-if (const HbStyleOptionListViewItem *opt = qstyleoption_cast<const HbStyleOptionListViewItem *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_ListViewItem_text no more supported. Use refactored styling");
-HbTextItem *textItem = static_cast<HbTextItem*>(item);
-if (opt->index == 1) {
-if (opt->multilineSecondaryTextSupported) {
-if (opt->minimumLines != -1) {
-// min & max secondary text row counts set by app
-Hb::TextWrapping wrapping = Hb::TextNoWrap;
-if (    opt->minimumLines != 1
-||  opt->maximumLines != 1) {
-wrapping = Hb::TextWordWrap;
-}
-textItem->setTextWrapping(wrapping);
-textItem->setMinimumLines(opt->minimumLines);
-textItem->setMaximumLines(opt->maximumLines);
-} else {
-// min & max secondary text row counts not set by app. Allow setting those from .css
-// Needed when multilineSecondaryTextSupported changed from FALSE to TRUE and
-// min & max secondary text row counts has not bee set by app
-HbWidgetBasePrivate *widgetBasePrivate = d->widgetBasePrivate(textItem);
-widgetBasePrivate->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, false);
-widgetBasePrivate->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
-widgetBasePrivate->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
-}
-} else {
-// min & max secondary text row counts must always be 1. They cannot be overridden by .css
-textItem->setTextWrapping(Hb::TextNoWrap);
-textItem->setMinimumLines(1);
-textItem->setMaximumLines(1);
-}
-} // else - default values from .css still in use
-setItemName(textItem, QLatin1String("text-") + QString::number(opt->index + 1));
-textItem->setText(opt->content.value<QString>());
-}
 break;
 case P_ListViewItem_richtext:
-if (const HbStyleOptionListViewItem *opt = qstyleoption_cast<const HbStyleOptionListViewItem *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_ListViewItem_richtext no more supported. Use refactored styling");
-HbRichTextItem *label = static_cast<HbRichTextItem*>(item);
-label->setText(opt->content.value<QString>());
-setItemName(label, QLatin1String("text-") + QString::number(opt->index + 1));
-}
 break;
 case P_ListViewItem_icon:
-if (const HbStyleOptionListViewItem *opt = qstyleoption_cast<const HbStyleOptionListViewItem *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_ListViewItem_icon no more supported. Use refactored styling");
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-setItemName(iconItem, QLatin1String("icon-") + QString::number(opt->index + 1));
-if (iconItem->zValue() != opt->index + 1) {
-iconItem->setZValue(opt->index + 1);
-}
-if (opt->content.canConvert<HbIcon>()){
-iconItem->setIcon(opt->content.value<HbIcon>());
-} if (opt->content.canConvert<QIcon>()){
-iconItem->setIcon(opt->content.value<QIcon>());
-}
-}
 break;
 case P_GridViewItem_icon:
-if (const  HbStyleOptionGridViewItem*opt = qstyleoption_cast<const HbStyleOptionGridViewItem*>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_GridViewItem_icon no more supported. Use refactored styling");
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
+break;
-iconItem->setIcon(opt->icon);
-iconItem->setAlignment(Qt::AlignCenter);
-iconItem->setAspectRatioMode(Qt::KeepAspectRatio);
-}
-break;
-case P_ColorGridViewItem_colorIcon:
-if (const  HbStyleOptionColorGridViewItem* opt = qstyleoption_cast<const HbStyleOptionColorGridViewItem*>(option)) {
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-if(!iconItem)
-return;
-iconItem->setColor(opt->color);
-iconItem->setZValue(iconItem->parentItem()->zValue()+2);
-}
-break;
-case P_ColorGridViewItem_borderIcon:
-if (const  HbStyleOptionColorGridViewItem* opt = qstyleoption_cast<const HbStyleOptionColorGridViewItem*>(option)) {
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-if(!iconItem)
-return;
-iconItem->setIconName(opt->borderIcon);
-iconItem->setColor(opt->borderColor);
-iconItem->setZValue(iconItem->parentItem()->zValue()+1);
-}
-break;
-case P_ColorGridViewItem_checkIcon:
-if (const  HbStyleOptionColorGridViewItem* opt = qstyleoption_cast<const HbStyleOptionColorGridViewItem*>(option)) {
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-if(!iconItem)
-return;
-Q_UNUSED(opt);
-iconItem->setZValue(iconItem->parentItem()->zValue()+3);
-}
-break;
 case P_GridViewItem_text:
-if (const  HbStyleOptionGridViewItem*opt = qstyleoption_cast<const HbStyleOptionGridViewItem*>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_GridViewItem_text no more supported. Use refactored styling");
-HbTextItem *textItem = static_cast<HbTextItem*>(item);
-textItem->setAlignment(Qt::AlignCenter);
-textItem->setText(opt->text);
-}
 break;
 case P_ItemHighlight_background:
 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
 HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_highlight"));
 frameItem->setGeometry(opt->boundingRect);
 }
 break;
-case P_ToolBarExtension_background:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
-Q_UNUSED(opt);
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_trans"));
-}
-break;
 case P_SliderPopup_background:
 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption *>(option)) {
 Q_UNUSED(opt)
 HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_popup_trans"));
 }
 break;
 case P_ProgressBar_frame:
-if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar *>(option)) {
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-if(opt->orientation == Qt::Horizontal){
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_h_frame"));
-}
-else{
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_v_frame"));
-}
-//  frameItem->frameDrawer().setFillWholeRect(true);
-}
 break;
 case P_ProgressBar_track:
-if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar *>(option)) {
-HbProgressTrackItem* frameItem = static_cast<HbProgressTrackItem*>(item);
-if(!frameItem->isVisible()) {
-break;
-}
-if(opt->orientation == Qt::Horizontal){
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_h_filled"));
-}
-else{
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesVertical);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progbar_v_filled"));
-}
-frameItem->setMaximum(opt->maximum);
-frameItem->setMinimum(opt->minimum);
-frameItem->setValue(opt->progressValue);
-frameItem->setInverted(opt->inverted);
-//frameItem->setGeometry(opt->rect);
-frameItem->setOrientation(opt->orientation);
-frameItem->update();
-}
 break;
 case P_ProgressBar_waittrack:
-if (const HbStyleOptionProgressBar *opt = qstyleoption_cast<const HbStyleOptionProgressBar *>(option)) {
+break;
-HbRepeatIconItem *iconItem = static_cast<HbRepeatIconItem*>(item);
-iconItem->setOrientation(opt->orientation);
-if( !iconItem->isVisible() ) {
-break;
-}
-if(opt->orientation == Qt::Horizontal){
-iconItem->setName(QLatin1String("qtg_graf_progbar_h_wait"));
-}
-else{
-iconItem->setName(QLatin1String("qtg_graf_progbar_v_wait"));
-}
-if(opt->stopWaitAnimation){
-iconItem->stopAnimation();
-}
-}
-break;
 case P_ProgressSlider_frame:
-if (const HbStyleOptionProgressSlider *opt = qstyleoption_cast<const HbStyleOptionProgressSlider *>(option)) {
+break;
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
+case P_ProgressSlider_track:
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+break;
-	if (opt->disableState ) {
+case P_ProgressSlider_slidertrack:
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_disabled"));
+break;
-					}
+case P_ProgressBar_mintext:
-					else {
+break;
-					     if(opt->pressedState) {
+case P_ProgressBar_maxtext:
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_pressed"));
+break;
-}
+case P_RatingSlider_frame:
-else {
+break;
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_normal"));
+case P_RatingSlider_track:
-}
+break;
-					}
+case P_ProgressSliderHandle_icon:
-frameItem->frameDrawer().setFillWholeRect(true);
+break;
-//frameItem->update();
-}
-break;
-case P_ProgressSlider_track: // The ProgressValue Mask
-if (const HbStyleOptionProgressSlider *opt = qstyleoption_cast<const HbStyleOptionProgressSlider *>(option)) {
-HbProgressTrackItem* frameItem = static_cast<HbProgressTrackItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-					if (opt->disableState ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_loaded_disabled"));
-					}
-					else {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_loaded"));
-					}
-frameItem->frameDrawer().setFillWholeRect(true);
-frameItem->setMaximum(opt->maximum);
-frameItem->setMinimum(opt->minimum);
-frameItem->setValue(opt->progressValue);
-frameItem->setInverted(opt->inverted);
-frameItem->setOrientation(opt->orientation);
-frameItem->update();
-}
-break;
-case P_ProgressSlider_slidertrack: // The Slider Position Mask
-if (const HbStyleOptionProgressSlider *opt = qstyleoption_cast<const HbStyleOptionProgressSlider *>(option)) {
-HbProgressTrackItem* frameItem = static_cast<HbProgressTrackItem*>(item);
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-					if (opt->disableState ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_played_disabled"));
-					}
-					else {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_played"));
-					}
-frameItem->frameDrawer().setFillWholeRect(true);
-frameItem->setMaximum(opt->maximum);
-frameItem->setMinimum(opt->minimum);
-frameItem->setValue(opt->progressSliderValue);
-frameItem->setInverted(opt->inverted);
-frameItem->setOrientation(opt->orientation);
-frameItem->update();
-}
-break;
-case P_ProgressBar_mintext: {
-if (const HbStyleOptionProgressBar *opt =
-qstyleoption_cast<const HbStyleOptionProgressBar*>(option)) {
-HbTextItem *textItem = static_cast<HbTextItem*>(item);
-if(!item) {
-return;
-}
-textItem->setTextWrapping(Hb::TextWrapAnywhere);
-textItem->setText(opt->minText);
-}
-break;
-}
-case P_ProgressBar_maxtext: {
-if (const HbStyleOptionProgressBar *opt =
-qstyleoption_cast<const HbStyleOptionProgressBar*>(option)) {
-HbTextItem *textItem = static_cast<HbTextItem*>(item);
-if(!item) {
-return;
-}
-textItem->setTextWrapping(Hb::TextWrapAnywhere);
-textItem->setText(opt->maxText);
-}
-break;
-}
-case P_RatingSlider_frame:{
-if (const HbStyleOptionRatingSlider *opt = qstyleoption_cast<const HbStyleOptionRatingSlider *>(option)) {
-HbRepeatItem *repeatItem = static_cast<HbRepeatItem*>(item);
-repeatItem->setRepeatingNumber(opt->noOfStars);
-if (!opt->unRatedGraphicsName.isEmpty()) {
-repeatItem->setName(opt->unRatedGraphicsName);
-}
-else {
-if(opt->disableState) {
-repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated_disabled"));
-}
-else {
-							if(opt->pressedState) {
-								repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated_pressed"));
-							}
-							else {
-								repeatItem->setName(QLatin1String("qtg_graf_ratingslider_unrated"));
-							}
-}
-}
-repeatItem->setGeometry(opt->boundingRect);
-repeatItem->update();
-}
-break;
-}
-case P_RatingSlider_track:{
-if (const HbStyleOptionRatingSlider *opt = qstyleoption_cast<const HbStyleOptionRatingSlider *>(option)) {
-HbRepeatMaskItem *repeatItem = static_cast<HbRepeatMaskItem*>(item);
-repeatItem->setMaskValue(opt->progressValue);
-repeatItem->setMaximum(opt->noOfIntervals);
-repeatItem->setInverted(opt->inverted);
-repeatItem->setRepeatingNumber(opt->noOfStars);
-if (!opt->ratedGraphicsName.isEmpty()) {
-repeatItem->setName(opt->ratedGraphicsName);
-}
-else {
-if(opt->disableState) {
-repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated_disabled"));
-}
-else {
-							if(opt->pressedState) {
-								repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated_pressed"));
-							}
-							else {
-								repeatItem->setName(QLatin1String("qtg_graf_ratingslider_rated"));
-							}
-}
-}
-repeatItem->setGeometry(opt->boundingRect);
-repeatItem->update();
-}
-break;
-}
-case P_ProgressSliderHandle_icon:
-if (const HbStyleOptionProgressSliderHandle *opt = qstyleoption_cast<const HbStyleOptionProgressSliderHandle *>(option)) {
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-if(!opt->handleIcon.isNull()) {
-iconItem->setIconName(opt->handleIcon.iconName());
-}
-else {
-if(opt->pressedState) {
-iconItem->setIconName(QLatin1String("qtg_graf_progslider_handle_pressed"));
-}
-else {
-iconItem->setIconName(QLatin1String("qtg_graf_progslider_handle_normal"));
-}
-}
-}
-break;
 case P_QueryInputMode_image:
 /*   if (const HbStyleOptionInputPopup *opt = qstyleoption_cast<const HbStyleOptionInputPopup *>(option)){
 if (HbIconItem *iconItem = static_cast<HbIconItem*>(item)) {
 iconItem->setIcon(*opt->modeIcon);
 iconItem->setPos(opt->editRect.width() - opt->modeIcon->width() - 6,opt->editRect.top()-3);
 }
 }*/
 break;
 case P_ItemViewItem_background:
-if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_background no more supported. Use refactored styling");
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-iconItem->setGeometry(opt->boundingRect);
-if (opt->background.canConvert<HbIcon>()){
-iconItem->setIcon(opt->background.value<HbIcon>());
-} else if (opt->background.canConvert<QBrush>()){
-iconItem->setBrush(opt->background.value<QBrush>());
-}
-}
 break;
 case P_ItemViewItem_frame:
-if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_frame no more supported. Use refactored styling");
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-frameItem->setGeometry(opt->boundingRect);
-if (opt->background.canConvert<HbFrameBackground>()) {
-HbFrameBackground frame = opt->background.value<HbFrameBackground>();
-frameItem->frameDrawer().setFrameType(frame.frameType());
-frameItem->frameDrawer().setFrameGraphicsName(frame.frameGraphicsName());
-} else if (opt->viewItemType == Hb::ItemType_TreeViewItem) {
-if (opt->modelItemType == Hb::ParentItem) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName( opt->insidePopup ?
-QLatin1String("qtg_fr_popup_list_parent_normal") : QLatin1String("qtg_fr_list_parent_normal"));
-} else if (opt->modelItemType == Hb::SeparatorItem) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_separator"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName( opt->insidePopup ?
-QLatin1String("qtg_fr_popup_list_normal") : QLatin1String("qtg_fr_list_normal"));
-}
-} else if ( opt->viewItemType == Hb::ItemType_ListViewItem
-|| opt->viewItemType == Hb::ItemType_RadioButtonListViewItem) {
-if (opt->modelItemType == Hb::SeparatorItem) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_list_separator"));
-} else {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName( opt->insidePopup ?
-QLatin1String("qtg_fr_popup_list_normal") : QLatin1String("qtg_fr_list_normal"));
-}
-} else if (opt->viewItemType == Hb::ItemType_GridViewItem
-|| opt->viewItemType == HbPrivate::ItemType_ColorGridViewItem) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName( opt->insidePopup ?
-QLatin1String("qtg_fr_popup_grid_normal") : QLatin1String("qtg_fr_grid_normal"));
-}
-else{
-frameItem->frameDrawer().setFrameGraphicsName(QString());
-}
-}
 break;
 case P_ItemViewItem_focus:
-if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_ItemViewItem_focus no more supported. Use refactored styling");
-HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
+break;
-frameItem->setGeometry(opt->boundingRect);
-if (opt->viewItemType == Hb::ItemType_TreeViewItem
-|| opt->viewItemType == Hb::ItemType_ListViewItem
-|| opt->viewItemType == Hb::ItemType_RadioButtonListViewItem) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName( opt->insidePopup ?
-QLatin1String("qtg_fr_popup_list_pressed") : QLatin1String("qtg_fr_list_pressed"));
-} else if (     opt->viewItemType == Hb::ItemType_GridViewItem
-||  opt->viewItemType == HbPrivate::ItemType_ColorGridViewItem) {
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-frameItem->frameDrawer().setFrameGraphicsName(opt->insidePopup ?
-QLatin1String("qtg_fr_popup_grid_pressed") : QLatin1String("qtg_fr_grid_pressed"));
-} else {
-setItemName(frameItem,QString());
-frameItem->frameDrawer().setFrameGraphicsName(QString());
-}
-}
-break;
-case P_SelectionControl_selectionstart://fallthrough
-case P_SelectionControl_selectionend://fallthrough
-{
-if (HbIconItem *iconItem = qgraphicsitem_cast<HbIconItem*>(item)) {
-iconItem->setSize(iconItem->preferredSize());
-}
-break;
-}
 case P_TreeViewItem_expandicon:
-if (const HbStyleOptionTreeViewItem *opt = qstyleoption_cast<const HbStyleOptionTreeViewItem *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_TreeViewItem_expandicon no more supported. Use refactored styling");
-HbIconItem *iconItem = static_cast<HbIconItem*>(item);
+break;
-if (opt->expanded) {
-iconItem->setIconName(opt->insidePopup ? QLatin1String("qtg_mono_collapse") : QLatin1String("qtg_small_collapse"));
-} else {
-iconItem->setIconName(opt->insidePopup ? QLatin1String("qtg_mono_expand") : QLatin1String("qtg_small_expand"));
-}
-}
-break;
-case P_ScrollArea_continuationbottom:
-if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_list_mask_b"));
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-frameItem->setZValue(1);
-}
-break;
-case P_ScrollArea_continuationtop:
-if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_list_mask_t"));
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-frameItem->setZValue(1);
-}
-break;
-case P_ScrollArea_continuationright:
-if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_list_mask_r"));
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-frameItem->setZValue(1);
-}
-break;
-case P_ScrollArea_continuationleft:
-if (HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>( item ) ) {
-frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_graf_list_mask_l"));
-frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
-frameItem->setZValue(1);
-}
-break;
 case P_TumbleView_background:
 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 //Temporary source to avoid introducing new style primitive for selection dialog mark widget background item.
 QString className;
 if(obj){
 className = obj->className();
 }
 ///////////////////////////////////////////////////////////
 if( !className.compare("HbTumbleView") ){
 frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_bg");
 }
 else if( !className.compare("HbSelectionDialogMarkWidget") )
 {
 }
 }
 break;
 case P_TumbleView_highlight:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_highlight_pri");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
-frameItem->setZValue(3);
+frameItem->setZValue(-1);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(0,(opt->boundingRect.height()-frameItem->boundingRect().height())/2,opt->boundingRect.width(),opt->boundingRect.height());
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_IndexFeedback_popup_text:
-if (const HbStyleOptionIndexFeedback *opt = qstyleoption_cast<const HbStyleOptionIndexFeedback *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_IndexFeedback_popup_text no more supported. Use refactored styling");
-HbTextItem *textItem = static_cast<HbTextItem*>(item);
-textItem->setFontSpec(opt->fontSpec);
-textItem->setGeometry(opt->textRect);
-textItem->setText(opt->text);
-}
 break;
 case P_IndexFeedback_popup_background:
-if (const HbStyleOptionIndexFeedback *opt = qstyleoption_cast<const HbStyleOptionIndexFeedback *>(option)) {
+Q_ASSERT_X(false, "HbStyle" , "P_IndexFeedback_popup_background no more supported. Use refactored styling");
-if (HbFrameItem* frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
-frameItem->setGeometry(opt->popupRect);
-}
-}
 break;
 case P_DateTimePicker_background:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_bg");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frameItem->setZValue(-5);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(opt->boundingRect);
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_DateTimePicker_frame:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_overlay");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frameItem->setZValue(1);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(opt->boundingRect);
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_DateTimePicker_separator:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_graf_tumbler_divider");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
 frameItem->setZValue(2);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(0,(opt->boundingRect.height()-frameItem->boundingRect().height())/2,opt->boundingRect.width(),opt->boundingRect.height());
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_InputDialog_text:
 if (const HbStyleOptionInputDialog *opt =
 qstyleoption_cast<const HbStyleOptionInputDialog*>(option)) {
 HbTextItem *textItem = static_cast<HbTextItem*>(item);
 if(!item) {
 return;
 }
-textItem->setTextWrapping(Hb::TextWrapAnywhere);
 textItem->setText(opt->text);
 }
 break;
 case P_InputDialog_additionaltext:
 if (const HbStyleOptionInputDialog *opt =
 qstyleoption_cast<const HbStyleOptionInputDialog*>(option)) {
 HbTextItem *textItem = static_cast<HbTextItem*>(item);
 if(!item) {
 return;
 }
-textItem->setTextWrapping(Hb::TextWrapAnywhere);
 textItem->setText(opt->additionalText);
 }
 break;
 default:
 const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, widget, profile);
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishItem : -- Number of matching CSS declarations: " << decl.count();
 #endif
-HbCss::ValueExtractor extractor(decl, layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(layoutParameters);
 HbCss::KnownProperties prop;
 if ( !extractor.extractKnownProperties(prop) ) {
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishItem : -- No polish overrides found";
 qDebug() << "HbStyle::polishItem : -- Setting wrap mode : " << prop.mTextWrapMode;
 #endif
 text->setTextWrapping( prop.mTextWrapMode );
 hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, false);
 }
+if ( prop.mFlags & HbCss::ExtractedElideMode
+&& !hbWidget_p->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextElideMode)) {
+#ifdef HBSTYLE_DEBUG
+qDebug() << "HbStyle::polishItem : -- Setting elide mode : " << prop.mTextElideMode;
+#endif
+text->setElideMode( prop.mTextElideMode );
+hbWidget_p->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextElideMode, false);
+}
 }
 HbRichTextItem* richtext = qobject_cast<HbRichTextItem*>(hbWidget);
 if (richtext) {
 if ( prop.mFlags & HbCss::ExtractedAlignment
 const HbVector<HbCss::Declaration> decl = declarations(styleRules, anchor->anchorId(), widget, profile);
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishAnchor : -- Number of matching CSS declarations: " << decl.count();
 #endif
-HbCss::ValueExtractor extractor(decl, layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(layoutParameters);
 HbCss::KnownProperties prop;
 if ( !extractor.extractKnownProperties(prop) ) {
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishAnchor : -- No polish overrides found";
 #endif
 anchor->setDirection( prop.mAnchorDir );
 }
 }
-#define NODEPTR_N(x) HbCss::StyleSelector::NodePtr n = {n.ptr = (void *)x};
 /*!
 Polishes the appearance of the given \a widget.
 This method should be called only by HbWidget (base class). The inherited
 classes should not call this method directly, but use the HbWidget's
 polish loop instead.
 This method reads the CSS and WidgetML definition for a given widget and positions
 the sub-elements inside it. Note you need to set the names for the sub-elements
-with HbStyle::setItemName method before this method is called.
+with HbStyle::HbStyle::setItemName method before this method is called.
 Note that this method is heavy on the system resources and should be called
 absolutely when necessary by the widget.
-\param widget, HbWidget to be polished
+\param widget HbWidget to be polished
-\param params, style parameters to be returned to the caller
+\param params style parameters to be returned to the caller
 */
 void HbStyle::polish(HbWidget *widget, HbStyleParameters &params)
 {
 Q_D( HbStyle );
 #ifdef HBSTYLE_DEBUG
-qDebug() << "HbStyle::polish : -- -- -- --";
+qDebug() << "HbStyle::polish : -- -- -- -- ENTER";
 #endif
 if( !widget ) {
+#ifdef HBSTYLE_DEBUG
+qDebug() << "HbStyle::polish : -- -- -- -- EXIT";
+#endif
 return;
 }
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polish : Polishing" << widget->metaObject()->className();
 #endif
 HbLayeredStyleLoader *styleLoader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Layouts);
 if(!styleLoader){
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polish : HbLayeredStyleLoader returned a null pointer.";
+qDebug() << "HbStyle::polish : -- -- -- -- EXIT";
 #endif
 return;
 }
 HbDeviceProfile profile(HbDeviceProfile::profile(widget));
-NODEPTR_N(widget);
+HbCss::StyleSelector::NodePtr n(widget);
-HbVector<HbCss::StyleRule> styleRules;
+HbVector<HbCss::StyleRule> styleRules = styleLoader->styleRulesForNode(n, profile.orientation());
-QVariant widgetStyleCache = widget->property( HbStyleRulesCacheId::hbStyleRulesForNodeCache );
-if(widgetStyleCache.isValid()) {
-QString widgetStyleCacheId = widgetStyleCache.toString();
-if (d->styleRulesCache.contains(widgetStyleCacheId)) {
-styleRules = d->styleRulesCache.value(widgetStyleCacheId);
-} else {
-styleRules = styleLoader->styleRulesForNode(n, profile.orientation());
-d->styleRulesCache[widgetStyleCacheId] = styleRules;
-}
-} else {
-styleRules = styleLoader->styleRulesForNode(n, profile.orientation());
-}
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polish : Number of style rules:" << styleRules.count();
 #endif
 if (!styleRules.count()) {
+#ifdef HBSTYLE_DEBUG
+qDebug() << "HbStyle::polish : -- -- -- -- EXIT";
+#endif
 return;
 }
 const HbVector<HbCss::Declaration> decl = declarations(styleRules, "", widget, profile);
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polish : Number of matching CSS declarations: " << decl.count();
 #endif
-d->ensureLayoutParameters(profile);
+d->layoutParameters.init(profile);
-HbCss::ValueExtractor extractor(decl, d->layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(d->layoutParameters);
 QString layoutName;
 QString sectionName;
 if ( params.count() ) {
 #ifdef HBSTYLE_DEBUG
 #endif
 HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
 if ( !loader->loadWidgetML(widget, layoutName, sectionName)) {
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polish : Failed to load WidgetML";
+qDebug() << "HbStyle::polish : -- -- -- -- EXIT";
 #endif
 return;
 }
 const QVariant ptrVariant = QVariant::fromValue( widget->layout() );
 widget->setProperty( LAYOUT_PTR_PROPERTY, ptrVariant );
 // twice for this item.
 nodeIds.removeAll(name);
 }
 d->polishItem(styleRules, widget, item, name, profile, layoutDefined);
 }
-foreach (QString nodeId, nodeIds) {
+foreach (const QString &nodeId, nodeIds) {
 // These are the "missing" anchor items. Need to call polishItem
 // for them, too, for getting the anchor spacings right.
 // if there are anchor node ids, layoutDefined is always true.
 if ( !nodeId.isEmpty() ) {
 d->polishItem(styleRules, widget, 0, nodeId, profile, true);
 if ( !anchor->anchorId().isEmpty() ) {
 d->polishAnchor(styleRules, widget, anchor, profile);
 }
 }
 }
+#ifdef HB_TEXT_MEASUREMENT_UTILITY
+if ( d->mLocTestMode == -1 ) {
+d->mLocTestMode = HbTextMeasurementUtility::instance()->locTestMode();
+}
+if ( d->mLocTestMode == HbTextMeasurementUtility::Automatic ) {
+HbInstancePrivate::d_ptr()->startLocalizationMeasurement();
+}
+#endif // HB_TEXT_MEASUREMENT_UTILITY
+#ifdef HBSTYLE_DEBUG
+qDebug() << "HbStyle::polish : -- -- -- -- EXIT";
+#endif
 }
 /*!
 updateThemedItems updates themable children items of widget
-\param styleRules, style-rules of the widget
+\param styleRules style-rules of the widget
-\param variableRules, variable-rules of the widget
+\param variableRules variable-rules of the widget
-\param widget, widget whose themed parameters are supposed to be updated
+\param widget widget whose themed parameters are supposed to be updated
-\param item, graphics item whose themed parameters are supposed to be updated
+\param item graphics item whose themed parameters are supposed to be updated
 */
 void HbStylePrivate::updateThemedItems(
 const HbVector<HbCss::StyleRule> &styleRules,
 QGraphicsItem *item,
 HbDeviceProfile &profile) const
 /*!
 HbStyle::updateThemedParams()
 Updates the themable parameters of widget (specially those which are specified in css files)
-\param widget, widget whose themed parameters are supposed to be updated
+\param widget widget whose themed parameters are supposed to be updated
 */
 void HbStyle::updateThemedParams(HbWidget *widget)
 {
 Q_D( HbStyle );
 #ifdef HBSTYLE_DEBUG
-qDebug() << "HbStyle::updateThemedParams : -- -- -- --";
+qDebug() << "HbStyle::updateThemedParams : -- -- -- -- ENTER";
 #endif
 if( !widget ) {
 return;
 }
 if(!widget->childItems().count()){
 HbLayeredStyleLoader *styleLoader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Colors);
 if(!styleLoader){
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::updateThemedParams : HbLayeredStyleLoader returned a null pointer.";
+qDebug() << "HbStyle::updateThemedParams : -- -- -- -- EXIT";
 #endif
 return;
 }
-NODEPTR_N(widget);
+HbCss::StyleSelector::NodePtr n(widget);
 HbDeviceProfile profile(HbDeviceProfile::profile(widget));
 HbVector<HbCss::StyleRule> styleRules = styleLoader->styleRulesForNode(n, profile.orientation());
 if (!styleRules.count()) {
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::updateThemedParams : No style rules found.";
+qDebug() << "HbStyle::updateThemedParams : -- -- -- -- EXIT";
 #endif
 return;
 }
 // update themed items
 QList<QGraphicsItem*> list = widget->childItems();
 foreach (QGraphicsItem* item, list) {
 d->updateThemedItems(styleRules, item, profile);
 }
+#ifdef HBSTYLE_DEBUG
+qDebug() << "HbStyle::updateThemedParams : -- -- -- -- EXIT";
+#endif
 }
 /*!
 Checkes whether given widget has orienation specific style
 rules. This can be used for optimizing orientation switch.
 */
 bool HbStyle::hasOrientationSpecificStyleRules(HbWidget *widget)
 {
 HbLayeredStyleLoader *styleLoader =
 HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Layouts);
-NODEPTR_N(widget);
+HbCss::StyleSelector::NodePtr n(widget);
 return styleLoader->hasOrientationSpecificStyleRules(n);
 }
 /*!
 For clearing caches.
 Note that polish() method requires widget's children to be set with a correct item name.
 \sa HbStyle::polish()
 This method uses QGraphicsItem::setData() with id 0xfffe.
-\param item, graphics item
+\param item graphics item
-\param name, name to be set
+\param name name to be set
 */
 void HbStyle::setItemName( QGraphicsItem *item, const QString &name )
 {
 QString originalName = itemName(item);
 if (item && originalName != name) {
 HbAnchorLayout* layout = static_cast<HbAnchorLayout*>(parentW->layout());
 if ( layout->indexOf(lItem) != -1 ) {
 if( name.isEmpty() ) {
 layout->removeMapping(originalName);
 } else {
-if ( !originalName.isEmpty() ) {
-layout->removeMapping(originalName);
-}
 layout->setMapping(lItem, name);
 }
 }
 }
 }
 /*!
 Returns the item name of a graphics item. Item name is not the same as object name.
 It's a textual identifier that uniquely identifies QGraphicsItem's child items.
-\param item, graphics item
+\param item graphics item
 \return item name or an empty string if name's not set
 */
 QString HbStyle::itemName( const QGraphicsItem *item )
 {
 return item
 HbDeviceProfile effectiveProfile = profile;
 if ( effectiveProfile.isNull() ) {
 effectiveProfile = HbDeviceProfile::current();
 }
 Q_D( const HbStyle );
-d->ensureLayoutParameters(effectiveProfile);
+d->layoutParameters.init(effectiveProfile);
-HbCss::ValueExtractor valueExtractor(d->layoutParameters, true, effectiveProfile);
+HbCss::ValueExtractor valueExtractor(effectiveProfile);
-// todo: parsing variable/expression is done here so that there is no need to change API
+valueExtractor.setLayoutParameters(d->layoutParameters);
-// also parameters method not changed (this change is done for docml/widgetml parsing)
-if (param.startsWith(QLatin1String("var(")) && param.endsWith(QLatin1String(")"))) {
+if ( param.endsWith(QLatin1String(")")) &&
-return valueExtractor.extractVariableValue(param.mid(4,param.length()-5), value);
+( param.startsWith(QLatin1String("var(")) ||
-} else if (param.startsWith(QLatin1String("-var(")) && param.endsWith(QLatin1String(")"))) {
+param.startsWith(QLatin1String("-var(")) ||
-bool retVal = valueExtractor.extractVariableValue(param.mid(5,param.length()-6), value);
+param.startsWith(QLatin1String("expr(")) ||
-value = -value;
+param.startsWith(QLatin1String("-expr(")) ) ) {
-return retVal;
+// Expression parser can deal with "functions"
-} else if (param.startsWith(QLatin1String("expr(")) && param.endsWith(QLatin1String(")"))) {
+return valueExtractor.extractExpressionValue(param, value);
-QString expressionString = param.mid(5,param.length()-6);
+}
-return valueExtractor.extractExpressionValue(expressionString, value);
-} else if (param.startsWith(QLatin1String("-expr(")) && param.endsWith(QLatin1String(")"))) {
-QString expressionString = param.mid(6,param.length()-7);
-bool retVal = valueExtractor.extractExpressionValue(expressionString, value);
-value = -value;
-return retVal;
-}
 return valueExtractor.extractVariableValue(param, value);
 }
+bool HbStylePrivate::valueFromTokens(const QList<int> &tokens, qreal &value, const HbDeviceProfile &profile) const
+{
+HbDeviceProfile effectiveProfile = profile;
+if ( effectiveProfile.isNull() ) {
+effectiveProfile = HbDeviceProfile::current();
+}
+layoutParameters.init(effectiveProfile);
+HbCss::ValueExtractor valueExtractor(effectiveProfile);
+valueExtractor.setLayoutParameters(layoutParameters);
+return valueExtractor.extractExpressionValue(tokens, value);
+}
 /*!
 Returns copy of all global style parameters. Both names and values
 of the parameters are returned. The values are returned in pixels.
 if ( effectiveProfile.isNull() ) {
 effectiveProfile = HbDeviceProfile::current();
 }
 Q_D( const HbStyle );
-d->ensureLayoutParameters(effectiveProfile);
+d->layoutParameters.init(effectiveProfile);
-HbCss::ValueExtractor valueExtractor(d->layoutParameters, true, effectiveProfile);
+HbCss::ValueExtractor valueExtractor(effectiveProfile);
+valueExtractor.setLayoutParameters(d->layoutParameters);
 qreal value = 0;
-QHash<QString, HbCss::Declaration>::const_iterator i = d->layoutParameters.constBegin();
+HbLayoutParameters::const_iterator i = d->layoutParameters.constBegin();
 while (i != d->layoutParameters.constEnd()) {
-if (valueExtractor.extractVariableValue(i.key(), value)) {
+QString name(d->layoutParameters.name(i));
-params.addParameter(i.key(), value);
+if (valueExtractor.extractVariableValue(name, value)) {
+params.addParameter(name, value);
 }
 ++i;
 }
 }
 This method should be used only if you need to access widget specific parameters out
 of the polish loop. It is more efficient to use HbWidget::polish(HbStyleParameters &params)
 if you don't need to access the parameters before the (first) polish event.
-\param parameters, style parameters to be returned to the caller
+\param parameters style parameters to be returned to the caller
-\param widget, HbWidget to be polished
+\param widget HbWidget to be polished
 \sa HbStyle::polish, HbStyle::parameters and HbWidget::polish
 */
 void HbStyle::widgetParameters(HbStyleParameters &params, HbWidget* widget) const
 {
 Q_D( const HbStyle );
 qDebug() << "HbStyle::widgetParameters : HbLayeredStyleLoader returned a null pointer.";
 #endif
 return;
 }
 HbDeviceProfile profile(HbDeviceProfile::profile(widget));
-NODEPTR_N(widget);
+HbCss::StyleSelector::NodePtr n(widget);
 HbVector<HbCss::StyleRule> styleRules = styleLoader->styleRulesForNode(n, profile.orientation());
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::widgetParameters : Number of style rules:" << styleRules.count();
 }
 const HbVector<HbCss::Declaration> decl = declarations(styleRules, "", widget, profile);
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::widgetParameters : Number of matching CSS declarations: " << decl.count();
 #endif
-d->ensureLayoutParameters(profile);
+d->layoutParameters.init(profile);
-HbCss::ValueExtractor extractor(decl, d->layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(d->layoutParameters);
 extractor.extractCustomProperties( params.keys(), params.values() );
 }
 /*!
 \internal
 */
-HbStylePrivate::HbStylePrivate()
+HbStylePrivate::HbStylePrivate() : mLocTestMode(-1)
 {
 HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
 if(loader){
 loader->addFilePath(STYLE_LOCATION, HbLayeredStyleLoader::Concern_Layouts,
 HbLayeredStyleLoader::Priority_Core);
 /*!
 \internal
 */
 HbStylePrivate::~HbStylePrivate()
 {
-layoutParameters.clear();
 HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
 if(loader){
 loader->removeFilePath(STYLE_LOCATION, HbLayeredStyleLoader::Concern_Layouts,
 HbLayeredStyleLoader::Priority_Core);
 loader->removeFilePath(COLOR_STYLE_LOCATION, HbLayeredStyleLoader::Concern_Colors,
 }
 /*!
 \internal
 */
-QString HbStylePrivate::logicalName(HbStyle::Primitive primitive, const QStyleOption *option) const
+QString HbStylePrivate::logicalName(HbStylePrivate::Primitive primitive, const QStyleOption *option)
 {
 switch (primitive) {
-case HbStyle::P_Slider_thumb: {
+case HbStylePrivate::P_Slider_thumb: {
 const HbStyleOptionSlider *opt = qstyleoption_cast<const HbStyleOptionSlider *>(option);
 if (opt) {
 QString iconPath;
 switch (opt->orientation) {
 }
 /*!
 \internal
 */
-QIcon::Mode HbStylePrivate::iconMode(QStyle::State state) const
+QIcon::Mode HbStylePrivate::iconMode(QStyle::State state)
 {
 QIcon::Mode mode = QIcon::Disabled;
 if (state & QStyle::State_Enabled)
 mode = QIcon::Normal;
 if (state & QStyle::State_Active)
 }
 /*!
 \internal
 */
-QIcon::State HbStylePrivate::iconState(QStyle::State state) const
+QIcon::State HbStylePrivate::iconState(QStyle::State state)
 {
 QIcon::State icon = QIcon::Off;
 if (state & QStyle::State_On)
 icon = QIcon::On;
 return icon;
-}
-/*!
-\internal
-*/
-void HbStylePrivate::ensureLayoutParameters(const HbDeviceProfile &profile) const
-{
-bool firstParse(layoutParameters.isEmpty());
-bool addSpecialParams(firstParse);
-if (firstParse) {
-HbCss::Parser parser;
-parser.init(GLOBAL_PARAMETERS_LOCATION, true);
-HbCss::StyleSheet *styleSheet = HbMemoryUtils::create<HbCss::StyleSheet>(HbMemoryManager::HeapMemory);
-parser.parse(styleSheet);
-HbStyleSelector selector;
-selector.styleSheets.append(styleSheet);
-selector.variableRuleSets(&layoutParameters);
-}
-if (!firstParse && (layoutParametersProfileName != profile.name())) {
-addSpecialParams = true;
-}
-if (addSpecialParams) {
-layoutParametersProfileName = profile.name();
-QSizeF pSize = profile.logicalSize();
-{
-HbCss::Declaration decl;
-decl.property = "hb-param-screen-width";
-decl.propertyId = HbCss::Property_Unknown;
-HbCss::Value val;
-val.type = HbCss::Value::Number;
-val.variant = HbVariant((double)pSize.width(),HbMemoryManager::HeapMemory);
-decl.values.append(val);
-layoutParameters.insert(decl.property, decl);
-}
-{
-HbCss::Declaration decl;
-decl.property = "hb-param-screen-height";
-decl.propertyId = HbCss::Property_Unknown;
-HbCss::Value val;
-val.type = HbCss::Value::Number;
-val.variant = HbVariant((double)pSize.height(),HbMemoryManager::HeapMemory);
-decl.values.append(val);
-layoutParameters.insert(decl.property, decl);
-}
-{
-HbCss::Declaration decl;
-decl.property = "hb-param-screen-short-edge";
-decl.propertyId = HbCss::Property_Unknown;
-HbCss::Value val;
-val.type = HbCss::Value::Number;
-val.variant = HbVariant((double)qMin(pSize.height(),pSize.width()),HbMemoryManager::HeapMemory);
-decl.values.append(val);
-layoutParameters.insert(decl.property, decl);
-}
-{
-HbCss::Declaration decl;
-decl.property = "hb-param-screen-long-edge";
-decl.propertyId = HbCss::Property_Unknown;
-HbCss::Value val;
-val.type = HbCss::Value::Number;
-val.variant = HbVariant((double)qMax(pSize.height(),pSize.width()),HbMemoryManager::HeapMemory);
-decl.values.append(val);
-layoutParameters.insert(decl.property, decl);
-}
-}
 }
 /*!
 \internal
 */
 void HbStylePrivate::clearStyleSheetCaches()
 {
 styleRulesCache.clear();
 }
-HbWidgetBasePrivate *HbStylePrivate::widgetBasePrivate(HbWidgetBase *widgetBase) const
+HbWidgetBasePrivate *HbStylePrivate::widgetBasePrivate(HbWidgetBase *widgetBase)
 {
 return HbWidgetBasePrivate::d_ptr(widgetBase);
 }
 #include "moc_hbstyle.cpp"

changeset 34	ed14f46c0e55
parent 7	923ff622b8b9