--- a/homescreenapp/hsdomainmodel/inc/hswidgethost.h	Thu Jun 24 13:11:40 2010 +0100
+++ b/homescreenapp/hsdomainmodel/inc/hswidgethost.h	Fri Jun 25 19:19:22 2010 +0300
@@ -26,10 +26,11 @@
 #include "hsdomainmodeldatastructures.h"
 
 #include "hstest_global.h"
-HOMESCREEN_TEST_CLASS(TestRuntimeServices)
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
 
 class QStateMachine;
 
+class HsWidgetTouchArea;
 class HsWidgetComponent;
 class HsPage;
 
@@ -49,8 +50,6 @@
 
     bool setPage(HsPage *page);
     HsPage *page() const; 
-
-    bool isPannable(QGraphicsSceneMouseEvent *event);
     
     bool loadPresentation();
     bool loadPresentation(Qt::Orientation orientation);
@@ -59,6 +58,7 @@
     bool savePresentation(HsWidgetPresentationData &presentation);
     bool getPresentation(HsWidgetPresentationData &presentation);
     bool removePresentation(Qt::Orientation orientation);
+    QPainterPath shape() const;
 
 signals:
     void event_startAndShow();
@@ -90,11 +90,13 @@
     void startDropEffect();
 
 protected:
-    bool eventFilter(QObject *watched, QEvent *event);    
+    bool eventFilter(QObject *watched, QEvent *event);
+    void gestureEvent(QGestureEvent *event);
     void mousePressEvent(QGraphicsSceneMouseEvent *) {}
 
 private:
-    Q_DISABLE_COPY(HsWidgetHost)    
+    Q_DISABLE_COPY(HsWidgetHost)
+    void setupTouchArea();
     void setupEffects();
     void setupStates();
 
@@ -118,6 +120,7 @@
     void action_finished();
     void action_faulted();
     void action_remove();
+    void action_notifyRemove();
     
     void onFinished();
     void onError();
@@ -128,17 +131,17 @@
     QStateMachine *mStateMachine;
     QGraphicsWidget *mWidget;
     HsPage *mPage;    
-    HsWidgetComponent *mComponent;    
+    HsWidgetComponent *mComponent;
+    HsWidgetTouchArea *mTouchArea;
     QMetaMethod mOnInitializeMethod;
     QMetaMethod mOnShowMethod;
     QMetaMethod mOnHideMethod;
-    QMetaMethod mOnUninitializeMethod;
-    QMetaMethod mIsPannableMethod;
+    QMetaMethod mOnUninitializeMethod;    
     QMetaProperty mIsOnlineProperty;
 	QMetaProperty mRootPathProperty;        
     bool mIsFinishing;
 
-    HOMESCREEN_TEST_FRIEND_CLASS(TestRuntimeServices)
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
 };
 
 #endif // HSWIDGETHOST_H