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.

1 files changed, 12 insertions, 14 deletions

diff --git a/demos/declarative/snake/content/HighScoreModel.qml b/demos/declarative/snake/content/HighScoreModel.qml
index f585ce8..076e3ff 100644
--- a/demos/declarative/snake/content/HighScoreModel.qml
+++ b/demos/declarative/snake/content/HighScoreModel.qml
@@ -41,21 +41,19 @@ ListModel {
     property string topPlayer: ""
     property int maxScores: 10
 
-    Script {
-        function db()
-        {
-            return openDatabaseSync("HighScoreModel", "1.0", "Generic High Score Functionality for QML", 1000000);
-        }
-        function ensureTables(tx)
-        {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS HighScores(game TEXT, score INT, player TEXT)', []);
-        }
+    function __db()
+    {
+        return openDatabaseSync("HighScoreModel", "1.0", "Generic High Score Functionality for QML", 1000000);
+    }
+    function __ensureTables(tx)
+    {
+        tx.executeSql('CREATE TABLE IF NOT EXISTS HighScores(game TEXT, score INT, player TEXT)', []);
     }
 
     function fillModel() {
-        db().transaction(
+        __db().transaction(
             function(tx) {
-                ensureTables(tx);
+                __ensureTables(tx);
                 var rs = tx.executeSql("SELECT score,player FROM HighScores WHERE game=? ORDER BY score DESC", [game]);
                 model.clear();
                 if (rs.rows.length > 0) {
@@ -74,9 +72,9 @@ ListModel {
     }
 
     function savePlayerScore(player,score) {
-        db().transaction(
+        __db().transaction(
             function(tx) {
-                ensureTables(tx);
+                __ensureTables(tx);
                 tx.executeSql("INSERT INTO HighScores VALUES(?,?,?)", [game,score,player]);
                 fillModel();
             }
@@ -88,7 +86,7 @@ ListModel {
     }
 
     function clearScores() {
-        db().transaction(
+        __db().transaction(
             function(tx) {
                 tx.executeSql("DELETE FROM HighScores WHERE game=?", [game]);
                 fillModel();