--- a/ginebra2/ContentViews/GWebContentViewWidget.h	Thu Sep 23 15:32:11 2010 -0400
+++ b/ginebra2/ContentViews/GWebContentViewWidget.h	Fri Oct 15 17:30:59 2010 -0400
@@ -28,17 +28,13 @@
 #include <QGraphicsWebView>
 #include <QWebFrame>
 #include <QTime>
+#include "webpagedata.h"
 
 #include "WebViewEventContext.h"
-#include "ZoomMetaData.h"
 
 class QGraphicsSceneContextMenuEvent;
 
 namespace GVA {
-#ifndef NO_QSTM_GESTURE
-class WebTouchNavigation;
-#endif
-
 class GWebContentView;
 
 class GWebContentViewWidget : public QGraphicsWebView
@@ -105,9 +101,9 @@
     void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) ;
     void setPageZoomFactor(qreal zoom);
 
-    ZoomMetaData pageZoomMetaData();
-    void setPageZoomMetaData(ZoomMetaData params);
-    ZoomMetaData defaultZoomData();
+    WebPageData pageZoomMetaData();
+    void setPageZoomMetaData(const WebPageData& params);
+    const WebPageData& defaultZoomData();
     void setCheckeredPixmap();
 
     void onLoadStarted();
@@ -146,7 +142,9 @@
     void contextEvent(::WebViewEventContext *context);
     void BlockFocusChanged(QPoint element);
 
-    void pageZoomMetaDataChange(QWebFrame* frame, ZoomMetaData data);protected:
+//    void pageZoomMetaDataChange(QWebFrame* frame, WebPageData data);
+
+protected:
     void paintEvent(QPaintEvent *event);
     void longPressEvent(::WebViewEventContext *context);
 
@@ -189,9 +187,6 @@
 
     bool        m_inLoading;
     QTime       m_loadingTime;
-#ifndef NO_QSTM_GESTURE
-    WebTouchNavigation* m_touchNavigation;
-#endif
 };
 
 }