From 48f64dde600d86d7585140bec3658bb8adc37a45 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 31 Jul 2009 15:59:25 +1000
Subject: Use new enum ints (should be ids!)

---
 demos/declarative/flickr/content/ImageDetails.qml | 6 +++---
 demos/declarative/flickr/flickr.qml               | 4 ++--
 demos/declarative/flickr/flickr2.qml              | 2 +-
 examples/declarative/snow/ImageBatch.qml          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index 9d5f069..a18c230 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -79,7 +79,7 @@ Flipable {
 
         Rect { anchors.fill: parent; color: "black"; opacity: 0.4; border.color: "white"; border.width: 2 }
 
-        Progress { anchors.centerIn: parent; width: 200; height: 18; progress: BigImage.progress; visible: BigImage.status }
+        Progress { anchors.centerIn: parent; width: 200; height: 18; progress: BigImage.progress; visible: BigImage.status!=1 }
         Flickable {
             id: Flick; width: Container.width - 10; height: Container.height - 10
             x: 5; y: 5; clip: true;
@@ -98,7 +98,7 @@ Flipable {
                     smooth: !Flick.moving
                     onStatusChanged : {
                         // Default scale shows the entire image.
-                        if (status == 0 && width != 0) {
+                        if (status == 1 && width != 0) {
                             Slider.minimum = Math.min(Flick.width / width, Flick.height / height);
                             prevScale = Math.min(Slider.minimum, 1);
                             Slider.value = prevScale;
@@ -118,7 +118,7 @@ Flipable {
         }
 
         Slider {
-            id: Slider; x: 25; y: 374; visible: { BigImage.status == 0 && maximum > minimum }
+            id: Slider; x: 25; y: 374; visible: { BigImage.status == 1 && maximum > minimum }
             onValueChanged: {
                 if (BigImage.width * value > Flick.width) {
                     var xoff = (Flick.width/2 + Flick.xPosition) * value / prevScale;
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 21ac284..57fc349 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -66,7 +66,7 @@ Item {
             Rect {
                 id: WhiteRect; anchors.fill: parent; color: "white"; radius: 5
 
-                Loading { x: 26; y: 26; visible: Thumb.status }
+                Loading { x: 26; y: 26; visible: Thumb.status!=1 }
                 Image { id: Thumb; source: imagePath; x: 5; y: 5 }
 
                 Item {
@@ -124,7 +124,7 @@ Item {
 
         Image { source: "content/pics/background.png"; anchors.fill: parent }
 
-        Loading { anchors.centerIn: parent; visible: FeedModel.status != 0 }
+        Loading { anchors.centerIn: parent; visible: FeedModel.status }
 
         GridView {
             id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate; cacheBuffer: 100
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index 136e604..c972edf 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -66,7 +66,7 @@ Item {
                     Rect {
                         id: WhiteRect; anchors.fill: parent; color: "white"; radius: 5
 
-                        Loading { x: 26; y: 26; visible: Thumb.status }
+                        Loading { x: 26; y: 26; visible: Thumb.status!=1 }
                         Image { id: Thumb; source: imagePath; x: 5; y: 5 }
 
                         Item {
diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml
index 8aa4bb2..edf120e 100644
--- a/examples/declarative/snow/ImageBatch.qml
+++ b/examples/declarative/snow/ImageBatch.qml
@@ -42,8 +42,8 @@ GridView {
         width: MyGrid.imageWidth; height: MyGrid.imageHeight;
 
         Image { id: Image; source: url; fillMode: "PreserveAspect"; smooth: true; anchors.fill: parent;
-                opacity: (status == 0)?1:0; opacity: Behavior { NumberAnimation { properties: "opacity" } } } 
-        Loading { anchors.centerIn: parent; visible: Image.status }
+                opacity: (status == 1)?1:0; opacity: Behavior { NumberAnimation { properties: "opacity" } } } 
+        Loading { anchors.centerIn: parent; visible: Image.status!=1 }
 
         states: State {
             name: "selected"
-- 
cgit v0.12