--- a/src/hbcore/style/style.pri	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/style.pri	Fri May 14 16:09:54 2010 +0300
@@ -28,44 +28,40 @@
 DEPENDPATH += $$PWD
 
 PUBLIC_HEADERS += $$PWD/hbstyle.h
-PUBLIC_HEADERS += $$PWD/hbstyleinterface.h
-PUBLIC_HEADERS += $$PWD/hbstyleoption.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionabstractviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioncheckbox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioncolorgridviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondataquery.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondecorator.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiongridviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindexfeedback.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindicatorgroup.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindicatormenu.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionlabel.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionlistviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionmenuitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionnotificationdialog.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionmessagebox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionpopup.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressbar.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressslider.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressdialog.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionpushbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionscrollbar.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionslider.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionsoftkey.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionnavigationbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindicatorbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontitlepane.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontoolbarextension.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontoolbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontooltip.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontreeviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleparameters.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondataform.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondataformviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiongroupbox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionratingslider.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioncombobox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioninputdialog.h
+PUBLIC_HEADERS += $$PWD/hbstyleparameters.h  
+
+PRIVATE_HEADERS += $$PWD/hbstyleoption_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionabstractviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioncheckbox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioncolorgridviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiongridviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionindexfeedback_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionindicatorgroup_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionlabel_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionlistviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionmenuitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionnotificationdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionmessagebox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionpopup_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionprogressbar_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionprogressslider_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionprogressdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionpushbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionscrollbar_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionslider_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionnavigationbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionindicatorbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontitlepane_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontoolbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontooltip_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontreeviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiondataform_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiondataformviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiongroupbox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionratingslider_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioncombobox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioninputdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleinterface_p.h
 PRIVATE_HEADERS += $$PWD/hbstyle_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptionsliderelement_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptionprogresssliderhandle_p.h
@@ -79,12 +75,9 @@
 SOURCES += $$PWD/hbstyleoptionabstractviewitem.cpp
 SOURCES += $$PWD/hbstyleoptioncheckbox.cpp
 SOURCES += $$PWD/hbstyleoptioncolorgridviewitem.cpp
-SOURCES += $$PWD/hbstyleoptiondataquery.cpp
-SOURCES += $$PWD/hbstyleoptiondecorator.cpp
 SOURCES += $$PWD/hbstyleoptiongridviewitem.cpp
 SOURCES += $$PWD/hbstyleoptionindexfeedback.cpp
 SOURCES += $$PWD/hbstyleoptionindicatorgroup.cpp
-SOURCES += $$PWD/hbstyleoptionindicatormenu.cpp
 SOURCES += $$PWD/hbstyleoptionlabel.cpp
 SOURCES += $$PWD/hbstyleoptionlistviewitem.cpp
 SOURCES += $$PWD/hbstyleoptionmenuitem.cpp
@@ -99,14 +92,12 @@
 SOURCES += $$PWD/hbstyleoptionscrollbar.cpp
 SOURCES += $$PWD/hbstyleoptionslider.cpp
 SOURCES += $$PWD/hbstyleoptionsliderelement.cpp
-SOURCES += $$PWD/hbstyleoptionsoftkey.cpp
 SOURCES += $$PWD/hbstyleoptionstatusbar.cpp
 SOURCES += $$PWD/hbstyleoptionnavigationbutton.cpp
 SOURCES += $$PWD/hbstyleoptionindicatorbutton.cpp
 SOURCES += $$PWD/hbstyleoptionsignalindicator.cpp
 SOURCES += $$PWD/hbstyleoptionbatteryindicator.cpp
 SOURCES += $$PWD/hbstyleoptiontitlepane.cpp
-SOURCES += $$PWD/hbstyleoptiontoolbarextension.cpp
 SOURCES += $$PWD/hbstyleoptiontoolbutton.cpp
 SOURCES += $$PWD/hbstyleoptiontooltip.cpp
 SOURCES += $$PWD/hbstyleoptiontreeviewitem.cpp
@@ -121,3 +112,4 @@
 SOURCES += $$PWD/hbstyleoptioncombobox.cpp
 SOURCES += $$PWD/hbstyleoptioninputdialog.cpp
 
+