Deprecate inline Script {} blocks

Inline blocks/includes have been replaced with an import syntax:
    import "foo.js" as Foo
this gives better separation between QML and code.  Imported script blocks
also have a mandatory qualifier, which leads to better optimization
potential.

3 files changed, 30 insertions, 36 deletions

diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index 99216cb..4de2202 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -31,21 +31,19 @@ Item {
                 }
             }
 
-            Script {
-               function photoClicked() {
-                   imageDetails.photoTitle = title;
-                   imageDetails.photoDescription = description;
-                   imageDetails.photoTags = tags;
-                   imageDetails.photoWidth = photoWidth;
-                   imageDetails.photoHeight = photoHeight;
-                   imageDetails.photoType = photoType;
-                   imageDetails.photoAuthor = photoAuthor;
-                   imageDetails.photoDate = photoDate;
-                   imageDetails.photoUrl = url;
-                   imageDetails.rating = 0;
-                   wrapper.state = "Details";
-               }
-            }
+           function photoClicked() {
+               imageDetails.photoTitle = title;
+               imageDetails.photoDescription = description;
+               imageDetails.photoTags = tags;
+               imageDetails.photoWidth = photoWidth;
+               imageDetails.photoHeight = photoHeight;
+               imageDetails.photoType = photoType;
+               imageDetails.photoAuthor = photoAuthor;
+               imageDetails.photoDate = photoDate;
+               imageDetails.photoUrl = url;
+               imageDetails.rating = 0;
+               wrapper.state = "Details";
+           }
 
             Rectangle {
                 id: whiteRect; anchors.fill: parent; color: "white"; radius: 5
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 291d874..767315c 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -5,19 +5,17 @@
      Item {
          id: wrapper; width: 79; height: 79
 
-         Script {
-             function photoClicked() {
-                 imageDetails.photoTitle = title;
-                 imageDetails.photoTags = tags;
-                 imageDetails.photoWidth = photoWidth;
-                 imageDetails.photoHeight = photoHeight;
-                 imageDetails.photoType = photoType;
-                 imageDetails.photoAuthor = photoAuthor;
-                 imageDetails.photoDate = photoDate;
-                 imageDetails.photoUrl = url;
-                 imageDetails.rating = 0;
-                 scaleMe.state = "Details";
-             }
+         function photoClicked() {
+             imageDetails.photoTitle = title;
+             imageDetails.photoTags = tags;
+             imageDetails.photoWidth = photoWidth;
+             imageDetails.photoHeight = photoHeight;
+             imageDetails.photoType = photoType;
+             imageDetails.photoAuthor = photoAuthor;
+             imageDetails.photoDate = photoDate;
+             imageDetails.photoUrl = url;
+             imageDetails.rating = 0;
+             scaleMe.state = "Details";
          }
 
          Item {
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index 0a06771..e92ba59 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -11,12 +11,10 @@ Item {
         id: container
         width: (parent.width * 2) - 55 ; height: parent.height
 
-        Script {
-            function accept() {
-                titleBar.state = ""
-                background.state = ""
-                rssModel.tags = editor.text
-            }
+        function accept() {
+            titleBar.state = ""
+            background.state = ""
+            rssModel.tags = editor.text
         }
 
         Text {
@@ -32,7 +30,7 @@ Item {
 
         Button {
             id: tagButton; x: titleBar.width - 50; width: 45; height: 32; text: "..."
-            onClicked: if (titleBar.state == "Tags") accept(); else titleBar.state = "Tags"
+            onClicked: if (titleBar.state == "Tags") container.accept(); else titleBar.state = "Tags"
             anchors.verticalCenter: parent.verticalCenter
         }
 
@@ -57,7 +55,7 @@ Item {
 
             Item {
                 id: returnKey
-                Keys.onReturnPressed: accept()
+                Keys.onReturnPressed: container.accept()
                 Keys.onEscapePressed: titleBar.state = ""
             }
         }