Renames MapPinch => MapPinchArea, adds docs for it and MapFlickable

Change-Id: Iad08ce86cf620999178dc3a00786ade980144f7f
Reviewed-by: David Laing <david.laing@nokia.com>

2 files changed, 28 insertions, 28 deletions

diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml
index ce434e1f..f477df9a 100644
--- a/tests/applications/declarative_map/map3d.qml
+++ b/tests/applications/declarative_map/map3d.qml
@@ -830,8 +830,8 @@ Rectangle {
         height: 1000
         zoomLevel: 9
 
-        // pinch.activeGestures: MapPinch.ZoomGesture | RotationGesture
-        pinch.activeGestures: MapPinch.NoGesture
+        // pinch.activeGestures: MapPinchArea.ZoomGesture | RotationGesture
+        pinch.activeGestures: MapPinchArea.NoGesture
         pinch.enabled: true
         pinch.maximumZoomLevelChange: 4.0 // maximum zoomlevel changes per pinch
         pinch.rotationFactor: 1.0 // default ~follows angle between fingers
@@ -930,42 +930,42 @@ Rectangle {
             }
         }
         Rectangle { id: rowRectPinchGen; width: rowRect1.width; height: rowRect1.height; color: 'lightsteelblue';
-            Text { text: "Pinch\nzoom:\n"  + ((map.pinch.activeGestures & MapPinch.ZoomGesture) > 0? "Yes":"No")}
+            Text { text: "Pinch\nzoom:\n"  + ((map.pinch.activeGestures & MapPinchArea.ZoomGesture) > 0? "Yes":"No")}
             MouseArea {
                 anchors.fill: parent;
                 onClicked: {
                     console.log('map pinch active gestures' + map.pinch.activeGestures);
-                    if (map.pinch.activeGestures & MapPinch.ZoomGesture)
-                        map.pinch.activeGestures &= ~MapPinch.ZoomGesture
+                    if (map.pinch.activeGestures & MapPinchArea.ZoomGesture)
+                        map.pinch.activeGestures &= ~MapPinchArea.ZoomGesture
                     else
-                        map.pinch.activeGestures += MapPinch.ZoomGesture
+                        map.pinch.activeGestures += MapPinchArea.ZoomGesture
                 }
             }
         }
         Rectangle { width: rowRect1.width; height: rowRect1.height; color: rowRectPinchGen.color;
-            Text { text: "Pinch\nrotation:\n"  + ((map.pinch.activeGestures & MapPinch.RotationGesture) > 0? "Yes":"No")}
+            Text { text: "Pinch\nrotation:\n"  + ((map.pinch.activeGestures & MapPinchArea.RotationGesture) > 0? "Yes":"No")}
             MouseArea {
                 anchors.fill: parent;
                 onClicked: {
                     console.log('map pinch active gestures' + map.pinch.activeGestures);
-                    if (map.pinch.activeGestures & MapPinch.RotationGesture)
-                        map.pinch.activeGestures &= ~MapPinch.RotationGesture
+                    if (map.pinch.activeGestures & MapPinchArea.RotationGesture)
+                        map.pinch.activeGestures &= ~MapPinchArea.RotationGesture
                     else
-                        map.pinch.activeGestures += MapPinch.RotationGesture
+                        map.pinch.activeGestures += MapPinchArea.RotationGesture
                 }
             }
         }
 
         Rectangle { width: rowRect1.width; height: rowRect1.height; color: rowRectPinchGen.color;
-            Text { text: "Pinch\ntilt:\n"  + ((map.pinch.activeGestures & MapPinch.TiltGesture) > 0? "Yes":"No")}
+            Text { text: "Pinch\ntilt:\n"  + ((map.pinch.activeGestures & MapPinchArea.TiltGesture) > 0? "Yes":"No")}
             MouseArea {
                 anchors.fill: parent;
                 onClicked: {
                     console.log('map pinch active gestures' + map.pinch.activeGestures);
-                    if (map.pinch.activeGestures & MapPinch.TiltGesture)
-                        map.pinch.activeGestures &= ~MapPinch.TiltGesture
+                    if (map.pinch.activeGestures & MapPinchArea.TiltGesture)
+                        map.pinch.activeGestures &= ~MapPinchArea.TiltGesture
                     else
-                        map.pinch.activeGestures += MapPinch.TiltGesture
+                        map.pinch.activeGestures += MapPinchArea.TiltGesture
                 }
             }
 
diff --git a/tests/applications/declarative_map/map3d_mousetest.qml b/tests/applications/declarative_map/map3d_mousetest.qml
index ec1ae463..6c7463c1 100644
--- a/tests/applications/declarative_map/map3d_mousetest.qml
+++ b/tests/applications/declarative_map/map3d_mousetest.qml
@@ -306,8 +306,8 @@ Item {
         height: 800
         zoomLevel: 5.1
 
-        // pinch.activeGestures: MapPinch.ZoomGesture | RotationGesture
-        pinch.activeGestures: MapPinch.NoGesture
+        // pinch.activeGestures: MapPinchArea.ZoomGesture | RotationGesture
+        pinch.activeGestures: MapPinchArea.NoGesture
 
         pinch.enabled: true
 
@@ -793,42 +793,42 @@ Item {
             }
         }
         Rectangle { id: rowRectPinchGen; width: rowRect1.width; height: rowRect1.height; color: 'lightsteelblue';
-            Text { text: "Pinch\nzoom:\n"  + ((map.pinch.activeGestures & MapPinch.ZoomGesture) > 0? "Yes":"No")}
+            Text { text: "Pinch\nzoom:\n"  + ((map.pinch.activeGestures & MapPinchArea.ZoomGesture) > 0? "Yes":"No")}
             MouseArea {
                 anchors.fill: parent;
                 onClicked: {
                     console.log('oooQML: map pinch active gestures' + map.pinch.activeGestures);
-                    if (map.pinch.activeGestures & MapPinch.ZoomGesture)
-                        map.pinch.activeGestures &= ~MapPinch.ZoomGesture
+                    if (map.pinch.activeGestures & MapPinchArea.ZoomGesture)
+                        map.pinch.activeGestures &= ~MapPinchArea.ZoomGesture
                     else
-                        map.pinch.activeGestures += MapPinch.ZoomGesture
+                        map.pinch.activeGestures += MapPinchArea.ZoomGesture
                 }
             }
         }
         Rectangle { width: rowRect1.width; height: rowRect1.height; color: rowRectPinchGen.color;
-            Text { text: "Pinch\nrotation:\n"  + ((map.pinch.activeGestures & MapPinch.RotationGesture) > 0? "Yes":"No")}
+            Text { text: "Pinch\nrotation:\n"  + ((map.pinch.activeGestures & MapPinchArea.RotationGesture) > 0? "Yes":"No")}
             MouseArea {
                 anchors.fill: parent;
                 onClicked: {
                     console.log('oooQML: map pinch active gestures' + map.pinch.activeGestures);
-                    if (map.pinch.activeGestures & MapPinch.RotationGesture)
-                        map.pinch.activeGestures &= ~MapPinch.RotationGesture
+                    if (map.pinch.activeGestures & MapPinchArea.RotationGesture)
+                        map.pinch.activeGestures &= ~MapPinchArea.RotationGesture
                     else
-                        map.pinch.activeGestures += MapPinch.RotationGesture
+                        map.pinch.activeGestures += MapPinchArea.RotationGesture
                 }
             }
         }
 
         Rectangle { width: rowRect1.width; height: rowRect1.height; color: rowRectPinchGen.color;
-            Text { text: "Pinch\ntilt:\n"  + ((map.pinch.activeGestures & MapPinch.TiltGesture) > 0? "Yes":"No")}
+            Text { text: "Pinch\ntilt:\n"  + ((map.pinch.activeGestures & MapPinchArea.TiltGesture) > 0? "Yes":"No")}
             MouseArea {
                 anchors.fill: parent;
                 onClicked: {
                     console.log('oooQML: map pinch active gestures' + map.pinch.activeGestures);
-                    if (map.pinch.activeGestures & MapPinch.TiltGesture)
-                        map.pinch.activeGestures &= ~MapPinch.TiltGesture
+                    if (map.pinch.activeGestures & MapPinchArea.TiltGesture)
+                        map.pinch.activeGestures &= ~MapPinchArea.TiltGesture
                     else
-                        map.pinch.activeGestures += MapPinch.TiltGesture
+                        map.pinch.activeGestures += MapPinchArea.TiltGesture
                 }
             }