Rename positioners.

QFxBasePositioner still exists though.

4 files changed, 9 insertions, 8 deletions

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 24c3e69..b95cc7ab 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -7,7 +7,7 @@ Rectangle {
     SystemPalette { id: Palette; colorGroup: Qt.Active }
     Script { source: "calculator.js" }
 
-    VerticalPositioner {
+    Column {
         x: 2; spacing: 10;
 
         Rectangle {
@@ -56,7 +56,7 @@ Rectangle {
                 CalcButton { operation: "C"; id: C; width: 76 }
                 CalcButton { operation: "AC"; id: AC; x: 78; width: 76 }
 
-                GridPositioner {
+                Grid {
                     id: NumKeypad; y: 32; spacing: 2; columns: 3
 
                     CalcButton { operation: "7" }
@@ -70,7 +70,7 @@ Rectangle {
                     CalcButton { operation: "3" }
                 }
 
-                HorizontalPositioner {
+                Row {
                     y: 128; spacing: 2
 
                     CalcButton { operation: "0"; width: 50 }
@@ -78,7 +78,7 @@ Rectangle {
                     CalcButton { operation: "="; id: Equals; x: 77;  width: 102 }
                 }
 
-                VerticalPositioner {
+                Column {
                     id: SimpleOperations
                     x: 156; y: 0; spacing: 2
 
@@ -89,7 +89,7 @@ Rectangle {
                 }
             }
 
-            GridPositioner {
+            Grid {
                 id: AdvancedButtons
                 x: 350; spacing: 2; columns: 2; opacity: 0
 
diff --git a/demos/declarative/contacts/Contact.qml b/demos/declarative/contacts/Contact.qml
index d02157c..91510c7 100644
--- a/demos/declarative/contacts/Contact.qml
+++ b/demos/declarative/contacts/Contact.qml
@@ -80,7 +80,7 @@ Item {
     function remove() {
         removeContactQuery.exec();
     }
-    VerticalPositioner {
+    Column {
         id: layout
         width: contents.width
         height:contents.height
diff --git a/demos/declarative/flickr/content/LikeOMeter.qml b/demos/declarative/flickr/content/LikeOMeter.qml
index 0ba79b1..754dbb1 100644
--- a/demos/declarative/flickr/content/LikeOMeter.qml
+++ b/demos/declarative/flickr/content/LikeOMeter.qml
@@ -5,7 +5,7 @@ Item {
 
     property int rating: 2
 
-    HorizontalPositioner {
+    Row {
         Star {
             rating: 0
             onClicked: { Container.rating = rating }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index ec3a2a0..ef87a05 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -6,7 +6,8 @@ import "fieldtext"
 Item {
     id: WebBrowser
 
-    property string urlString : "http://qt.nokia.com/"
+    //property string urlString : "http://qt.nokia.com/"
+    property string urlString : "http://www.nymphmania.com/maptest/gshow_map.php?lat=61.4979&lon=23.7635"
 
     state: "Normal"