renamed QGesture::gestureType() to just type() and fixed the doc.

4 files changed, 11 insertions, 7 deletions

diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp
index b26f8cf..86825b1 100644
--- a/src/gui/graphicsview/qgraphicssceneevent.cpp
+++ b/src/gui/graphicsview/qgraphicssceneevent.cpp
@@ -1887,7 +1887,7 @@ QPolygonF QGraphicsSceneGestureEvent::mapToItem(const QRect &rect, QGraphicsItem
 void QGraphicsSceneGestureEvent::setGestures(const QList<QGesture*> &gestures)
 {
     foreach(QGesture *g, gestures)
-        m_gestures.insert(g->gestureType(), g);
+        m_gestures.insert(g->type(), g);
 }
 
 class QGraphicsSceneTouchEventPrivate : public QGraphicsSceneEventPrivate
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 23a45b5..f24f186 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3537,7 +3537,7 @@ QGestureEvent::QGestureEvent(const QList<QGesture*> &gestures,
     : QEvent(QEvent::Gesture), m_cancelledGestures(cancelledGestures)
 {
     foreach(QGesture *r, gestures)
-        m_gestures.insert(r->gestureType(), r);
+        m_gestures.insert(r->type(), r);
 }
 
 /*!
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index ac135d7..4d492f8 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -132,16 +132,20 @@ QGesture::~QGesture()
 }
 
 /*!
-    Returns the type of the gesture.
+    \property QGesture::type
+
+    \brief The type of the gesture.
 */
-QString QGesture::gestureType() const
+QString QGesture::type() const
 {
     return d_func()->type;
 }
 
 
 /*!
-    Returns the current state of the gesture.
+    \property QGesture::state
+
+    \brief The current state of the gesture.
 */
 Qt::GestureState QGesture::state() const
 {
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index a3d9e43..2a92588 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -61,7 +61,7 @@ class Q_GUI_EXPORT QGesture : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGesture)
 
-    Q_PROPERTY(QString gestureType READ gestureType)
+    Q_PROPERTY(QString type READ type)
     Q_PROPERTY(Qt::GestureState state READ state)
 
     Q_PROPERTY(QRect rect READ rect)
@@ -82,7 +82,7 @@ public:
              uint duration, Qt::GestureState state);
     virtual ~QGesture();
 
-    QString gestureType() const;
+    QString type() const;
     Qt::GestureState state() const;
 
     QRect rect() const;