--- a/qhbstyle/qhbstyle_p.h	Mon Jun 21 22:38:54 2010 +0100
+++ b/qhbstyle/qhbstyle_p.h	Thu Jul 22 16:42:52 2010 +0100
@@ -65,7 +65,6 @@
     SM_GroupBox,
     SM_GroupBoxTitle,
     SM_HeaderItem,
-    SM_ItemViewHighlight,
     SM_ItemViewItem,
     SM_LineEdit,
     SM_ListParent,
@@ -88,6 +87,7 @@
     SM_ToolBarButton,
     SM_ToolButton,
     SM_ToolTip,
+    SM_ToolBarExtension,
 };
 
 enum ItemState {
@@ -140,13 +140,12 @@
     bool isDialog(const QWidget *widget);
     bool hbParameter(const QString &parameterName, int &value);
     void polishFont(QWidget *widget);
+    void polishPalette(QWidget *widget);
 
 private:
     HbStyle *m_styleManager;
-    HbFrameDrawer *m_frameDrawer;
-    QParallelAnimationGroup* m_animationGroup;
-
-    //QHbStyle *q_ptr;
+    QScopedPointer<HbFrameDrawer> m_frameDrawer;
+    QScopedPointer<QParallelAnimationGroup> m_animationGroup;
 };
 
 QT_END_NAMESPACE