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, 7 insertions, 6 deletions

diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 89fe3e8..ab36122 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import "script/script.js" as Script
 
 Package {
     Item { id: stackItem; Package.name: 'stack'; width: 160; height: 153; z: stackItem.PathView.z }
@@ -28,9 +29,9 @@ Package {
             Rectangle {
                 id: placeHolder
 
-                property int w: getWidth(content)
-                property int h: getHeight(content)
-                property double s: calculateScale(w, h, photoWrapper.width)
+                property int w: Script.getWidth(content)
+                property int h: Script.getHeight(content)
+                property double s: Script.calculateScale(w, h, photoWrapper.width)
 
                 color: '#878787'; anchors.centerIn: parent; smooth: true; border.color: 'white'; border.width: 3
                 width:  w * s; height: h * s; visible: originalImage.status != Image.Ready
@@ -42,7 +43,7 @@ Package {
             }
             BusyIndicator { anchors.centerIn: parent; on: originalImage.status != Image.Ready }
             Image {
-                id: originalImage; smooth: true; source: "http://" + getImagePath(content)
+                id: originalImage; smooth: true; source: "http://" + Script.getImagePath(content)
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Image {
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/script/script.js b/demos/declarative/photoviewer/PhotoViewerCore/script/script.js
index ae24ea1..e8ef93a 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/script/script.js
+++ b/demos/declarative/photoviewer/PhotoViewerCore/script/script.js
@@ -1,3 +1,5 @@
+.pragma library
+
 function getWidth(string) {
     return (string.match(/width=\"([0-9]+)\"/))[1]
 }
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
index 02134ac..5e4be4c 100644
--- a/demos/declarative/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -10,8 +10,6 @@ Rectangle {
 
     width: 800; height: 480; color: "#d5d6d8"
 
-    Script { source: "PhotoViewerCore/script/script.js" }
-
     ListModel {
         id: photosModel
         ListElement { tag: "Flowers" }