Doc: Documentation for gesture features. Still a moving target.

Reviewed-by: Trust Me

3 files changed, 13 insertions, 12 deletions

diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/gestures/imagegestures/imagewidget.cpp
index c4a4e506c2..95525c53e5 100644
--- a/examples/gestures/imagegestures/imagewidget.cpp
+++ b/examples/gestures/imagegestures/imagewidget.cpp
@@ -43,6 +43,7 @@
 
 #include <QtGui>
 
+//! [constructor]
 ImageWidget::ImageWidget(QWidget *parent)
     : QWidget(parent),
     position(0),
@@ -52,19 +53,15 @@ ImageWidget::ImageWidget(QWidget *parent)
     scaleFactor(1)
 
 {
-    setObjectName("ImageWidget");
     setMinimumSize(QSize(100,100));
 
-    setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_OpaquePaintEvent);
-    setAttribute(Qt::WA_NoSystemBackground);
-
 //! [enable gestures]
     grabGesture(Qt::PanGesture);
     grabGesture(Qt::PinchGesture);
     grabGesture(Qt::SwipeGesture);
 //! [enable gestures]
 }
+//! [constructor]
 
 //! [event handler]
 bool ImageWidget::event(QEvent *event)
diff --git a/examples/gestures/imagegestures/imagewidget.h b/examples/gestures/imagegestures/imagewidget.h
index 7b91fbf26e..56e2316d72 100644
--- a/examples/gestures/imagegestures/imagewidget.h
+++ b/examples/gestures/imagegestures/imagewidget.h
@@ -53,28 +53,28 @@ class QPinchGesture;
 class QSwipeGesture;
 QT_END_NAMESPACE
 
+//! [class definition begin]
 class ImageWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     ImageWidget(QWidget *parent = 0);
-
     void openDirectory(const QString &path);
 
 protected:
-    bool event(QEvent*);
-    bool gestureEvent(QGestureEvent*);
-    void paintEvent(QPaintEvent*);
-    void resizeEvent(QResizeEvent*);
-    void mouseDoubleClickEvent(QMouseEvent*);
+    bool event(QEvent *event);
+    void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
+    void mouseDoubleClickEvent(QMouseEvent *event);
 
 private:
+    bool gestureEvent(QGestureEvent *event);
     void panTriggered(QPanGesture*);
     void pinchTriggered(QPinchGesture*);
     void swipeTriggered(QSwipeGesture*);
+//! [class definition begin]
 
-private:
     void updateImage();
     QImage loadImage(const QString &fileName);
     void loadImage();
@@ -93,6 +93,8 @@ private:
     float verticalOffset;
     float rotationAngle;
     float scaleFactor;
+//! [class definition end]
 };
+//! [class definition end]
 
 #endif
diff --git a/examples/gestures/imagegestures/mainwidget.h b/examples/gestures/imagegestures/mainwidget.h
index 1a99155d33..71b09b02de 100644
--- a/examples/gestures/imagegestures/mainwidget.h
+++ b/examples/gestures/imagegestures/mainwidget.h
@@ -44,6 +44,8 @@
 
 #include <QMainWindow>
 
+class ImageWidget;
+
 class MainWidget : public QMainWindow
 {
     Q_OBJECT