Text-related API updates after review

Rename LineEdit to TextInput; hAlign to horizontalAlignment; vAlign to
verticalAlignment. Other assorted fixes.

16 files changed, 17 insertions, 17 deletions

diff --git a/examples/declarative/listview/sections.qml b/examples/declarative/listview/sections.qml
index ab9fbdf..41cc2e6 100644
--- a/examples/declarative/listview/sections.qml
+++ b/examples/declarative/listview/sections.qml
@@ -28,7 +28,7 @@ Rect {
                 opacity: Wrapper.ListView.prevSection != Wrapper.ListView.section ? 1 : 0
                 Text {
                     text: Wrapper.ListView.section; font.bold: true
-                    x: 2; height: parent.height; vAlign: 'AlignVCenter'
+                    x: 2; height: parent.height; verticalAlignment: 'AlignVCenter'
                 }
             }
             Item {
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index d5887d7..78b26dc 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -41,7 +41,7 @@ Rect {
             }
             Text {
                 id: NameText
-                anchors.fill: parent; vAlign: "AlignVCenter"
+                anchors.fill: parent; verticalAlignment: "AlignVCenter"
                 text: fileName; anchors.leftMargin: 32
                 font.pointSize: 10
                 color: activePalette.windowText
@@ -107,7 +107,7 @@ Rect {
             anchors.left: UpButton.right; anchors.right: parent.right; height: parent.height
             anchors.leftMargin: 4; anchors.rightMargin: 4
             text: folders.folder; color: activePalette.buttonText
-            elide: "ElideLeft"; hAlign: "AlignRight"; vAlign: "AlignVCenter"
+            elide: "ElideLeft"; horizontalAlignment: "AlignRight"; verticalAlignment: "AlignVCenter"
         }
     }
 }
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml
index 6426457..f1b72ab 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/3/RemoveButton.qml
@@ -34,7 +34,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
     }
 }
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml
index c97426c..dfb79a6 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4/RemoveButton.qml
@@ -73,7 +73,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml
index 712471f..d4f30eb 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/4a/RemoveButton.qml
@@ -80,7 +80,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
index acc9896..292eb45 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
@@ -69,7 +69,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
index 5392154..f74ff99 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
@@ -69,7 +69,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
index 5392154..f74ff99 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
@@ -69,7 +69,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
index e47aff2..d21b297 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
@@ -71,7 +71,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
index 32e8ce0..9a7e0d7 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
@@ -75,7 +75,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
index e0651c8..3130bbe 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
@@ -67,7 +67,7 @@ Rect {
         x: 5
         width: parent.width-10
         anchors.verticalCenter: parent.verticalCenter
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         color: "#505050"
         font.italic: true
         text: fieldText.label
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
index 6280877..b99ab84 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
@@ -72,7 +72,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
index 21e3bf2..369d34d 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
@@ -69,7 +69,7 @@ Rect {
         x: 5
         width: parent.width-10
         anchors.verticalCenter: parent.verticalCenter
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         color: "#505050"
         font.italic: true
         text: fieldText.label
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
index 03b50eec..f4a55e1 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
@@ -77,7 +77,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
index 4506ec9..93ac0f8 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
@@ -69,7 +69,7 @@ Rect {
         x: 5
         width: parent.width-10
         anchors.verticalCenter: parent.verticalCenter
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         color: "#505050"
         font.italic: true
         text: fieldText.label
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
index 866a23f..d96a932 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
@@ -75,7 +75,7 @@ Rect {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        hAlign: "AlignHCenter"
+        horizontalAlignment: "AlignHCenter"
         text: "Remove"
         opacity: 0
     }