diff -r 923ff622b8b9 -r 4633027730f5 src/hbwidgets/itemviews/hbtreeviewitem.cpp --- a/src/hbwidgets/itemviews/hbtreeviewitem.cpp Tue Jul 06 14:36:53 2010 +0300 +++ b/src/hbwidgets/itemviews/hbtreeviewitem.cpp Wed Aug 18 10:05:37 2010 +0300 @@ -31,6 +31,7 @@ #include "hbabstractitemcontainer_p.h" #include +#include #include #include #include @@ -115,7 +116,7 @@ HbStyleOptionTreeViewItem styleOption; q->initStyleOption(&styleOption); - q->style()->updatePrimitive(mExpandItem, HbStyle::P_TreeViewItem_expandicon, &styleOption); + HbStylePrivate::updatePrimitive(mExpandItem, HbStylePrivate::P_TreeViewItem_expandicon, &styleOption); } void HbTreeViewItemPrivate::tapTriggered(QGestureEvent *event) @@ -126,6 +127,7 @@ if (gesture->state() == Qt::GestureFinished && gesture->tapStyleHint() == HbTapGesture::Tap) { + q->scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant()); QPointF position = event->mapToGraphicsScene(gesture->hotSpot()); position = q->mapFromScene(position); @@ -238,7 +240,7 @@ if (model && model->hasChildren(d->mIndex) && sd->mUserExpandable) { if (!d->mExpandItem) { - d->mExpandItem = style()->createPrimitive(HbStyle::P_TreeViewItem_expandicon, this); + d->mExpandItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_TreeViewItem_expandicon, this); d->mItemsChanged = true; } } else { @@ -382,7 +384,7 @@ In the base class the multiselection mode selection area is the whole item. In HbTreeView this is not possible because of the expansion icon. For the HbTreeView the selection area in multiselection mode is - defined by the primitive HbStyle::P_ItemViewItem_touchmultiselection + defined by the primitive HbStylePrivate::P_ItemViewItem_touchmultiselection */ bool HbTreeViewItem::selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const {