diff -r 2b1b11a301d2 -r 4b195f3bea29 homescreenapp/widgetplugins/hsshortcutwidgetplugin/inc/hsshortcutwidget.h --- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/inc/hsshortcutwidget.h Tue Jul 06 14:06:53 2010 +0300 +++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/inc/hsshortcutwidget.h Wed Aug 18 09:40:07 2010 +0300 @@ -28,7 +28,7 @@ class HbFrameItem; class HbIconItem; class HbTextItem; -class HbTouchArea; +class QGestureEvent; class CaEntry; class HsShortcutWidget : public HbWidget @@ -51,8 +51,6 @@ QString text() const; void setText(const QString& textItem); - bool eventFilter(QObject *watched, QEvent *event); - signals: void finished(); void setPreferences(const QStringList &names); @@ -62,12 +60,13 @@ void onShow(); void onHide(); +protected: + void gestureEvent(QGestureEvent *event); + private: Q_DISABLE_COPY(HsShortcutWidget) - - void handleMousePressEvent(QGraphicsSceneMouseEvent *event); - void handleMouseMoveEvent(QGraphicsSceneMouseEvent *event); - void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event); + + void launch(); void createPrimitives(); void updateContent(const CaEntry &caEntry); @@ -85,8 +84,7 @@ HbFrameItem *mBackground; HbIconItem *mIcon; HbTextItem *mText; - HbTouchArea *mTouchArea; - + int mCaEntryId; QString mUid; EntryRole mCaEntryRole;