Follow naming conventions (pass examples test)

23 files changed, 6 insertions, 5 deletions

diff --git a/demos/declarative/snake/Button.qml b/demos/declarative/snake/content/Button.qml
index 63cd555..63cd555 100644
--- a/demos/declarative/snake/Button.qml
+++ b/demos/declarative/snake/content/Button.qml
diff --git a/demos/declarative/snake/Cookie.qml b/demos/declarative/snake/content/Cookie.qml
index 7f0aadf..7f0aadf 100644
--- a/demos/declarative/snake/Cookie.qml
+++ b/demos/declarative/snake/content/Cookie.qml
diff --git a/demos/declarative/snake/HighScoreModel.qml b/demos/declarative/snake/content/HighScoreModel.qml
index f585ce8..f585ce8 100644
--- a/demos/declarative/snake/HighScoreModel.qml
+++ b/demos/declarative/snake/content/HighScoreModel.qml
diff --git a/demos/declarative/snake/Link.qml b/demos/declarative/snake/content/Link.qml
index 1b3f7bf..1b3f7bf 100644
--- a/demos/declarative/snake/Link.qml
+++ b/demos/declarative/snake/content/Link.qml
diff --git a/demos/declarative/snake/Skull.qml b/demos/declarative/snake/content/Skull.qml
index 585e7d3..585e7d3 100644
--- a/demos/declarative/snake/Skull.qml
+++ b/demos/declarative/snake/content/Skull.qml
diff --git a/demos/declarative/snake/pics/README b/demos/declarative/snake/content/pics/README
index 0215132..0215132 100644
--- a/demos/declarative/snake/pics/README
+++ b/demos/declarative/snake/content/pics/README
diff --git a/demos/declarative/snake/pics/background.png b/demos/declarative/snake/content/pics/background.png
index 72dffaa..72dffaa 100644
--- a/demos/declarative/snake/pics/background.png
+++ b/demos/declarative/snake/content/pics/background.png
diff --git a/demos/declarative/snake/pics/blueStar.png b/demos/declarative/snake/content/pics/blueStar.png
index ba7acab..ba7acab 100644
--- a/demos/declarative/snake/pics/blueStar.png
+++ b/demos/declarative/snake/content/pics/blueStar.png
diff --git a/demos/declarative/snake/pics/blueStone.png b/demos/declarative/snake/content/pics/blueStone.png
index 356affd..356affd 100644
--- a/demos/declarative/snake/pics/blueStone.png
+++ b/demos/declarative/snake/content/pics/blueStone.png
diff --git a/demos/declarative/snake/pics/cookie.png b/demos/declarative/snake/content/pics/cookie.png
index aec2957..aec2957 100644
--- a/demos/declarative/snake/pics/cookie.png
+++ b/demos/declarative/snake/content/pics/cookie.png
diff --git a/demos/declarative/snake/pics/eyes.svg b/demos/declarative/snake/content/pics/eyes.svg
index 1078692..1078692 100644
--- a/demos/declarative/snake/pics/eyes.svg
+++ b/demos/declarative/snake/content/pics/eyes.svg
diff --git a/demos/declarative/snake/pics/head.png b/demos/declarative/snake/content/pics/head.png
index 550e002..550e002 100644
--- a/demos/declarative/snake/pics/head.png
+++ b/demos/declarative/snake/content/pics/head.png
diff --git a/demos/declarative/snake/pics/head.svg b/demos/declarative/snake/content/pics/head.svg
index 3bf0bd2..3bf0bd2 100644
--- a/demos/declarative/snake/pics/head.svg
+++ b/demos/declarative/snake/content/pics/head.svg
diff --git a/demos/declarative/snake/pics/redStar.png b/demos/declarative/snake/content/pics/redStar.png
index cd06854..cd06854 100644
--- a/demos/declarative/snake/pics/redStar.png
+++ b/demos/declarative/snake/content/pics/redStar.png
diff --git a/demos/declarative/snake/pics/redStone.png b/demos/declarative/snake/content/pics/redStone.png
index 9bb7fe4..9bb7fe4 100644
--- a/demos/declarative/snake/pics/redStone.png
+++ b/demos/declarative/snake/content/pics/redStone.png
diff --git a/demos/declarative/snake/pics/skull.png b/demos/declarative/snake/content/pics/skull.png
index 6318616..6318616 100644
--- a/demos/declarative/snake/pics/skull.png
+++ b/demos/declarative/snake/content/pics/skull.png
diff --git a/demos/declarative/snake/pics/snake.jpg b/demos/declarative/snake/content/pics/snake.jpg
index e91a784..e91a784 100644
--- a/demos/declarative/snake/pics/snake.jpg
+++ b/demos/declarative/snake/content/pics/snake.jpg
diff --git a/demos/declarative/snake/pics/star.png b/demos/declarative/snake/content/pics/star.png
index defbde5..defbde5 100644
--- a/demos/declarative/snake/pics/star.png
+++ b/demos/declarative/snake/content/pics/star.png
diff --git a/demos/declarative/snake/pics/stoneShadow.png b/demos/declarative/snake/content/pics/stoneShadow.png
index 1bd56af..1bd56af 100644
--- a/demos/declarative/snake/pics/stoneShadow.png
+++ b/demos/declarative/snake/content/pics/stoneShadow.png
diff --git a/demos/declarative/snake/pics/yellowStar.png b/demos/declarative/snake/content/pics/yellowStar.png
index 52fb9c4..52fb9c4 100644
--- a/demos/declarative/snake/pics/yellowStar.png
+++ b/demos/declarative/snake/content/pics/yellowStar.png
diff --git a/demos/declarative/snake/pics/yellowStone.png b/demos/declarative/snake/content/pics/yellowStone.png
index c56124a..c56124a 100644
--- a/demos/declarative/snake/pics/yellowStone.png
+++ b/demos/declarative/snake/content/pics/yellowStone.png
diff --git a/demos/declarative/snake/snake.js b/demos/declarative/snake/content/snake.js
index 1cea8b7..a65aebc 100644
--- a/demos/declarative/snake/snake.js
+++ b/demos/declarative/snake/content/snake.js
@@ -5,8 +5,8 @@ var links = new Array;
 var scheduledDirections = new Array;
 var numRows = 1;
 var numColumns = 1;
-var linkComponent = createComponent("Link.qml");
-var cookieComponent = createComponent("Cookie.qml");
+var linkComponent = createComponent("content/Link.qml"); // XXX should resolve relative to script, not component
+var cookieComponent = createComponent("content/Cookie.qml");
 var cookie;
 var linksToGrow = 0;
 var linksToDie = 0;
diff --git a/demos/declarative/snake/Snake.qml b/demos/declarative/snake/snake.qml
index a9835d4..58827a7 100644
--- a/demos/declarative/snake/Snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -1,11 +1,12 @@
 import Qt 4.6
+import "content"
 
 Rectangle {
     id: screen;
     SystemPalette { id: activePalette }
     color: activePalette.window
 
-    Script { source: "snake.js" }
+    Script { source: "content/snake.js" }
 
     property int gridSize : 34
     property int margin: 4
@@ -59,7 +60,7 @@ Rectangle {
     Image {
         Image {
             id: title
-            source: "pics/snake.jpg"
+            source: "content/pics/snake.jpg"
             fillMode: "PreserveAspectCrop"
             anchors.fill: parent
             anchors.horizontalCenter: parent.horizontalCenter
@@ -77,7 +78,7 @@ Rectangle {
             }
         }
 
-        source: "pics/background.png"
+        source: "content/pics/background.png"
         fillMode: "PreserveAspectCrop"
 
         anchors.left: parent.left