cleanup

17 files changed, 33 insertions, 33 deletions

diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml
index 2e8b60d..1e89793 100644
--- a/demos/declarative/contacts/FieldText.qml
+++ b/demos/declarative/contacts/FieldText.qml
@@ -69,7 +69,7 @@ Rectangle {
         x: 5
         width: parent.width-10
         anchors.verticalCenter: parent.verticalCenter
-        horizontalAlignment: "AlignHCenter"
+        horizontalAlignment: Text.AlignHCenter
         color: contactDetails.state == "editing" ? "#505050" : "#AAAAAA"
         font.italic: true
         font.bold: true
diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml
index 2c3cc9e..0cb013e 100644
--- a/demos/declarative/contacts/RemoveButton.qml
+++ b/demos/declarative/contacts/RemoveButton.qml
@@ -73,7 +73,7 @@ Rectangle {
         anchors.rightMargin: 4
         font.bold: true
         color: "white"
-        horizontalAlignment: "AlignHCenter"
+        horizontalAlignment: Text.AlignHCenter
         text: "Remove"
         opacity: 0
     }
diff --git a/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml
index cc00773..19cad06 100644
--- a/demos/declarative/flickr/common/ImageDetails.qml
+++ b/demos/declarative/flickr/common/ImageDetails.qml
@@ -44,7 +44,7 @@ Flipable {
             onClicked: { container.state='Back' }
         }
 
-        Text { id: titleText; style: "Raised"; styleColor: "black"; color: "white"; elide: "ElideRight"
+        Text { id: titleText; style: Text.Raised; styleColor: "black"; color: "white"; elide: Text.ElideRight
                x: 220; y: 30; width: parent.width - 240; text: container.photoTitle; font.pointSize: 22 }
 
         LikeOMeter { x: 40; y: 250; rating: container.rating }
@@ -69,7 +69,7 @@ Flipable {
                text: container.photoTags == "" ? "" : "<b>Tags:</b> " }
         Text { id: tags; color: "white"; width: parent.width-x-20;
                 anchors.left: tagsLabel.right; anchors.top: date.bottom;
-                elide: "ElideRight"; text: container.photoTags }
+                elide: Text.ElideRight; text: container.photoTags }
 
         ScrollBar { id: scrollBar; x: 720; y: flickable.y; width: 7; height: flickable.height; opacity: 0;
                     flickableArea: flickable; clip: true }
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index d1ad6e1..337f77c 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -187,6 +187,6 @@ Item {
         id: categoryText;  anchors.horizontalCenter: parent.horizontalCenter; y: 15;
         text: "Flickr - " +
             (rssModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + rssModel.tags)
-        font.pointSize: 20; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
+        font.pointSize: 20; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
     }
 }
diff --git a/demos/declarative/flickr/flickr-mobile.qml b/demos/declarative/flickr/flickr-mobile.qml
index 48fe7df..0a89c4f 100644
--- a/demos/declarative/flickr/flickr-mobile.qml
+++ b/demos/declarative/flickr/flickr-mobile.qml
@@ -10,7 +10,7 @@ Item {
         id: background
         anchors.fill: parent; color: "#343434";
 
-        Image { source: "mobile/images/stripes.png"; fillMode: "Tile"; anchors.fill: parent; opacity: 0.3 }
+        Image { source: "mobile/images/stripes.png"; fillMode: Image.Tile; anchors.fill: parent; opacity: 0.3 }
 
         Common.RssModel { id: rssModel }
         Common.Loading { anchors.centerIn: parent; visible: rssModel.status == 2 }
diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index a4a96d4..770330c 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -26,7 +26,7 @@ Item {
     Text {
         color: "white"
         anchors.centerIn: buttonImage; font.bold: true
-        text: container.text; style: "Raised"; styleColor: "black"
+        text: container.text; style: Text.Raised; styleColor: "black"
     }
     states: [
         State {
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 26052b9..1963bf5 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -39,13 +39,13 @@ Flipable {
                 right: parent.right; rightMargin: 20
                 top: parent.top; topMargin: 180
             }
-            Text { font.bold: true; color: "white"; elide: "ElideRight"; text: container.photoTitle }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Size:</b> " + container.photoWidth + 'x' + container.photoHeight }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Type:</b> " + container.photoType }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Author:</b> " + container.photoAuthor }
-            Text { color: "white"; elide: "ElideRight"; text: "<b>Published:</b> " + container.photoDate }
-            Text { color: "white"; elide: "ElideRight"; text: container.photoTags == "" ? "" : "<b>Tags:</b> " }
-            Text { color: "white"; elide: "ElideRight"; elide: "ElideRight"; text: container.photoTags }
+            Text { font.bold: true; color: "white"; elide: Text.ElideRight; text: container.photoTitle }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Size:</b> " + container.photoWidth + 'x' + container.photoHeight }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Type:</b> " + container.photoType }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Author:</b> " + container.photoAuthor }
+            Text { color: "white"; elide: Text.ElideRight; text: "<b>Published:</b> " + container.photoDate }
+            Text { color: "white"; elide: Text.ElideRight; text: container.photoTags == "" ? "" : "<b>Tags:</b> " }
+            Text { color: "white"; elide: Text.ElideRight; elide: Text.ElideRight; text: container.photoTags }
         }
     }
 
diff --git a/demos/declarative/flickr/mobile/ListDelegate.qml b/demos/declarative/flickr/mobile/ListDelegate.qml
index 090e91a..75c4572 100644
--- a/demos/declarative/flickr/mobile/ListDelegate.qml
+++ b/demos/declarative/flickr/mobile/ListDelegate.qml
@@ -14,9 +14,9 @@ Component {
             }
             Column {
                 x: 92; width: wrapper.ListView.view.width - 95; y: 15; spacing: 2
-                Text { text: title; color: "white"; width: parent.width; font.bold: true; elide: "ElideRight"; style: "Raised"; styleColor: "black" }
-                Text { text: photoAuthor; color: "white"; width: parent.width; elide: "ElideLeft"; color: "#cccccc"; style: "Raised"; styleColor: "black" }
-                Text { text: photoDate; color: "white"; width: parent.width; elide: "ElideRight"; color: "#cccccc"; style: "Raised"; styleColor: "black" }
+                Text { text: title; color: "white"; width: parent.width; font.bold: true; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" }
+                Text { text: photoAuthor; color: "white"; width: parent.width; elide: Text.ElideLeft; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
+                Text { text: photoDate; color: "white"; width: parent.width; elide: Text.ElideRight; color: "#cccccc"; style: Text.Raised; styleColor: "black" }
             }
         }
     }
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index 108faf7..07b9762 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -25,9 +25,9 @@ Item {
                 left: parent.left; right: tagButton.left; leftMargin: 10; rightMargin: 10
                 verticalCenter: parent.verticalCenter
             }
-            elide: "ElideLeft"
+            elide: Text.ElideLeft
             text: (rssModel.tags=="" ? untaggedString : taggedString + rssModel.tags)
-            font.bold: true; color: "White"; style: "Raised"; styleColor: "Black"
+            font.bold: true; color: "White"; style: Text.Raised; styleColor: "Black"
         }
 
         Button {
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 72431af..f1b7df0 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -121,7 +121,7 @@ Item {
     ]
     Image {
         source: "pics/No-Ones-Laughing-3.jpg"
-        fillMode: "Tile"
+        fillMode: Image.Tile
     }
     Description {
         text: "Use the 'minehunt' executable to run this demo!"
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index ea7c14c..38a781a 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -13,7 +13,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent; source: "content/pics/background.png"
-            fillMode: "PreserveAspectCrop"
+            fillMode: Image.PreserveAspectCrop
         }
 
         Item {
diff --git a/demos/declarative/twitter/content/AuthView.qml b/demos/declarative/twitter/content/AuthView.qml
index 73ce308..320eef6 100644
--- a/demos/declarative/twitter/content/AuthView.qml
+++ b/demos/declarative/twitter/content/AuthView.qml
@@ -12,7 +12,7 @@ Item {
             Text {
                 width: 100
                 text: "Screen name:"
-                font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
+                font.pointSize: 10; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
                 anchors.verticalCenter: parent.verticalCenter
                 horizontalAlignment: Qt.AlignRight
             }
@@ -42,7 +42,7 @@ Item {
             Text {
                 width: 100
                 text: "Password:"
-                font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
+                font.pointSize: 10; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
                 anchors.verticalCenter: parent.verticalCenter
                 horizontalAlignment: Qt.AlignRight
             }
diff --git a/demos/declarative/twitter/content/FatDelegate.qml b/demos/declarative/twitter/content/FatDelegate.qml
index 32a921e..194ffb3 100644
--- a/demos/declarative/twitter/content/FatDelegate.qml
+++ b/demos/declarative/twitter/content/FatDelegate.qml
@@ -38,7 +38,7 @@ Component {
                     + '<a href="app://@'+userScreenName+'"><b>'+userScreenName + "</b></a>  from " +source
                     + "<br /><b>" + addTags(statusText) + "</b></html>";
                 textFormat: Qt.RichText
-                color: "white"; color: "#cccccc"; style: "Raised"; styleColor: "black"; wrap: true
+                color: "white"; color: "#cccccc"; style: Text.Raised; styleColor: "black"; wrap: true
                 anchors.left: whiteRect.right; anchors.right: blackRect.right; anchors.leftMargin: 6; anchors.rightMargin: 6
                 onLinkActivated: handleLink(link)
             }
diff --git a/demos/declarative/twitter/content/HomeTitleBar.qml b/demos/declarative/twitter/content/HomeTitleBar.qml
index 3108a9b..b0995f3 100644
--- a/demos/declarative/twitter/content/HomeTitleBar.qml
+++ b/demos/declarative/twitter/content/HomeTitleBar.qml
@@ -52,9 +52,9 @@ Item {
             anchors.left: parent.left; anchors.right: tagButton.left
             anchors.leftMargin: 58; anchors.rightMargin: 10
             anchors.verticalCenter: parent.verticalCenter
-            elide: "ElideLeft"
+            elide: Text.ElideLeft
             text: "Timeline for " + rssModel.authName
-            font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
+            font.pointSize: 10; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
         }
 
         Button {
@@ -67,7 +67,7 @@ Item {
             id: charsLeftText; anchors.horizontalCenter: tagButton.horizontalCenter;
             anchors.top: tagButton.bottom; anchors.topMargin: 2
             text: {140 - editor.text.length;} visible: titleBar.state == "Posting"
-            font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
+            font.pointSize: 10; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
         }
         Item {
             id: txtEdit;
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index e9752ff..fdeb839 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -29,14 +29,14 @@ Item {
         id: background
         anchors.fill: parent; color: "#343434";
 
-        Image { source: "mobile/images/stripes.png"; fillMode: "Tile"; anchors.fill: parent; opacity: 0.3 }
+        Image { source: "mobile/images/stripes.png"; fillMode: Image.Tile; anchors.fill: parent; opacity: 0.3 }
 
         Twitter.RssModel { id: rssModel }
         Common.Loading { anchors.centerIn: parent; visible: rssModel.status==XmlListModel.Loading && state!='unauthed'}
         Text {
             width: 180
             text: "Could not access twitter using this screen name and password pair.";
-            color: "white"; color: "#cccccc"; style: "Raised"; styleColor: "black"; wrap: true
+            color: "white"; color: "#cccccc"; style: Text.Raised; styleColor: "black"; wrap: true
             visible: rssModel.status==XmlListModel.Error; anchors.centerIn: parent
         }
 
diff --git a/demos/declarative/webbrowser/fieldtext/FieldText.qml b/demos/declarative/webbrowser/fieldtext/FieldText.qml
index 2adfbbf..b1c1938 100644
--- a/demos/declarative/webbrowser/fieldtext/FieldText.qml
+++ b/demos/declarative/webbrowser/fieldtext/FieldText.qml
@@ -79,7 +79,7 @@ Item {
         x: 5
         width: parent.width-10
         anchors.verticalCenter: parent.verticalCenter
-        horizontalAlignment: "AlignHCenter"
+        horizontalAlignment: Text.AlignHCenter
         color: fieldText.state == "editing" ? "#505050" : "#AAAAAA"
         font.italic: true
         font.bold: true
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 53ac214..3b1ea57 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -65,11 +65,11 @@ Item {
                     id: headerText
 
                     text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...'
-                    elide: "ElideRight"
+                    elide: Text.ElideRight
 
                     color: "white"
                     styleColor: "black"
-                    style: "Raised"
+                    style: Text.Raised
 
                     font.family: "Helvetica"
                     font.pointSize: 10
@@ -81,7 +81,7 @@ Item {
                     anchors.rightMargin: 4
                     anchors.top: header.top
                     anchors.topMargin: 4
-                    horizontalAlignment: "AlignHCenter"
+                    horizontalAlignment: Text.AlignHCenter
                 }
                 Item {
                     width: parent.width