--- a/src/hbwidgets/itemviews/hblistviewitem_p.h	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistviewitem_p.h	Mon Oct 04 00:38:12 2010 +0300
@@ -27,13 +27,12 @@
 #define HBLISTVIEWITEMPRIVATE_H
 
 #include <hbmainwindow.h>
-#include <hbstyleoptionlistviewitem_p.h>
 
 #include "hblistviewitem.h"
 #include "hbabstractviewitem_p.h"
 #include "hbabstractitemview.h"
 
-class QGraphicsItem;
+class QGraphicsObject;
 
 class HbListViewItemShared : public HbAbstractViewItemShared
 {
@@ -45,15 +44,12 @@
         mStretchingStyle(HbListViewItem::NoStretching),
         mGraphicsSize(HbListViewItem::MediumIcon),
         mMinimumSecondaryTextRowCount(-1),
-        mMaximumSecondaryTextRowCount(-1),
-        mListStyleOption(0)
+        mMaximumSecondaryTextRowCount(-1)
     {
-        mListStyleOption = new HbStyleOptionListViewItem;
     }
 
     ~HbListViewItemShared()
     {
-        delete mListStyleOption;
     }
 
 
@@ -64,7 +60,6 @@
     HbListViewItem::GraphicsSize mGraphicsSize;
     int mMinimumSecondaryTextRowCount;
     int mMaximumSecondaryTextRowCount;
-    HbStyleOptionListViewItem *mListStyleOption;
 };
 
 class HbListViewItemPrivate : public HbAbstractViewItemPrivate
@@ -90,12 +85,12 @@
     void setDisplayRole(const QString &value,
                         const int index);
 
-    inline HbStylePrivate::Primitive displayPrimitive() const {
-        HbStylePrivate::Primitive primitive = HbStylePrivate::P_ListViewItem_text;
+    inline HbStyle::PrimitiveType displayPrimitive() const {
+        HbStyle::PrimitiveType primitive = HbStyle::PT_TextItem;
         const HbListViewItemShared *sd = static_cast<const HbListViewItemShared *>(mSharedData.constData());
 
         if (sd->mTextFormat != Qt::PlainText) {
-            primitive = HbStylePrivate::P_ListViewItem_richtext;
+            primitive = HbStyle::PT_RichTextItem;
         }
         return primitive;
     }
@@ -125,19 +120,19 @@
                 ||  isStretching()); 
     }
 
-    inline HbStylePrivate::Primitive decorationPrimitive(const QVariant& decoration) {
-        HbStylePrivate::Primitive primitive = HbStylePrivate::P_None;
+    inline HbStyle::PrimitiveType decorationPrimitive(const QVariant& decoration) {
+        HbStyle::PrimitiveType primitive = HbStyle::PT_None;
 
         if (decoration.isValid()) {
             if (decoration.canConvert<HbIcon>() || decoration.canConvert<QIcon>()) {
-                primitive = HbStylePrivate::P_ListViewItem_icon;
+                primitive = HbStyle::PT_IconItem;
             }
         }
         return primitive;
     }
 
-    QList<QGraphicsItem *> mDisplayRoleTextItems;
-    QList<QGraphicsItem *> mDecorationRoleItems;
+    QList<QGraphicsObject *> mDisplayRoleTextItems;
+    QList<QGraphicsObject *> mDecorationRoleItems;
 
     QStringList     mStringList;
     QVariantList    mDecorationList;